From bae802854ea7331cfe2d82f5a8bd46a56157ef2f Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 01:38:51 +0900 Subject: [PATCH 01/12] a bunch more --- .../code_E23260/func_802B6000_E23260.s | 136 +++ .../code_E23260/func_802B61E4_E23444.s | 165 ++++ .../code_E236E0/func_802B6000_E236E0.s | 183 ++++ .../code_E236E0/func_802B6288_E23968.s | 200 ++++ .../code_E236E0/func_802B6550_E23C30.s | 45 + .../code_E236E0/func_802B65E8_E23CC8.s | 95 ++ .../code_E236E0/func_802B6738_E23E18.s | 128 +++ .../code_E24040/func_802B6000_E24040.s | 51 + .../code_E24040/func_802B60B4_E240F4.s | 67 ++ .../code_E24040/func_802B6198_E241D8.s | 71 ++ .../code_E24040/func_802B6294_E242D4.s | 54 + .../code_E24040/func_802B6348_E24388.s | 84 ++ .../code_E24040/func_802B647C_E244BC.s | 41 + .../code_E24040/func_802B6508_E24548.s | 39 + .../code_E245D0/func_802B6000_E245D0.s | 114 +++ .../code_E245D0/func_802B6198_E24768.s | 45 + .../code_E245D0/func_802B6230_E24800.s | 60 ++ .../code_E24920/func_802B6000_E24920.s | 125 +++ .../code_E24920/func_802B61C0_E24AE0.s | 76 ++ .../code_E24920/func_802B62CC_E24BEC.s | 105 ++ .../code_E24920/func_802B644C_E24D6C.s | 98 ++ .../code_E24ED0/func_802B6000_E24ED0.s | 24 + .../code_E24ED0/func_802B6048_E24F18.s | 161 +++ .../code_E24ED0/func_802B62A4_E25174.s | 276 ++++++ .../code_E24ED0/func_802B66A8_E25578.s | 105 ++ .../code_E24ED0/func_802B6820_E256F0.s | 387 ++++++++ .../code_E25D60/func_802B6000_E25D60.s | 663 +++++++++++++ .../code_E26710/func_802B6000_E26710.s | 401 ++++++++ .../code_E26710/func_802B65F8_E26D08.s | 42 + .../code_E26DE0/func_802B6000_E26DE0.s | 425 ++++++++ .../code_E26DE0/func_802B6648_E27428.s | 42 + .../code_E27510/func_802B6000_E27510.s | 28 + .../code_E27510/func_802B6060_E27570.s | 461 +++++++++ .../code_E27C90/func_802B6000_E27C90.s | 180 ++++ .../code_E27F40/func_802B6000_E27F40.s | 557 +++++++++++ .../code_E287F0/func_802B6000_E287F0.s | 152 +++ .../code_E28A30/func_802B6000_E28A30.s | 46 + .../code_E28A30/func_802B609C_E28ACC.s | 186 ++++ .../code_E28A30/func_802B6350_E28D80.s | 39 + .../code_E28A30/func_802B63D4_E28E04.s | 48 + .../code_E28A30/func_802B6478_E28EA8.s | 42 + .../code_E28A30/func_802B6508_E28F38.s | 85 ++ .../code_E28A30/func_802B6638_E29068.s | 85 ++ .../code_E291A0/func_802B6000_E291A0.s | 180 ++++ .../code_E29470/func_802B6000_E29470.s | 45 + .../code_E29470/func_802B60A4_E29514.s | 925 ++++++++++++++++++ .../code_E2A340/func_802B6000_E2A340.s | 225 +++++ .../code_E2A6B0/func_802B6000_E2A6B0.s | 79 ++ .../code_E2A6B0/func_802B6120_E2A7D0.s | 794 +++++++++++++++ .../code_E2A6B0/func_802B6CF0_E2B3A0.s | 38 + src/code_E23260.c | 5 + src/code_E236E0.c | 11 + src/code_E24040.c | 15 + src/code_E245D0.c | 7 + src/code_E24920.c | 9 + src/code_E24ED0.c | 11 + src/code_E25D60.c | 3 + src/code_E26710.c | 5 + src/code_E26DE0.c | 5 + src/code_E27510.c | 5 + src/code_E27C90.c | 3 + src/code_E27F40.c | 3 + src/code_E287F0.c | 3 + src/code_E28A30.c | 15 + src/code_E291A0.c | 3 + src/code_E29470.c | 5 + src/code_E2A340.c | 3 + src/code_E2A6B0.c | 7 + tools/splat.yaml | 438 ++++++--- undefined_funcs_auto.txt | 1 + undefined_syms_auto.txt | 84 +- 71 files changed, 9178 insertions(+), 166 deletions(-) create mode 100644 asm/nonmatchings/code_E23260/func_802B6000_E23260.s create mode 100644 asm/nonmatchings/code_E23260/func_802B61E4_E23444.s create mode 100644 asm/nonmatchings/code_E236E0/func_802B6000_E236E0.s create mode 100644 asm/nonmatchings/code_E236E0/func_802B6288_E23968.s create mode 100644 asm/nonmatchings/code_E236E0/func_802B6550_E23C30.s create mode 100644 asm/nonmatchings/code_E236E0/func_802B65E8_E23CC8.s create mode 100644 asm/nonmatchings/code_E236E0/func_802B6738_E23E18.s create mode 100644 asm/nonmatchings/code_E24040/func_802B6000_E24040.s create mode 100644 asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s create mode 100644 asm/nonmatchings/code_E24040/func_802B6198_E241D8.s create mode 100644 asm/nonmatchings/code_E24040/func_802B6294_E242D4.s create mode 100644 asm/nonmatchings/code_E24040/func_802B6348_E24388.s create mode 100644 asm/nonmatchings/code_E24040/func_802B647C_E244BC.s create mode 100644 asm/nonmatchings/code_E24040/func_802B6508_E24548.s create mode 100644 asm/nonmatchings/code_E245D0/func_802B6000_E245D0.s create mode 100644 asm/nonmatchings/code_E245D0/func_802B6198_E24768.s create mode 100644 asm/nonmatchings/code_E245D0/func_802B6230_E24800.s create mode 100644 asm/nonmatchings/code_E24920/func_802B6000_E24920.s create mode 100644 asm/nonmatchings/code_E24920/func_802B61C0_E24AE0.s create mode 100644 asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s create mode 100644 asm/nonmatchings/code_E24920/func_802B644C_E24D6C.s create mode 100644 asm/nonmatchings/code_E24ED0/func_802B6000_E24ED0.s create mode 100644 asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s create mode 100644 asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s create mode 100644 asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s create mode 100644 asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s create mode 100644 asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s create mode 100644 asm/nonmatchings/code_E26710/func_802B6000_E26710.s create mode 100644 asm/nonmatchings/code_E26710/func_802B65F8_E26D08.s create mode 100644 asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s create mode 100644 asm/nonmatchings/code_E26DE0/func_802B6648_E27428.s create mode 100644 asm/nonmatchings/code_E27510/func_802B6000_E27510.s create mode 100644 asm/nonmatchings/code_E27510/func_802B6060_E27570.s create mode 100644 asm/nonmatchings/code_E27C90/func_802B6000_E27C90.s create mode 100644 asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s create mode 100644 asm/nonmatchings/code_E287F0/func_802B6000_E287F0.s create mode 100644 asm/nonmatchings/code_E28A30/func_802B6000_E28A30.s create mode 100644 asm/nonmatchings/code_E28A30/func_802B609C_E28ACC.s create mode 100644 asm/nonmatchings/code_E28A30/func_802B6350_E28D80.s create mode 100644 asm/nonmatchings/code_E28A30/func_802B63D4_E28E04.s create mode 100644 asm/nonmatchings/code_E28A30/func_802B6478_E28EA8.s create mode 100644 asm/nonmatchings/code_E28A30/func_802B6508_E28F38.s create mode 100644 asm/nonmatchings/code_E28A30/func_802B6638_E29068.s create mode 100644 asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s create mode 100644 asm/nonmatchings/code_E29470/func_802B6000_E29470.s create mode 100644 asm/nonmatchings/code_E29470/func_802B60A4_E29514.s create mode 100644 asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s create mode 100644 asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s create mode 100644 asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s create mode 100644 asm/nonmatchings/code_E2A6B0/func_802B6CF0_E2B3A0.s create mode 100644 src/code_E23260.c create mode 100644 src/code_E236E0.c create mode 100644 src/code_E24040.c create mode 100644 src/code_E245D0.c create mode 100644 src/code_E24920.c create mode 100644 src/code_E24ED0.c create mode 100644 src/code_E25D60.c create mode 100644 src/code_E26710.c create mode 100644 src/code_E26DE0.c create mode 100644 src/code_E27510.c create mode 100644 src/code_E27C90.c create mode 100644 src/code_E27F40.c create mode 100644 src/code_E287F0.c create mode 100644 src/code_E28A30.c create mode 100644 src/code_E291A0.c create mode 100644 src/code_E29470.c create mode 100644 src/code_E2A340.c create mode 100644 src/code_E2A6B0.c diff --git a/asm/nonmatchings/code_E23260/func_802B6000_E23260.s b/asm/nonmatchings/code_E23260/func_802B6000_E23260.s new file mode 100644 index 0000000000..0adb41856f --- /dev/null +++ b/asm/nonmatchings/code_E23260/func_802B6000_E23260.s @@ -0,0 +1,136 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E23260 +/* E23260 802B6000 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E23264 802B6004 AFB1001C */ sw $s1, 0x1c($sp) +/* E23268 802B6008 AFB00018 */ sw $s0, 0x18($sp) +/* E2326C 802B600C 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E23270 802B6010 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E23274 802B6014 AFBF0024 */ sw $ra, 0x24($sp) +/* E23278 802B6018 AFB20020 */ sw $s2, 0x20($sp) +/* E2327C 802B601C F7B40028 */ sdc1 $f20, 0x28($sp) +/* E23280 802B6020 8E040004 */ lw $a0, 4($s0) +/* E23284 802B6024 3C128011 */ lui $s2, %hi(gPlayerData) +/* E23288 802B6028 2652F290 */ addiu $s2, $s2, %lo(gPlayerData) +/* E2328C 802B602C 30821000 */ andi $v0, $a0, 0x1000 +/* E23290 802B6030 10400005 */ beqz $v0, .L802B6048 +/* E23294 802B6034 0000882D */ daddu $s1, $zero, $zero +/* E23298 802B6038 0C0AD879 */ jal func_802B61E4_E23444 +/* E2329C 802B603C 00000000 */ nop +/* E232A0 802B6040 080AD872 */ j .L802B61C8 +/* E232A4 802B6044 00000000 */ nop +.L802B6048: +/* E232A8 802B6048 96020008 */ lhu $v0, 8($s0) +/* E232AC 802B604C 8E030000 */ lw $v1, ($s0) +/* E232B0 802B6050 24420001 */ addiu $v0, $v0, 1 +/* E232B4 802B6054 0461001E */ bgez $v1, .L802B60D0 +/* E232B8 802B6058 A6020008 */ sh $v0, 8($s0) +/* E232BC 802B605C 3C027FF7 */ lui $v0, 0x7ff7 +/* E232C0 802B6060 3442FFF1 */ ori $v0, $v0, 0xfff1 +/* E232C4 802B6064 24110001 */ addiu $s1, $zero, 1 +/* E232C8 802B6068 00621024 */ and $v0, $v1, $v0 +/* E232CC 802B606C AE020000 */ sw $v0, ($s0) +/* E232D0 802B6070 30824000 */ andi $v0, $a0, 0x4000 +/* E232D4 802B6074 A20000B6 */ sb $zero, 0xb6($s0) +/* E232D8 802B6078 A6000008 */ sh $zero, 8($s0) +/* E232DC 802B607C A60000C0 */ sh $zero, 0xc0($s0) +/* E232E0 802B6080 A60000C2 */ sh $zero, 0xc2($s0) +/* E232E4 802B6084 AE000054 */ sw $zero, 0x54($s0) +/* E232E8 802B6088 10400004 */ beqz $v0, .L802B609C +/* E232EC 802B608C AE00008C */ sw $zero, 0x8c($s0) +/* E232F0 802B6090 3C040009 */ lui $a0, 9 +/* E232F4 802B6094 080AD832 */ j .L802B60C8 +/* E232F8 802B6098 34840002 */ ori $a0, $a0, 2 +.L802B609C: +/* E232FC 802B609C 30820001 */ andi $v0, $a0, 1 +/* E23300 802B60A0 54400004 */ bnel $v0, $zero, .L802B60B4 +/* E23304 802B60A4 3C040006 */ lui $a0, 6 +/* E23308 802B60A8 3C040001 */ lui $a0, 1 +/* E2330C 802B60AC 080AD832 */ j .L802B60C8 +/* E23310 802B60B0 34840002 */ ori $a0, $a0, 2 +.L802B60B4: +/* E23314 802B60B4 820200B5 */ lb $v0, 0xb5($s0) +/* E23318 802B60B8 14400003 */ bnez $v0, .L802B60C8 +/* E2331C 802B60BC 34840007 */ ori $a0, $a0, 7 +/* E23320 802B60C0 3C040006 */ lui $a0, 6 +/* E23324 802B60C4 34840005 */ ori $a0, $a0, 5 +.L802B60C8: +/* E23328 802B60C8 0C037FBF */ jal func_800DFEFC +/* E2332C 802B60CC 00000000 */ nop +.L802B60D0: +/* E23330 802B60D0 8E020004 */ lw $v0, 4($s0) +/* E23334 802B60D4 30420200 */ andi $v0, $v0, 0x200 +/* E23338 802B60D8 10400005 */ beqz $v0, .L802B60F0 +/* E2333C 802B60DC 27A40010 */ addiu $a0, $sp, 0x10 +/* E23340 802B60E0 0C039769 */ jal set_action_state +/* E23344 802B60E4 2404001C */ addiu $a0, $zero, 0x1c +/* E23348 802B60E8 080AD872 */ j .L802B61C8 +/* E2334C 802B60EC 00000000 */ nop +.L802B60F0: +/* E23350 802B60F0 0C0388C1 */ jal input_to_move_vector +/* E23354 802B60F4 27A50014 */ addiu $a1, $sp, 0x14 +/* E23358 802B60F8 0C039454 */ jal func_800E5150 +/* E2335C 802B60FC 00000000 */ nop +/* E23360 802B6100 0C039858 */ jal check_input_jump +/* E23364 802B6104 00000000 */ nop +/* E23368 802B6108 10400011 */ beqz $v0, .L802B6150 +/* E2336C 802B610C 00000000 */ nop +/* E23370 802B6110 C7A20014 */ lwc1 $f2, 0x14($sp) +/* E23374 802B6114 44800000 */ mtc1 $zero, $f0 +/* E23378 802B6118 00000000 */ nop +/* E2337C 802B611C 46001032 */ c.eq.s $f2, $f0 +/* E23380 802B6120 00000000 */ nop +/* E23384 802B6124 45000007 */ bc1f .L802B6144 +/* E23388 802B6128 00000000 */ nop +/* E2338C 802B612C C6020080 */ lwc1 $f2, 0x80($s0) +/* E23390 802B6130 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E23394 802B6134 46001032 */ c.eq.s $f2, $f0 +/* E23398 802B6138 00000000 */ nop +/* E2339C 802B613C 45010022 */ bc1t .L802B61C8 +/* E233A0 802B6140 00000000 */ nop +.L802B6144: +/* E233A4 802B6144 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E233A8 802B6148 080AD872 */ j .L802B61C8 +/* E233AC 802B614C E6000080 */ swc1 $f0, 0x80($s0) +.L802B6150: +/* E233B0 802B6150 16200005 */ bnez $s1, .L802B6168 +/* E233B4 802B6154 00000000 */ nop +/* E233B8 802B6158 0C039838 */ jal check_input_hammer +/* E233BC 802B615C 00000000 */ nop +/* E233C0 802B6160 14400019 */ bnez $v0, .L802B61C8 +/* E233C4 802B6164 00000000 */ nop +.L802B6168: +/* E233C8 802B6168 C7A00014 */ lwc1 $f0, 0x14($sp) +/* E233CC 802B616C 4480A000 */ mtc1 $zero, $f20 +/* E233D0 802B6170 00000000 */ nop +/* E233D4 802B6174 46140032 */ c.eq.s $f0, $f20 +/* E233D8 802B6178 00000000 */ nop +/* E233DC 802B617C 45000005 */ bc1f .L802B6194 +/* E233E0 802B6180 24040001 */ addiu $a0, $zero, 1 +/* E233E4 802B6184 964202B8 */ lhu $v0, 0x2b8($s2) +/* E233E8 802B6188 24420001 */ addiu $v0, $v0, 1 +/* E233EC 802B618C 080AD872 */ j .L802B61C8 +/* E233F0 802B6190 A64202B8 */ sh $v0, 0x2b8($s2) +.L802B6194: +/* E233F4 802B6194 0C039769 */ jal set_action_state +/* E233F8 802B6198 A6000008 */ sh $zero, 8($s0) +/* E233FC 802B619C C7A00014 */ lwc1 $f0, 0x14($sp) +/* E23400 802B61A0 46140032 */ c.eq.s $f0, $f20 +/* E23404 802B61A4 00000000 */ nop +/* E23408 802B61A8 45010007 */ bc1t .L802B61C8 +/* E2340C 802B61AC 3C037FFF */ lui $v1, 0x7fff +/* E23410 802B61B0 3463FFFF */ ori $v1, $v1, 0xffff +/* E23414 802B61B4 8E020004 */ lw $v0, 4($s0) +/* E23418 802B61B8 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E2341C 802B61BC 00431024 */ and $v0, $v0, $v1 +/* E23420 802B61C0 E6000080 */ swc1 $f0, 0x80($s0) +/* E23424 802B61C4 AE020004 */ sw $v0, 4($s0) +.L802B61C8: +/* E23428 802B61C8 8FBF0024 */ lw $ra, 0x24($sp) +/* E2342C 802B61CC 8FB20020 */ lw $s2, 0x20($sp) +/* E23430 802B61D0 8FB1001C */ lw $s1, 0x1c($sp) +/* E23434 802B61D4 8FB00018 */ lw $s0, 0x18($sp) +/* E23438 802B61D8 D7B40028 */ ldc1 $f20, 0x28($sp) +/* E2343C 802B61DC 03E00008 */ jr $ra +/* E23440 802B61E0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_E23260/func_802B61E4_E23444.s b/asm/nonmatchings/code_E23260/func_802B61E4_E23444.s new file mode 100644 index 0000000000..1add518e57 --- /dev/null +++ b/asm/nonmatchings/code_E23260/func_802B61E4_E23444.s @@ -0,0 +1,165 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B61E4_E23444 +/* E23444 802B61E4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E23448 802B61E8 AFB00018 */ sw $s0, 0x18($sp) +/* E2344C 802B61EC 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E23450 802B61F0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E23454 802B61F4 AFBF001C */ sw $ra, 0x1c($sp) +/* E23458 802B61F8 8E030000 */ lw $v1, ($s0) +/* E2345C 802B61FC 0461002A */ bgez $v1, .L802B62A8 +/* E23460 802B6200 3C027FFF */ lui $v0, 0x7fff +/* E23464 802B6204 3442FFFF */ ori $v0, $v0, 0xffff +/* E23468 802B6208 00621024 */ and $v0, $v1, $v0 +/* E2346C 802B620C 8E030004 */ lw $v1, 4($s0) +/* E23470 802B6210 2404FFF1 */ addiu $a0, $zero, -0xf +/* E23474 802B6214 AE020000 */ sw $v0, ($s0) +/* E23478 802B6218 00441024 */ and $v0, $v0, $a0 +/* E2347C 802B621C A20000B6 */ sb $zero, 0xb6($s0) +/* E23480 802B6220 A6000008 */ sh $zero, 8($s0) +/* E23484 802B6224 A60000C0 */ sh $zero, 0xc0($s0) +/* E23488 802B6228 A60000C2 */ sh $zero, 0xc2($s0) +/* E2348C 802B622C AE000054 */ sw $zero, 0x54($s0) +/* E23490 802B6230 30632000 */ andi $v1, $v1, 0x2000 +/* E23494 802B6234 14600013 */ bnez $v1, .L802B6284 +/* E23498 802B6238 AE020000 */ sw $v0, ($s0) +/* E2349C 802B623C 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* E234A0 802B6240 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* E234A4 802B6244 9062007E */ lbu $v0, 0x7e($v1) +/* E234A8 802B6248 30420010 */ andi $v0, $v0, 0x10 +/* E234AC 802B624C 14400009 */ bnez $v0, .L802B6274 +/* E234B0 802B6250 3C04000C */ lui $a0, 0xc +/* E234B4 802B6254 90620080 */ lbu $v0, 0x80($v1) +/* E234B8 802B6258 00021080 */ sll $v0, $v0, 2 +/* E234BC 802B625C 3C04802B */ lui $a0, %hi(D_802B6430) +/* E234C0 802B6260 00822021 */ addu $a0, $a0, $v0 +/* E234C4 802B6264 0C037FBF */ jal func_800DFEFC +/* E234C8 802B6268 8C846430 */ lw $a0, %lo(D_802B6430)($a0) +/* E234CC 802B626C 080AD8AA */ j .L802B62A8 +/* E234D0 802B6270 00000000 */ nop +.L802B6274: +/* E234D4 802B6274 0C037FBF */ jal func_800DFEFC +/* E234D8 802B6278 3484000E */ ori $a0, $a0, 0xe +/* E234DC 802B627C 080AD8AA */ j .L802B62A8 +/* E234E0 802B6280 00000000 */ nop +.L802B6284: +/* E234E4 802B6284 8203000C */ lb $v1, 0xc($s0) +/* E234E8 802B6288 00031040 */ sll $v0, $v1, 1 +/* E234EC 802B628C 00431021 */ addu $v0, $v0, $v1 +/* E234F0 802B6290 000210C0 */ sll $v0, $v0, 3 +/* E234F4 802B6294 3C04800F */ lui $a0, %hi(D_800F7C1C) +/* E234F8 802B6298 00822021 */ addu $a0, $a0, $v0 +/* E234FC 802B629C 8C847C1C */ lw $a0, %lo(D_800F7C1C)($a0) +/* E23500 802B62A0 0C0398DB */ jal func_800E636C +/* E23504 802B62A4 00000000 */ nop +.L802B62A8: +/* E23508 802B62A8 8E020004 */ lw $v0, 4($s0) +/* E2350C 802B62AC 30422000 */ andi $v0, $v0, 0x2000 +/* E23510 802B62B0 1440004C */ bnez $v0, .L802B63E4 +/* E23514 802B62B4 27A40010 */ addiu $a0, $sp, 0x10 +/* E23518 802B62B8 24020001 */ addiu $v0, $zero, 1 +/* E2351C 802B62BC 820300B6 */ lb $v1, 0xb6($s0) +/* E23520 802B62C0 920500B6 */ lbu $a1, 0xb6($s0) +/* E23524 802B62C4 10620022 */ beq $v1, $v0, .L802B6350 +/* E23528 802B62C8 28620002 */ slti $v0, $v1, 2 +/* E2352C 802B62CC 10400005 */ beqz $v0, .L802B62E4 +/* E23530 802B62D0 24020002 */ addiu $v0, $zero, 2 +/* E23534 802B62D4 10600009 */ beqz $v1, .L802B62FC +/* E23538 802B62D8 00000000 */ nop +/* E2353C 802B62DC 080AD8F9 */ j .L802B63E4 +/* E23540 802B62E0 00000000 */ nop +.L802B62E4: +/* E23544 802B62E4 10620022 */ beq $v1, $v0, .L802B6370 +/* E23548 802B62E8 24020003 */ addiu $v0, $zero, 3 +/* E2354C 802B62EC 1062002E */ beq $v1, $v0, .L802B63A8 +/* E23550 802B62F0 27A40010 */ addiu $a0, $sp, 0x10 +/* E23554 802B62F4 080AD8F9 */ j .L802B63E4 +/* E23558 802B62F8 00000000 */ nop +.L802B62FC: +/* E2355C 802B62FC 8E020000 */ lw $v0, ($s0) +/* E23560 802B6300 30423000 */ andi $v0, $v0, 0x3000 +/* E23564 802B6304 14400037 */ bnez $v0, .L802B63E4 +/* E23568 802B6308 27A40010 */ addiu $a0, $sp, 0x10 +/* E2356C 802B630C 820200C4 */ lb $v0, 0xc4($s0) +/* E23570 802B6310 14400034 */ bnez $v0, .L802B63E4 +/* E23574 802B6314 00000000 */ nop +/* E23578 802B6318 86020008 */ lh $v0, 8($s0) +/* E2357C 802B631C 96030008 */ lhu $v1, 8($s0) +/* E23580 802B6320 28420709 */ slti $v0, $v0, 0x709 +/* E23584 802B6324 14400008 */ bnez $v0, .L802B6348 +/* E23588 802B6328 24620001 */ addiu $v0, $v1, 1 +/* E2358C 802B632C 24A20001 */ addiu $v0, $a1, 1 +/* E23590 802B6330 A20200B6 */ sb $v0, 0xb6($s0) +/* E23594 802B6334 3C04000C */ lui $a0, 0xc +/* E23598 802B6338 0C037FBF */ jal func_800DFEFC +/* E2359C 802B633C 34840003 */ ori $a0, $a0, 3 +/* E235A0 802B6340 080AD908 */ j .L802B6420 +/* E235A4 802B6344 00000000 */ nop +.L802B6348: +/* E235A8 802B6348 080AD8F8 */ j .L802B63E0 +/* E235AC 802B634C A6020008 */ sh $v0, 8($s0) +.L802B6350: +/* E235B0 802B6350 960200BC */ lhu $v0, 0xbc($s0) +/* E235B4 802B6354 10400022 */ beqz $v0, .L802B63E0 +/* E235B8 802B6358 3C04000A */ lui $a0, 0xa +/* E235BC 802B635C 34840001 */ ori $a0, $a0, 1 +/* E235C0 802B6360 24A20001 */ addiu $v0, $a1, 1 +/* E235C4 802B6364 A20200B6 */ sb $v0, 0xb6($s0) +/* E235C8 802B6368 080AD8F6 */ j .L802B63D8 +/* E235CC 802B636C A6000008 */ sh $zero, 8($s0) +.L802B6370: +/* E235D0 802B6370 96020008 */ lhu $v0, 8($s0) +/* E235D4 802B6374 24420001 */ addiu $v0, $v0, 1 +/* E235D8 802B6378 A6020008 */ sh $v0, 8($s0) +/* E235DC 802B637C 00021400 */ sll $v0, $v0, 0x10 +/* E235E0 802B6380 00021403 */ sra $v0, $v0, 0x10 +/* E235E4 802B6384 284200C9 */ slti $v0, $v0, 0xc9 +/* E235E8 802B6388 14400016 */ bnez $v0, .L802B63E4 +/* E235EC 802B638C 27A40010 */ addiu $a0, $sp, 0x10 +/* E235F0 802B6390 3C04000C */ lui $a0, 0xc +/* E235F4 802B6394 920200B6 */ lbu $v0, 0xb6($s0) +/* E235F8 802B6398 34840003 */ ori $a0, $a0, 3 +/* E235FC 802B639C 24420001 */ addiu $v0, $v0, 1 +/* E23600 802B63A0 080AD8F6 */ j .L802B63D8 +/* E23604 802B63A4 A20200B6 */ sb $v0, 0xb6($s0) +.L802B63A8: +/* E23608 802B63A8 8E020000 */ lw $v0, ($s0) +/* E2360C 802B63AC 30423000 */ andi $v0, $v0, 0x3000 +/* E23610 802B63B0 10400005 */ beqz $v0, .L802B63C8 +/* E23614 802B63B4 3C04000A */ lui $a0, 0xa +/* E23618 802B63B8 0C037FBF */ jal func_800DFEFC +/* E2361C 802B63BC 34840001 */ ori $a0, $a0, 1 +/* E23620 802B63C0 080AD8F8 */ j .L802B63E0 +/* E23624 802B63C4 A20000B6 */ sb $zero, 0xb6($s0) +.L802B63C8: +/* E23628 802B63C8 960200BC */ lhu $v0, 0xbc($s0) +/* E2362C 802B63CC 10400004 */ beqz $v0, .L802B63E0 +/* E23630 802B63D0 3C04000C */ lui $a0, 0xc +/* E23634 802B63D4 34840004 */ ori $a0, $a0, 4 +.L802B63D8: +/* E23638 802B63D8 0C037FBF */ jal func_800DFEFC +/* E2363C 802B63DC 00000000 */ nop +.L802B63E0: +/* E23640 802B63E0 27A40010 */ addiu $a0, $sp, 0x10 +.L802B63E4: +/* E23644 802B63E4 0C0388C1 */ jal input_to_move_vector +/* E23648 802B63E8 27A50014 */ addiu $a1, $sp, 0x14 +/* E2364C 802B63EC 0C039454 */ jal func_800E5150 +/* E23650 802B63F0 00000000 */ nop +/* E23654 802B63F4 C7A20014 */ lwc1 $f2, 0x14($sp) +/* E23658 802B63F8 44800000 */ mtc1 $zero, $f0 +/* E2365C 802B63FC 00000000 */ nop +/* E23660 802B6400 46001032 */ c.eq.s $f2, $f0 +/* E23664 802B6404 00000000 */ nop +/* E23668 802B6408 45010005 */ bc1t .L802B6420 +/* E2366C 802B640C 24040001 */ addiu $a0, $zero, 1 +/* E23670 802B6410 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E23674 802B6414 A6000008 */ sh $zero, 8($s0) +/* E23678 802B6418 0C039769 */ jal set_action_state +/* E2367C 802B641C E6000080 */ swc1 $f0, 0x80($s0) +.L802B6420: +/* E23680 802B6420 8FBF001C */ lw $ra, 0x1c($sp) +/* E23684 802B6424 8FB00018 */ lw $s0, 0x18($sp) +/* E23688 802B6428 03E00008 */ jr $ra +/* E2368C 802B642C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E236E0/func_802B6000_E236E0.s b/asm/nonmatchings/code_E236E0/func_802B6000_E236E0.s new file mode 100644 index 0000000000..63b8e7e338 --- /dev/null +++ b/asm/nonmatchings/code_E236E0/func_802B6000_E236E0.s @@ -0,0 +1,183 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E236E0 +/* E236E0 802B6000 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E236E4 802B6004 AFB30024 */ sw $s3, 0x24($sp) +/* E236E8 802B6008 AFB00018 */ sw $s0, 0x18($sp) +/* E236EC 802B600C 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E236F0 802B6010 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E236F4 802B6014 AFBF002C */ sw $ra, 0x2c($sp) +/* E236F8 802B6018 AFB40028 */ sw $s4, 0x28($sp) +/* E236FC 802B601C AFB20020 */ sw $s2, 0x20($sp) +/* E23700 802B6020 AFB1001C */ sw $s1, 0x1c($sp) +/* E23704 802B6024 8E050004 */ lw $a1, 4($s0) +/* E23708 802B6028 3C148011 */ lui $s4, %hi(gPlayerData) +/* E2370C 802B602C 2694F290 */ addiu $s4, $s4, %lo(gPlayerData) +/* E23710 802B6030 30A21000 */ andi $v0, $a1, 0x1000 +/* E23714 802B6034 10400005 */ beqz $v0, .L802B604C +/* E23718 802B6038 0000982D */ daddu $s3, $zero, $zero +/* E2371C 802B603C 0C0AD97A */ jal func_802B65E8_E23CC8 +/* E23720 802B6040 00000000 */ nop +/* E23724 802B6044 080AD89A */ j .L802B6268 +/* E23728 802B6048 00000000 */ nop +.L802B604C: +/* E2372C 802B604C 8E030000 */ lw $v1, ($s0) +/* E23730 802B6050 04610016 */ bgez $v1, .L802B60AC +/* E23734 802B6054 3C027F77 */ lui $v0, 0x7f77 +/* E23738 802B6058 3442FFFF */ ori $v0, $v0, 0xffff +/* E2373C 802B605C 24130001 */ addiu $s3, $zero, 1 +/* E23740 802B6060 00621024 */ and $v0, $v1, $v0 +/* E23744 802B6064 AE020000 */ sw $v0, ($s0) +/* E23748 802B6068 30624000 */ andi $v0, $v1, 0x4000 +/* E2374C 802B606C 14400003 */ bnez $v0, .L802B607C +/* E23750 802B6070 AE000060 */ sw $zero, 0x60($s0) +/* E23754 802B6074 C6000058 */ lwc1 $f0, 0x58($s0) +/* E23758 802B6078 E6000054 */ swc1 $f0, 0x54($s0) +.L802B607C: +/* E2375C 802B607C 30A24000 */ andi $v0, $a1, 0x4000 +/* E23760 802B6080 10400003 */ beqz $v0, .L802B6090 +/* E23764 802B6084 3C040009 */ lui $a0, 9 +/* E23768 802B6088 080AD829 */ j .L802B60A4 +/* E2376C 802B608C 34840003 */ ori $a0, $a0, 3 +.L802B6090: +/* E23770 802B6090 30A20001 */ andi $v0, $a1, 1 +/* E23774 802B6094 14400003 */ bnez $v0, .L802B60A4 +/* E23778 802B6098 3C040006 */ lui $a0, 6 +/* E2377C 802B609C 3C040001 */ lui $a0, 1 +/* E23780 802B60A0 34840004 */ ori $a0, $a0, 4 +.L802B60A4: +/* E23784 802B60A4 0C037FBF */ jal func_800DFEFC +/* E23788 802B60A8 00000000 */ nop +.L802B60AC: +/* E2378C 802B60AC 8E020000 */ lw $v0, ($s0) +/* E23790 802B60B0 30424000 */ andi $v0, $v0, 0x4000 +/* E23794 802B60B4 10400006 */ beqz $v0, .L802B60D0 +/* E23798 802B60B8 24040008 */ addiu $a0, $zero, 8 +/* E2379C 802B60BC C60000A0 */ lwc1 $f0, 0xa0($s0) +/* E237A0 802B60C0 0C039426 */ jal func_800E5098 +/* E237A4 802B60C4 E6000080 */ swc1 $f0, 0x80($s0) +/* E237A8 802B60C8 080AD89A */ j .L802B6268 +/* E237AC 802B60CC 00000000 */ nop +.L802B60D0: +/* E237B0 802B60D0 27B20010 */ addiu $s2, $sp, 0x10 +/* E237B4 802B60D4 0240202D */ daddu $a0, $s2, $zero +/* E237B8 802B60D8 27B10014 */ addiu $s1, $sp, 0x14 +/* E237BC 802B60DC 0C0388C1 */ jal input_to_move_vector +/* E237C0 802B60E0 0220282D */ daddu $a1, $s1, $zero +/* E237C4 802B60E4 0C039454 */ jal func_800E5150 +/* E237C8 802B60E8 00000000 */ nop +/* E237CC 802B60EC 0C039858 */ jal check_input_jump +/* E237D0 802B60F0 00000000 */ nop +/* E237D4 802B60F4 1440005C */ bnez $v0, .L802B6268 +/* E237D8 802B60F8 00000000 */ nop +/* E237DC 802B60FC 16600006 */ bnez $s3, .L802B6118 +/* E237E0 802B6100 0240202D */ daddu $a0, $s2, $zero +/* E237E4 802B6104 0C039838 */ jal check_input_hammer +/* E237E8 802B6108 00000000 */ nop +/* E237EC 802B610C 14400056 */ bnez $v0, .L802B6268 +/* E237F0 802B6110 00000000 */ nop +/* E237F4 802B6114 0240202D */ daddu $a0, $s2, $zero +.L802B6118: +/* E237F8 802B6118 0C0388C1 */ jal input_to_move_vector +/* E237FC 802B611C 0220282D */ daddu $a1, $s1, $zero +/* E23800 802B6120 C7A40014 */ lwc1 $f4, 0x14($sp) +/* E23804 802B6124 44800000 */ mtc1 $zero, $f0 +/* E23808 802B6128 00000000 */ nop +/* E2380C 802B612C 46002032 */ c.eq.s $f4, $f0 +/* E23810 802B6130 00000000 */ nop +/* E23814 802B6134 45000005 */ bc1f .L802B614C +/* E23818 802B6138 00000000 */ nop +/* E2381C 802B613C 0C039769 */ jal set_action_state +/* E23820 802B6140 0000202D */ daddu $a0, $zero, $zero +/* E23824 802B6144 080AD89A */ j .L802B6268 +/* E23828 802B6148 00000000 */ nop +.L802B614C: +/* E2382C 802B614C C7A60010 */ lwc1 $f6, 0x10($sp) +/* E23830 802B6150 3C01800F */ lui $at, %hi(D_800F7B40) +/* E23834 802B6154 C4207B40 */ lwc1 $f0, %lo(D_800F7B40)($at) +/* E23838 802B6158 46800020 */ cvt.s.w $f0, $f0 +/* E2383C 802B615C 46060001 */ sub.s $f0, $f0, $f6 +/* E23840 802B6160 3C0142B4 */ lui $at, 0x42b4 +/* E23844 802B6164 44811000 */ mtc1 $at, $f2 +/* E23848 802B6168 46000005 */ abs.s $f0, $f0 +/* E2384C 802B616C 4602003E */ c.le.s $f0, $f2 +/* E23850 802B6170 00000000 */ nop +/* E23854 802B6174 4500001C */ bc1f .L802B61E8 +/* E23858 802B6178 00000000 */ nop +/* E2385C 802B617C 3C01800F */ lui $at, %hi(D_800F7B44) +/* E23860 802B6180 C4207B44 */ lwc1 $f0, %lo(D_800F7B44)($at) +/* E23864 802B6184 46800020 */ cvt.s.w $f0, $f0 +/* E23868 802B6188 46002001 */ sub.s $f0, $f4, $f0 +/* E2386C 802B618C 4600020D */ trunc.w.s $f8, $f0 +/* E23870 802B6190 44024000 */ mfc1 $v0, $f8 +/* E23874 802B6194 00000000 */ nop +/* E23878 802B6198 04420001 */ bltzl $v0, .L802B61A0 +/* E2387C 802B619C 00021023 */ negu $v0, $v0 +.L802B61A0: +/* E23880 802B61A0 28420014 */ slti $v0, $v0, 0x14 +/* E23884 802B61A4 10400010 */ beqz $v0, .L802B61E8 +/* E23888 802B61A8 00000000 */ nop +/* E2388C 802B61AC 8E020004 */ lw $v0, 4($s0) +/* E23890 802B61B0 0440000A */ bltz $v0, .L802B61DC +/* E23894 802B61B4 3C037FFF */ lui $v1, 0x7fff +/* E23898 802B61B8 3C0141A0 */ lui $at, 0x41a0 +/* E2389C 802B61BC 44810000 */ mtc1 $at, $f0 +/* E238A0 802B61C0 00000000 */ nop +/* E238A4 802B61C4 4604003E */ c.le.s $f0, $f4 +/* E238A8 802B61C8 00000000 */ nop +/* E238AC 802B61CC 45030002 */ bc1tl .L802B61D8 +/* E238B0 802B61D0 E6060080 */ swc1 $f6, 0x80($s0) +/* E238B4 802B61D4 3C037FFF */ lui $v1, 0x7fff +.L802B61D8: +/* E238B8 802B61D8 8E020004 */ lw $v0, 4($s0) +.L802B61DC: +/* E238BC 802B61DC 3463FFFF */ ori $v1, $v1, 0xffff +/* E238C0 802B61E0 080AD881 */ j .L802B6204 +/* E238C4 802B61E4 00431024 */ and $v0, $v0, $v1 +.L802B61E8: +/* E238C8 802B61E8 8E020004 */ lw $v0, 4($s0) +/* E238CC 802B61EC 04410004 */ bgez $v0, .L802B6200 +/* E238D0 802B61F0 3C038000 */ lui $v1, 0x8000 +/* E238D4 802B61F4 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E238D8 802B61F8 080AD882 */ j .L802B6208 +/* E238DC 802B61FC E6000080 */ swc1 $f0, 0x80($s0) +.L802B6200: +/* E238E0 802B6200 00431025 */ or $v0, $v0, $v1 +.L802B6204: +/* E238E4 802B6204 AE020004 */ sw $v0, 4($s0) +.L802B6208: +/* E238E8 802B6208 0C03A752 */ jal is_ability_active +/* E238EC 802B620C 2404000B */ addiu $a0, $zero, 0xb +/* E238F0 802B6210 14400010 */ bnez $v0, .L802B6254 +/* E238F4 802B6214 00000000 */ nop +/* E238F8 802B6218 8E0200E8 */ lw $v0, 0xe8($s0) +/* E238FC 802B621C 00420018 */ mult $v0, $v0 +/* E23900 802B6220 00001812 */ mflo $v1 +/* E23904 802B6224 8E0200EC */ lw $v0, 0xec($s0) +/* E23908 802B6228 00000000 */ nop +/* E2390C 802B622C 00420018 */ mult $v0, $v0 +/* E23910 802B6230 00003812 */ mflo $a3 +/* E23914 802B6234 00671021 */ addu $v0, $v1, $a3 +/* E23918 802B6238 28420BD2 */ slti $v0, $v0, 0xbd2 +/* E2391C 802B623C 14400005 */ bnez $v0, .L802B6254 +/* E23920 802B6240 00000000 */ nop +/* E23924 802B6244 0C039769 */ jal set_action_state +/* E23928 802B6248 24040002 */ addiu $a0, $zero, 2 +/* E2392C 802B624C 080AD89A */ j .L802B6268 +/* E23930 802B6250 00000000 */ nop +.L802B6254: +/* E23934 802B6254 0C039426 */ jal func_800E5098 +/* E23938 802B6258 24040008 */ addiu $a0, $zero, 8 +/* E2393C 802B625C 8E8202AC */ lw $v0, 0x2ac($s4) +/* E23940 802B6260 24420001 */ addiu $v0, $v0, 1 +/* E23944 802B6264 AE8202AC */ sw $v0, 0x2ac($s4) +.L802B6268: +/* E23948 802B6268 8FBF002C */ lw $ra, 0x2c($sp) +/* E2394C 802B626C 8FB40028 */ lw $s4, 0x28($sp) +/* E23950 802B6270 8FB30024 */ lw $s3, 0x24($sp) +/* E23954 802B6274 8FB20020 */ lw $s2, 0x20($sp) +/* E23958 802B6278 8FB1001C */ lw $s1, 0x1c($sp) +/* E2395C 802B627C 8FB00018 */ lw $s0, 0x18($sp) +/* E23960 802B6280 03E00008 */ jr $ra +/* E23964 802B6284 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_E236E0/func_802B6288_E23968.s b/asm/nonmatchings/code_E236E0/func_802B6288_E23968.s new file mode 100644 index 0000000000..bfbd392f94 --- /dev/null +++ b/asm/nonmatchings/code_E236E0/func_802B6288_E23968.s @@ -0,0 +1,200 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6288_E23968 +/* E23968 802B6288 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E2396C 802B628C AFB30024 */ sw $s3, 0x24($sp) +/* E23970 802B6290 AFB00018 */ sw $s0, 0x18($sp) +/* E23974 802B6294 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E23978 802B6298 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E2397C 802B629C AFBF002C */ sw $ra, 0x2c($sp) +/* E23980 802B62A0 AFB40028 */ sw $s4, 0x28($sp) +/* E23984 802B62A4 AFB20020 */ sw $s2, 0x20($sp) +/* E23988 802B62A8 AFB1001C */ sw $s1, 0x1c($sp) +/* E2398C 802B62AC 8E050004 */ lw $a1, 4($s0) +/* E23990 802B62B0 3C148011 */ lui $s4, %hi(gPlayerData) +/* E23994 802B62B4 2694F290 */ addiu $s4, $s4, %lo(gPlayerData) +/* E23998 802B62B8 30A21000 */ andi $v0, $a1, 0x1000 +/* E2399C 802B62BC 10400005 */ beqz $v0, .L802B62D4 +/* E239A0 802B62C0 0000982D */ daddu $s3, $zero, $zero +/* E239A4 802B62C4 0C0AD9CE */ jal func_802B6738_E23E18 +/* E239A8 802B62C8 00000000 */ nop +/* E239AC 802B62CC 080AD94C */ j .L802B6530 +/* E239B0 802B62D0 00000000 */ nop +.L802B62D4: +/* E239B4 802B62D4 8E030000 */ lw $v1, ($s0) +/* E239B8 802B62D8 04610019 */ bgez $v1, .L802B6340 +/* E239BC 802B62DC 3C027F77 */ lui $v0, 0x7f77 +/* E239C0 802B62E0 3442FFFF */ ori $v0, $v0, 0xffff +/* E239C4 802B62E4 24130001 */ addiu $s3, $zero, 1 +/* E239C8 802B62E8 00621024 */ and $v0, $v1, $v0 +/* E239CC 802B62EC AE020000 */ sw $v0, ($s0) +/* E239D0 802B62F0 30624000 */ andi $v0, $v1, 0x4000 +/* E239D4 802B62F4 3C018011 */ lui $at, %hi(D_8010C980) +/* E239D8 802B62F8 AC20C980 */ sw $zero, %lo(D_8010C980)($at) +/* E239DC 802B62FC 14400003 */ bnez $v0, .L802B630C +/* E239E0 802B6300 AE000060 */ sw $zero, 0x60($s0) +/* E239E4 802B6304 C600005C */ lwc1 $f0, 0x5c($s0) +/* E239E8 802B6308 E6000054 */ swc1 $f0, 0x54($s0) +.L802B630C: +/* E239EC 802B630C 30A24000 */ andi $v0, $a1, 0x4000 +/* E239F0 802B6310 10400003 */ beqz $v0, .L802B6320 +/* E239F4 802B6314 3C040009 */ lui $a0, 9 +/* E239F8 802B6318 080AD8CE */ j .L802B6338 +/* E239FC 802B631C 34840003 */ ori $a0, $a0, 3 +.L802B6320: +/* E23A00 802B6320 3C040006 */ lui $a0, 6 +/* E23A04 802B6324 30A20001 */ andi $v0, $a1, 1 +/* E23A08 802B6328 14400003 */ bnez $v0, .L802B6338 +/* E23A0C 802B632C 34840002 */ ori $a0, $a0, 2 +/* E23A10 802B6330 3C040001 */ lui $a0, 1 +/* E23A14 802B6334 34840005 */ ori $a0, $a0, 5 +.L802B6338: +/* E23A18 802B6338 0C037FBF */ jal func_800DFEFC +/* E23A1C 802B633C 00000000 */ nop +.L802B6340: +/* E23A20 802B6340 8E020000 */ lw $v0, ($s0) +/* E23A24 802B6344 30424000 */ andi $v0, $v0, 0x4000 +/* E23A28 802B6348 10400006 */ beqz $v0, .L802B6364 +/* E23A2C 802B634C 24040004 */ addiu $a0, $zero, 4 +/* E23A30 802B6350 C60000A0 */ lwc1 $f0, 0xa0($s0) +/* E23A34 802B6354 0C039426 */ jal func_800E5098 +/* E23A38 802B6358 E6000080 */ swc1 $f0, 0x80($s0) +/* E23A3C 802B635C 080AD94C */ j .L802B6530 +/* E23A40 802B6360 00000000 */ nop +.L802B6364: +/* E23A44 802B6364 3C038011 */ lui $v1, %hi(D_8010C980) +/* E23A48 802B6368 2463C980 */ addiu $v1, $v1, %lo(D_8010C980) +/* E23A4C 802B636C 8C620000 */ lw $v0, ($v1) +/* E23A50 802B6370 3C013F80 */ lui $at, 0x3f80 +/* E23A54 802B6374 44811000 */ mtc1 $at, $f2 +/* E23A58 802B6378 24420001 */ addiu $v0, $v0, 1 +/* E23A5C 802B637C AC620000 */ sw $v0, ($v1) +/* E23A60 802B6380 8E020004 */ lw $v0, 4($s0) +/* E23A64 802B6384 3C030001 */ lui $v1, 1 +/* E23A68 802B6388 00431024 */ and $v0, $v0, $v1 +/* E23A6C 802B638C 10400003 */ beqz $v0, .L802B639C +/* E23A70 802B6390 00000000 */ nop +/* E23A74 802B6394 3C013FC0 */ lui $at, 0x3fc0 +/* E23A78 802B6398 44811000 */ mtc1 $at, $f2 +.L802B639C: +/* E23A7C 802B639C C600005C */ lwc1 $f0, 0x5c($s0) +/* E23A80 802B63A0 46020002 */ mul.s $f0, $f0, $f2 +/* E23A84 802B63A4 00000000 */ nop +/* E23A88 802B63A8 27B20010 */ addiu $s2, $sp, 0x10 +/* E23A8C 802B63AC 0240202D */ daddu $a0, $s2, $zero +/* E23A90 802B63B0 27B10014 */ addiu $s1, $sp, 0x14 +/* E23A94 802B63B4 0220282D */ daddu $a1, $s1, $zero +/* E23A98 802B63B8 0C0388C1 */ jal input_to_move_vector +/* E23A9C 802B63BC E6000054 */ swc1 $f0, 0x54($s0) +/* E23AA0 802B63C0 0C039454 */ jal func_800E5150 +/* E23AA4 802B63C4 00000000 */ nop +/* E23AA8 802B63C8 0C039858 */ jal check_input_jump +/* E23AAC 802B63CC 00000000 */ nop +/* E23AB0 802B63D0 14400057 */ bnez $v0, .L802B6530 +/* E23AB4 802B63D4 00000000 */ nop +/* E23AB8 802B63D8 16600006 */ bnez $s3, .L802B63F4 +/* E23ABC 802B63DC 0240202D */ daddu $a0, $s2, $zero +/* E23AC0 802B63E0 0C039838 */ jal check_input_hammer +/* E23AC4 802B63E4 00000000 */ nop +/* E23AC8 802B63E8 14400051 */ bnez $v0, .L802B6530 +/* E23ACC 802B63EC 00000000 */ nop +/* E23AD0 802B63F0 0240202D */ daddu $a0, $s2, $zero +.L802B63F4: +/* E23AD4 802B63F4 0C0388C1 */ jal input_to_move_vector +/* E23AD8 802B63F8 0220282D */ daddu $a1, $s1, $zero +/* E23ADC 802B63FC C7A20014 */ lwc1 $f2, 0x14($sp) +/* E23AE0 802B6400 44800000 */ mtc1 $zero, $f0 +/* E23AE4 802B6404 00000000 */ nop +/* E23AE8 802B6408 46001032 */ c.eq.s $f2, $f0 +/* E23AEC 802B640C 00000000 */ nop +/* E23AF0 802B6410 45000005 */ bc1f .L802B6428 +/* E23AF4 802B6414 00000000 */ nop +/* E23AF8 802B6418 0C039769 */ jal set_action_state +/* E23AFC 802B641C 0000202D */ daddu $a0, $zero, $zero +/* E23B00 802B6420 080AD94C */ j .L802B6530 +/* E23B04 802B6424 00000000 */ nop +.L802B6428: +/* E23B08 802B6428 C7A40010 */ lwc1 $f4, 0x10($sp) +/* E23B0C 802B642C 3C01800F */ lui $at, %hi(D_800F7B40) +/* E23B10 802B6430 C4207B40 */ lwc1 $f0, %lo(D_800F7B40)($at) +/* E23B14 802B6434 46800020 */ cvt.s.w $f0, $f0 +/* E23B18 802B6438 46040001 */ sub.s $f0, $f0, $f4 +/* E23B1C 802B643C 3C0142B4 */ lui $at, 0x42b4 +/* E23B20 802B6440 44811000 */ mtc1 $at, $f2 +/* E23B24 802B6444 46000005 */ abs.s $f0, $f0 +/* E23B28 802B6448 4602003E */ c.le.s $f0, $f2 +/* E23B2C 802B644C 00000000 */ nop +/* E23B30 802B6450 45000009 */ bc1f .L802B6478 +/* E23B34 802B6454 00000000 */ nop +/* E23B38 802B6458 8E020004 */ lw $v0, 4($s0) +/* E23B3C 802B645C 04430001 */ bgezl $v0, .L802B6464 +/* E23B40 802B6460 E6040080 */ swc1 $f4, 0x80($s0) +.L802B6464: +/* E23B44 802B6464 3C037FFF */ lui $v1, 0x7fff +/* E23B48 802B6468 8E020004 */ lw $v0, 4($s0) +/* E23B4C 802B646C 3463FFFF */ ori $v1, $v1, 0xffff +/* E23B50 802B6470 080AD924 */ j .L802B6490 +/* E23B54 802B6474 00431024 */ and $v0, $v0, $v1 +.L802B6478: +/* E23B58 802B6478 8E020004 */ lw $v0, 4($s0) +/* E23B5C 802B647C 04410003 */ bgez $v0, .L802B648C +/* E23B60 802B6480 3C038000 */ lui $v1, 0x8000 +/* E23B64 802B6484 080AD925 */ j .L802B6494 +/* E23B68 802B6488 E6040080 */ swc1 $f4, 0x80($s0) +.L802B648C: +/* E23B6C 802B648C 00431025 */ or $v0, $v0, $v1 +.L802B6490: +/* E23B70 802B6490 AE020004 */ sw $v0, 4($s0) +.L802B6494: +/* E23B74 802B6494 0C03A752 */ jal is_ability_active +/* E23B78 802B6498 2404000B */ addiu $a0, $zero, 0xb +/* E23B7C 802B649C 1440001B */ bnez $v0, .L802B650C +/* E23B80 802B64A0 00000000 */ nop +/* E23B84 802B64A4 8E0200E8 */ lw $v0, 0xe8($s0) +/* E23B88 802B64A8 00420018 */ mult $v0, $v0 +/* E23B8C 802B64AC 00001812 */ mflo $v1 +/* E23B90 802B64B0 8E0200EC */ lw $v0, 0xec($s0) +/* E23B94 802B64B4 00000000 */ nop +/* E23B98 802B64B8 00420018 */ mult $v0, $v0 +/* E23B9C 802B64BC 00003812 */ mflo $a3 +/* E23BA0 802B64C0 00671021 */ addu $v0, $v1, $a3 +/* E23BA4 802B64C4 44826000 */ mtc1 $v0, $f12 +/* E23BA8 802B64C8 00000000 */ nop +/* E23BAC 802B64CC 46806320 */ cvt.s.w $f12, $f12 +/* E23BB0 802B64D0 46006084 */ sqrt.s $f2, $f12 +/* E23BB4 802B64D4 46021032 */ c.eq.s $f2, $f2 +/* E23BB8 802B64D8 00000000 */ nop +/* E23BBC 802B64DC 45010004 */ bc1t .L802B64F0 +/* E23BC0 802B64E0 00000000 */ nop +/* E23BC4 802B64E4 0C0187BC */ jal sqrtf +/* E23BC8 802B64E8 00000000 */ nop +/* E23BCC 802B64EC 46000086 */ mov.s $f2, $f0 +.L802B64F0: +/* E23BD0 802B64F0 3C01425C */ lui $at, 0x425c +/* E23BD4 802B64F4 44810000 */ mtc1 $at, $f0 +/* E23BD8 802B64F8 00000000 */ nop +/* E23BDC 802B64FC 4600103E */ c.le.s $f2, $f0 +/* E23BE0 802B6500 00000000 */ nop +/* E23BE4 802B6504 45000005 */ bc1f .L802B651C +/* E23BE8 802B6508 00000000 */ nop +.L802B650C: +/* E23BEC 802B650C 0C039769 */ jal set_action_state +/* E23BF0 802B6510 24040001 */ addiu $a0, $zero, 1 +/* E23BF4 802B6514 080AD94C */ j .L802B6530 +/* E23BF8 802B6518 00000000 */ nop +.L802B651C: +/* E23BFC 802B651C 0C039426 */ jal func_800E5098 +/* E23C00 802B6520 24040004 */ addiu $a0, $zero, 4 +/* E23C04 802B6524 8E8202B0 */ lw $v0, 0x2b0($s4) +/* E23C08 802B6528 24420001 */ addiu $v0, $v0, 1 +/* E23C0C 802B652C AE8202B0 */ sw $v0, 0x2b0($s4) +.L802B6530: +/* E23C10 802B6530 8FBF002C */ lw $ra, 0x2c($sp) +/* E23C14 802B6534 8FB40028 */ lw $s4, 0x28($sp) +/* E23C18 802B6538 8FB30024 */ lw $s3, 0x24($sp) +/* E23C1C 802B653C 8FB20020 */ lw $s2, 0x20($sp) +/* E23C20 802B6540 8FB1001C */ lw $s1, 0x1c($sp) +/* E23C24 802B6544 8FB00018 */ lw $s0, 0x18($sp) +/* E23C28 802B6548 03E00008 */ jr $ra +/* E23C2C 802B654C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_E236E0/func_802B6550_E23C30.s b/asm/nonmatchings/code_E236E0/func_802B6550_E23C30.s new file mode 100644 index 0000000000..484eb2c980 --- /dev/null +++ b/asm/nonmatchings/code_E236E0/func_802B6550_E23C30.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6550_E23C30 +/* E23C30 802B6550 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E23C34 802B6554 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* E23C38 802B6558 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* E23C3C 802B655C AFBF0010 */ sw $ra, 0x10($sp) +/* E23C40 802B6560 8C620004 */ lw $v0, 4($v1) +/* E23C44 802B6564 30422000 */ andi $v0, $v0, 0x2000 +/* E23C48 802B6568 14400013 */ bnez $v0, .L802B65B8 +/* E23C4C 802B656C 00000000 */ nop +/* E23C50 802B6570 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* E23C54 802B6574 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* E23C58 802B6578 9062007E */ lbu $v0, 0x7e($v1) +/* E23C5C 802B657C 30420010 */ andi $v0, $v0, 0x10 +/* E23C60 802B6580 14400009 */ bnez $v0, .L802B65A8 +/* E23C64 802B6584 3C04000D */ lui $a0, 0xd +/* E23C68 802B6588 90620080 */ lbu $v0, 0x80($v1) +/* E23C6C 802B658C 00021080 */ sll $v0, $v0, 2 +/* E23C70 802B6590 3C04802B */ lui $a0, %hi(D_802B6910) +/* E23C74 802B6594 00822021 */ addu $a0, $a0, $v0 +/* E23C78 802B6598 0C037FBF */ jal func_800DFEFC +/* E23C7C 802B659C 8C846910 */ lw $a0, %lo(D_802B6910)($a0) +/* E23C80 802B65A0 080AD977 */ j .L802B65DC +/* E23C84 802B65A4 00000000 */ nop +.L802B65A8: +/* E23C88 802B65A8 0C037FBF */ jal func_800DFEFC +/* E23C8C 802B65AC 3484000D */ ori $a0, $a0, 0xd +/* E23C90 802B65B0 080AD977 */ j .L802B65DC +/* E23C94 802B65B4 00000000 */ nop +.L802B65B8: +/* E23C98 802B65B8 8063000C */ lb $v1, 0xc($v1) +/* E23C9C 802B65BC 00031040 */ sll $v0, $v1, 1 +/* E23CA0 802B65C0 00431021 */ addu $v0, $v0, $v1 +/* E23CA4 802B65C4 000210C0 */ sll $v0, $v0, 3 +/* E23CA8 802B65C8 3C04800F */ lui $a0, %hi(D_800F7C20) +/* E23CAC 802B65CC 00822021 */ addu $a0, $a0, $v0 +/* E23CB0 802B65D0 8C847C20 */ lw $a0, %lo(D_800F7C20)($a0) +/* E23CB4 802B65D4 0C0398DB */ jal func_800E636C +/* E23CB8 802B65D8 00000000 */ nop +.L802B65DC: +/* E23CBC 802B65DC 8FBF0010 */ lw $ra, 0x10($sp) +/* E23CC0 802B65E0 03E00008 */ jr $ra +/* E23CC4 802B65E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E236E0/func_802B65E8_E23CC8.s b/asm/nonmatchings/code_E236E0/func_802B65E8_E23CC8.s new file mode 100644 index 0000000000..1add9a64b4 --- /dev/null +++ b/asm/nonmatchings/code_E236E0/func_802B65E8_E23CC8.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B65E8_E23CC8 +/* E23CC8 802B65E8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E23CCC 802B65EC AFB00018 */ sw $s0, 0x18($sp) +/* E23CD0 802B65F0 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E23CD4 802B65F4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E23CD8 802B65F8 AFBF001C */ sw $ra, 0x1c($sp) +/* E23CDC 802B65FC 8E030000 */ lw $v1, ($s0) +/* E23CE0 802B6600 0461000B */ bgez $v1, .L802B6630 +/* E23CE4 802B6604 3C027FFF */ lui $v0, 0x7fff +/* E23CE8 802B6608 3442FFFF */ ori $v0, $v0, 0xffff +/* E23CEC 802B660C 00621024 */ and $v0, $v1, $v0 +/* E23CF0 802B6610 AE020000 */ sw $v0, ($s0) +/* E23CF4 802B6614 30624000 */ andi $v0, $v1, 0x4000 +/* E23CF8 802B6618 14400003 */ bnez $v0, .L802B6628 +/* E23CFC 802B661C AE000060 */ sw $zero, 0x60($s0) +/* E23D00 802B6620 C6000058 */ lwc1 $f0, 0x58($s0) +/* E23D04 802B6624 E6000054 */ swc1 $f0, 0x54($s0) +.L802B6628: +/* E23D08 802B6628 0C0AD954 */ jal func_802B6550_E23C30 +/* E23D0C 802B662C 00000000 */ nop +.L802B6630: +/* E23D10 802B6630 8E020000 */ lw $v0, ($s0) +/* E23D14 802B6634 30424000 */ andi $v0, $v0, 0x4000 +/* E23D18 802B6638 10400004 */ beqz $v0, .L802B664C +/* E23D1C 802B663C 24040008 */ addiu $a0, $zero, 8 +/* E23D20 802B6640 C60000A0 */ lwc1 $f0, 0xa0($s0) +/* E23D24 802B6644 080AD9C8 */ j .L802B6720 +/* E23D28 802B6648 E6000080 */ swc1 $f0, 0x80($s0) +.L802B664C: +/* E23D2C 802B664C 27A40010 */ addiu $a0, $sp, 0x10 +/* E23D30 802B6650 0C0388C1 */ jal input_to_move_vector +/* E23D34 802B6654 27A50014 */ addiu $a1, $sp, 0x14 +/* E23D38 802B6658 0C039454 */ jal func_800E5150 +/* E23D3C 802B665C 00000000 */ nop +/* E23D40 802B6660 C7A20014 */ lwc1 $f2, 0x14($sp) +/* E23D44 802B6664 44800000 */ mtc1 $zero, $f0 +/* E23D48 802B6668 00000000 */ nop +/* E23D4C 802B666C 46001032 */ c.eq.s $f2, $f0 +/* E23D50 802B6670 00000000 */ nop +/* E23D54 802B6674 45000005 */ bc1f .L802B668C +/* E23D58 802B6678 00000000 */ nop +/* E23D5C 802B667C 0C039769 */ jal set_action_state +/* E23D60 802B6680 0000202D */ daddu $a0, $zero, $zero +/* E23D64 802B6684 080AD9CA */ j .L802B6728 +/* E23D68 802B6688 00000000 */ nop +.L802B668C: +/* E23D6C 802B668C C7A00010 */ lwc1 $f0, 0x10($sp) +/* E23D70 802B6690 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* E23D74 802B6694 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* E23D78 802B6698 E6000080 */ swc1 $f0, 0x80($s0) +/* E23D7C 802B669C 90420080 */ lbu $v0, 0x80($v0) +/* E23D80 802B66A0 1440001F */ bnez $v0, .L802B6720 +/* E23D84 802B66A4 24040008 */ addiu $a0, $zero, 8 +/* E23D88 802B66A8 8E0200E8 */ lw $v0, 0xe8($s0) +/* E23D8C 802B66AC 00420018 */ mult $v0, $v0 +/* E23D90 802B66B0 00001812 */ mflo $v1 +/* E23D94 802B66B4 8E0200EC */ lw $v0, 0xec($s0) +/* E23D98 802B66B8 00000000 */ nop +/* E23D9C 802B66BC 00420018 */ mult $v0, $v0 +/* E23DA0 802B66C0 00001012 */ mflo $v0 +/* E23DA4 802B66C4 00621021 */ addu $v0, $v1, $v0 +/* E23DA8 802B66C8 44826000 */ mtc1 $v0, $f12 +/* E23DAC 802B66CC 00000000 */ nop +/* E23DB0 802B66D0 46806320 */ cvt.s.w $f12, $f12 +/* E23DB4 802B66D4 46006084 */ sqrt.s $f2, $f12 +/* E23DB8 802B66D8 46021032 */ c.eq.s $f2, $f2 +/* E23DBC 802B66DC 00000000 */ nop +/* E23DC0 802B66E0 45010004 */ bc1t .L802B66F4 +/* E23DC4 802B66E4 00000000 */ nop +/* E23DC8 802B66E8 0C0187BC */ jal sqrtf +/* E23DCC 802B66EC 00000000 */ nop +/* E23DD0 802B66F0 46000086 */ mov.s $f2, $f0 +.L802B66F4: +/* E23DD4 802B66F4 3C01425C */ lui $at, 0x425c +/* E23DD8 802B66F8 44810000 */ mtc1 $at, $f0 +/* E23DDC 802B66FC 00000000 */ nop +/* E23DE0 802B6700 4602003C */ c.lt.s $f0, $f2 +/* E23DE4 802B6704 00000000 */ nop +/* E23DE8 802B6708 45000005 */ bc1f .L802B6720 +/* E23DEC 802B670C 24040008 */ addiu $a0, $zero, 8 +/* E23DF0 802B6710 0C039769 */ jal set_action_state +/* E23DF4 802B6714 24040002 */ addiu $a0, $zero, 2 +/* E23DF8 802B6718 080AD9CA */ j .L802B6728 +/* E23DFC 802B671C 00000000 */ nop +.L802B6720: +/* E23E00 802B6720 0C039426 */ jal func_800E5098 +/* E23E04 802B6724 00000000 */ nop +.L802B6728: +/* E23E08 802B6728 8FBF001C */ lw $ra, 0x1c($sp) +/* E23E0C 802B672C 8FB00018 */ lw $s0, 0x18($sp) +/* E23E10 802B6730 03E00008 */ jr $ra +/* E23E14 802B6734 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E236E0/func_802B6738_E23E18.s b/asm/nonmatchings/code_E236E0/func_802B6738_E23E18.s new file mode 100644 index 0000000000..4f49cacd15 --- /dev/null +++ b/asm/nonmatchings/code_E236E0/func_802B6738_E23E18.s @@ -0,0 +1,128 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6738_E23E18 +/* E23E18 802B6738 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E23E1C 802B673C AFB00018 */ sw $s0, 0x18($sp) +/* E23E20 802B6740 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E23E24 802B6744 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E23E28 802B6748 AFBF001C */ sw $ra, 0x1c($sp) +/* E23E2C 802B674C 8E030000 */ lw $v1, ($s0) +/* E23E30 802B6750 0461002E */ bgez $v1, .L802B680C +/* E23E34 802B6754 3C027FFF */ lui $v0, 0x7fff +/* E23E38 802B6758 3442FFFF */ ori $v0, $v0, 0xffff +/* E23E3C 802B675C 00621024 */ and $v0, $v1, $v0 +/* E23E40 802B6760 AE020000 */ sw $v0, ($s0) +/* E23E44 802B6764 30624000 */ andi $v0, $v1, 0x4000 +/* E23E48 802B6768 14400003 */ bnez $v0, .L802B6778 +/* E23E4C 802B676C AE000060 */ sw $zero, 0x60($s0) +/* E23E50 802B6770 C600005C */ lwc1 $f0, 0x5c($s0) +/* E23E54 802B6774 E6000054 */ swc1 $f0, 0x54($s0) +.L802B6778: +/* E23E58 802B6778 8E020004 */ lw $v0, 4($s0) +/* E23E5C 802B677C 30422000 */ andi $v0, $v0, 0x2000 +/* E23E60 802B6780 14400019 */ bnez $v0, .L802B67E8 +/* E23E64 802B6784 00000000 */ nop +/* E23E68 802B6788 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* E23E6C 802B678C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* E23E70 802B6790 9062007E */ lbu $v0, 0x7e($v1) +/* E23E74 802B6794 30420010 */ andi $v0, $v0, 0x10 +/* E23E78 802B6798 1440000F */ bnez $v0, .L802B67D8 +/* E23E7C 802B679C 3C04000D */ lui $a0, 0xd +/* E23E80 802B67A0 90620080 */ lbu $v0, 0x80($v1) +/* E23E84 802B67A4 14400006 */ bnez $v0, .L802B67C0 +/* E23E88 802B67A8 00021080 */ sll $v0, $v0, 2 +/* E23E8C 802B67AC 3C04000A */ lui $a0, 0xa +/* E23E90 802B67B0 0C037FBF */ jal func_800DFEFC +/* E23E94 802B67B4 34840003 */ ori $a0, $a0, 3 +/* E23E98 802B67B8 080ADA03 */ j .L802B680C +/* E23E9C 802B67BC 00000000 */ nop +.L802B67C0: +/* E23EA0 802B67C0 3C04802B */ lui $a0, %hi(D_802B6910) +/* E23EA4 802B67C4 00822021 */ addu $a0, $a0, $v0 +/* E23EA8 802B67C8 0C037FBF */ jal func_800DFEFC +/* E23EAC 802B67CC 8C846910 */ lw $a0, %lo(D_802B6910)($a0) +/* E23EB0 802B67D0 080ADA03 */ j .L802B680C +/* E23EB4 802B67D4 00000000 */ nop +.L802B67D8: +/* E23EB8 802B67D8 0C037FBF */ jal func_800DFEFC +/* E23EBC 802B67DC 3484000D */ ori $a0, $a0, 0xd +/* E23EC0 802B67E0 080ADA03 */ j .L802B680C +/* E23EC4 802B67E4 00000000 */ nop +.L802B67E8: +/* E23EC8 802B67E8 8203000C */ lb $v1, 0xc($s0) +/* E23ECC 802B67EC 00031040 */ sll $v0, $v1, 1 +/* E23ED0 802B67F0 00431021 */ addu $v0, $v0, $v1 +/* E23ED4 802B67F4 000210C0 */ sll $v0, $v0, 3 +/* E23ED8 802B67F8 3C04800F */ lui $a0, %hi(D_800F7C24) +/* E23EDC 802B67FC 00822021 */ addu $a0, $a0, $v0 +/* E23EE0 802B6800 8C847C24 */ lw $a0, %lo(D_800F7C24)($a0) +/* E23EE4 802B6804 0C0398DB */ jal func_800E636C +/* E23EE8 802B6808 00000000 */ nop +.L802B680C: +/* E23EEC 802B680C 8E020000 */ lw $v0, ($s0) +/* E23EF0 802B6810 30424000 */ andi $v0, $v0, 0x4000 +/* E23EF4 802B6814 10400004 */ beqz $v0, .L802B6828 +/* E23EF8 802B6818 24040004 */ addiu $a0, $zero, 4 +/* E23EFC 802B681C C60000A0 */ lwc1 $f0, 0xa0($s0) +/* E23F00 802B6820 080ADA3B */ j .L802B68EC +/* E23F04 802B6824 E6000080 */ swc1 $f0, 0x80($s0) +.L802B6828: +/* E23F08 802B6828 27A40010 */ addiu $a0, $sp, 0x10 +/* E23F0C 802B682C C600005C */ lwc1 $f0, 0x5c($s0) +/* E23F10 802B6830 27A50014 */ addiu $a1, $sp, 0x14 +/* E23F14 802B6834 0C0388C1 */ jal input_to_move_vector +/* E23F18 802B6838 E6000054 */ swc1 $f0, 0x54($s0) +/* E23F1C 802B683C 0C039454 */ jal func_800E5150 +/* E23F20 802B6840 00000000 */ nop +/* E23F24 802B6844 C7A20014 */ lwc1 $f2, 0x14($sp) +/* E23F28 802B6848 44800000 */ mtc1 $zero, $f0 +/* E23F2C 802B684C 00000000 */ nop +/* E23F30 802B6850 46001032 */ c.eq.s $f2, $f0 +/* E23F34 802B6854 00000000 */ nop +/* E23F38 802B6858 45000005 */ bc1f .L802B6870 +/* E23F3C 802B685C 00000000 */ nop +/* E23F40 802B6860 0C039769 */ jal set_action_state +/* E23F44 802B6864 0000202D */ daddu $a0, $zero, $zero +/* E23F48 802B6868 080ADA3D */ j .L802B68F4 +/* E23F4C 802B686C 00000000 */ nop +.L802B6870: +/* E23F50 802B6870 8E0200E8 */ lw $v0, 0xe8($s0) +/* E23F54 802B6874 00420018 */ mult $v0, $v0 +/* E23F58 802B6878 00001812 */ mflo $v1 +/* E23F5C 802B687C 8E0200EC */ lw $v0, 0xec($s0) +/* E23F60 802B6880 00000000 */ nop +/* E23F64 802B6884 00420018 */ mult $v0, $v0 +/* E23F68 802B6888 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E23F6C 802B688C 00001012 */ mflo $v0 +/* E23F70 802B6890 00621021 */ addu $v0, $v1, $v0 +/* E23F74 802B6894 44826000 */ mtc1 $v0, $f12 +/* E23F78 802B6898 00000000 */ nop +/* E23F7C 802B689C 46806320 */ cvt.s.w $f12, $f12 +/* E23F80 802B68A0 46006084 */ sqrt.s $f2, $f12 +/* E23F84 802B68A4 46021032 */ c.eq.s $f2, $f2 +/* E23F88 802B68A8 00000000 */ nop +/* E23F8C 802B68AC 45010004 */ bc1t .L802B68C0 +/* E23F90 802B68B0 E6000080 */ swc1 $f0, 0x80($s0) +/* E23F94 802B68B4 0C0187BC */ jal sqrtf +/* E23F98 802B68B8 00000000 */ nop +/* E23F9C 802B68BC 46000086 */ mov.s $f2, $f0 +.L802B68C0: +/* E23FA0 802B68C0 3C01425C */ lui $at, 0x425c +/* E23FA4 802B68C4 44810000 */ mtc1 $at, $f0 +/* E23FA8 802B68C8 00000000 */ nop +/* E23FAC 802B68CC 4600103C */ c.lt.s $f2, $f0 +/* E23FB0 802B68D0 00000000 */ nop +/* E23FB4 802B68D4 45000005 */ bc1f .L802B68EC +/* E23FB8 802B68D8 24040004 */ addiu $a0, $zero, 4 +/* E23FBC 802B68DC 0C039769 */ jal set_action_state +/* E23FC0 802B68E0 24040001 */ addiu $a0, $zero, 1 +/* E23FC4 802B68E4 080ADA3D */ j .L802B68F4 +/* E23FC8 802B68E8 00000000 */ nop +.L802B68EC: +/* E23FCC 802B68EC 0C039426 */ jal func_800E5098 +/* E23FD0 802B68F0 00000000 */ nop +.L802B68F4: +/* E23FD4 802B68F4 8FBF001C */ lw $ra, 0x1c($sp) +/* E23FD8 802B68F8 8FB00018 */ lw $s0, 0x18($sp) +/* E23FDC 802B68FC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_E24040/func_802B6000_E24040.s b/asm/nonmatchings/code_E24040/func_802B6000_E24040.s new file mode 100644 index 0000000000..f1873e0122 --- /dev/null +++ b/asm/nonmatchings/code_E24040/func_802B6000_E24040.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E24040 +/* E24040 802B6000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E24044 802B6004 3C037FFF */ lui $v1, 0x7fff +/* E24048 802B6008 AFB00010 */ sw $s0, 0x10($sp) +/* E2404C 802B600C 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E24050 802B6010 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E24054 802B6014 AFBF0014 */ sw $ra, 0x14($sp) +/* E24058 802B6018 8E020000 */ lw $v0, ($s0) +/* E2405C 802B601C C6000028 */ lwc1 $f0, 0x28($s0) +/* E24060 802B6020 C6020030 */ lwc1 $f2, 0x30($s0) +/* E24064 802B6024 C604002C */ lwc1 $f4, 0x2c($s0) +/* E24068 802B6028 3463FFF7 */ ori $v1, $v1, 0xfff7 +/* E2406C 802B602C A20000B6 */ sb $zero, 0xb6($s0) +/* E24070 802B6030 A60000C0 */ sh $zero, 0xc0($s0) +/* E24074 802B6034 A60000C2 */ sh $zero, 0xc2($s0) +/* E24078 802B6038 00431024 */ and $v0, $v0, $v1 +/* E2407C 802B603C 34420002 */ ori $v0, $v0, 2 +/* E24080 802B6040 AE020000 */ sw $v0, ($s0) +/* E24084 802B6044 E600003C */ swc1 $f0, 0x3c($s0) +/* E24088 802B6048 E6020040 */ swc1 $f2, 0x40($s0) +/* E2408C 802B604C 0C038BD8 */ jal func_800E2F60 +/* E24090 802B6050 E604004C */ swc1 $f4, 0x4c($s0) +/* E24094 802B6054 8E030004 */ lw $v1, 4($s0) +/* E24098 802B6058 3C108016 */ lui $s0, %hi(gCollisionStatus) +/* E2409C 802B605C 2610A550 */ addiu $s0, $s0, %lo(gCollisionStatus) +/* E240A0 802B6060 30624000 */ andi $v0, $v1, 0x4000 +/* E240A4 802B6064 10400003 */ beqz $v0, .L802B6074 +/* E240A8 802B6068 3C040009 */ lui $a0, 9 +/* E240AC 802B606C 080AD823 */ j .L802B608C +/* E240B0 802B6070 34840005 */ ori $a0, $a0, 5 +.L802B6074: +/* E240B4 802B6074 3C040006 */ lui $a0, 6 +/* E240B8 802B6078 30620003 */ andi $v0, $v1, 3 +/* E240BC 802B607C 14400003 */ bnez $v0, .L802B608C +/* E240C0 802B6080 34840009 */ ori $a0, $a0, 9 +/* E240C4 802B6084 3C040001 */ lui $a0, 1 +/* E240C8 802B6088 34840007 */ ori $a0, $a0, 7 +.L802B608C: +/* E240CC 802B608C 0C037FBF */ jal func_800DFEFC +/* E240D0 802B6090 00000000 */ nop +/* E240D4 802B6094 96030002 */ lhu $v1, 2($s0) +/* E240D8 802B6098 2402FFFF */ addiu $v0, $zero, -1 +/* E240DC 802B609C A6020002 */ sh $v0, 2($s0) +/* E240E0 802B60A0 A6030004 */ sh $v1, 4($s0) +/* E240E4 802B60A4 8FBF0014 */ lw $ra, 0x14($sp) +/* E240E8 802B60A8 8FB00010 */ lw $s0, 0x10($sp) +/* E240EC 802B60AC 03E00008 */ jr $ra +/* E240F0 802B60B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s b/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s new file mode 100644 index 0000000000..8d2fb1042d --- /dev/null +++ b/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s @@ -0,0 +1,67 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B60B4_E240F4 +/* E240F4 802B60B4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E240F8 802B60B8 AFB00010 */ sw $s0, 0x10($sp) +/* E240FC 802B60BC 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E24100 802B60C0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E24104 802B60C4 AFBF0014 */ sw $ra, 0x14($sp) +/* E24108 802B60C8 8E030000 */ lw $v1, ($s0) +/* E2410C 802B60CC 0461001D */ bgez $v1, .L802B6144 +/* E24110 802B60D0 3C027FFF */ lui $v0, 0x7fff +/* E24114 802B60D4 3442FFFF */ ori $v0, $v0, 0xffff +/* E24118 802B60D8 00621024 */ and $v0, $v1, $v0 +/* E2411C 802B60DC 0C0AD800 */ jal func_802B6000_E24040 +/* E24120 802B60E0 AE020000 */ sw $v0, ($s0) +/* E24124 802B60E4 820300B4 */ lb $v1, 0xb4($s0) +/* E24128 802B60E8 24020006 */ addiu $v0, $zero, 6 +/* E2412C 802B60EC 14620005 */ bne $v1, $v0, .L802B6104 +/* E24130 802B60F0 00000000 */ nop +/* E24134 802B60F4 0C03954C */ jal func_800E5530 +/* E24138 802B60F8 00000000 */ nop +/* E2413C 802B60FC 080AD846 */ j .L802B6118 +/* E24140 802B6100 00000000 */ nop +.L802B6104: +/* E24144 802B6104 3C03800B */ lui $v1, %hi(gCameras) +/* E24148 802B6108 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* E2414C 802B610C 94620002 */ lhu $v0, 2($v1) +/* E24150 802B6110 34420001 */ ori $v0, $v0, 1 +/* E24154 802B6114 A4620002 */ sh $v0, 2($v1) +.L802B6118: +/* E24158 802B6118 820300B4 */ lb $v1, 0xb4($s0) +/* E2415C 802B611C 24020003 */ addiu $v0, $zero, 3 +/* E24160 802B6120 14620008 */ bne $v1, $v0, .L802B6144 +/* E24164 802B6124 00000000 */ nop +/* E24168 802B6128 8E020004 */ lw $v0, 4($s0) +/* E2416C 802B612C 30424000 */ andi $v0, $v0, 0x4000 +/* E24170 802B6130 10400002 */ beqz $v0, .L802B613C +/* E24174 802B6134 24042081 */ addiu $a0, $zero, 0x2081 +/* E24178 802B6138 24042082 */ addiu $a0, $zero, 0x2082 +.L802B613C: +/* E2417C 802B613C 0C052736 */ jal play_sound_at_player +/* E24180 802B6140 0000282D */ daddu $a1, $zero, $zero +.L802B6144: +/* E24184 802B6144 8E030004 */ lw $v1, 4($s0) +/* E24188 802B6148 30624000 */ andi $v0, $v1, 0x4000 +/* E2418C 802B614C 10400003 */ beqz $v0, .L802B615C +/* E24190 802B6150 3C040009 */ lui $a0, 9 +/* E24194 802B6154 080AD85D */ j .L802B6174 +/* E24198 802B6158 34840005 */ ori $a0, $a0, 5 +.L802B615C: +/* E2419C 802B615C 3C040006 */ lui $a0, 6 +/* E241A0 802B6160 30620003 */ andi $v0, $v1, 3 +/* E241A4 802B6164 14400003 */ bnez $v0, .L802B6174 +/* E241A8 802B6168 34840009 */ ori $a0, $a0, 9 +/* E241AC 802B616C 3C040001 */ lui $a0, 1 +/* E241B0 802B6170 34840007 */ ori $a0, $a0, 7 +.L802B6174: +/* E241B4 802B6174 0C037FBF */ jal func_800DFEFC +/* E241B8 802B6178 00000000 */ nop +/* E241BC 802B617C 960200C0 */ lhu $v0, 0xc0($s0) +/* E241C0 802B6180 24420001 */ addiu $v0, $v0, 1 +/* E241C4 802B6184 A60200C0 */ sh $v0, 0xc0($s0) +/* E241C8 802B6188 8FBF0014 */ lw $ra, 0x14($sp) +/* E241CC 802B618C 8FB00010 */ lw $s0, 0x10($sp) +/* E241D0 802B6190 03E00008 */ jr $ra +/* E241D4 802B6194 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E24040/func_802B6198_E241D8.s b/asm/nonmatchings/code_E24040/func_802B6198_E241D8.s new file mode 100644 index 0000000000..14b951a16d --- /dev/null +++ b/asm/nonmatchings/code_E24040/func_802B6198_E241D8.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6198_E241D8 +/* E241D8 802B6198 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E241DC 802B619C AFB00010 */ sw $s0, 0x10($sp) +/* E241E0 802B61A0 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E241E4 802B61A4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E241E8 802B61A8 AFBF0018 */ sw $ra, 0x18($sp) +/* E241EC 802B61AC AFB10014 */ sw $s1, 0x14($sp) +/* E241F0 802B61B0 8E020000 */ lw $v0, ($s0) +/* E241F4 802B61B4 04410012 */ bgez $v0, .L802B6200 +/* E241F8 802B61B8 3C118000 */ lui $s1, 0x8000 +/* E241FC 802B61BC 3C028016 */ lui $v0, %hi(gCollisionStatus) +/* E24200 802B61C0 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus) +/* E24204 802B61C4 0C04417A */ jal get_entity_by_index +/* E24208 802B61C8 84440002 */ lh $a0, 2($v0) +/* E2420C 802B61CC C4400048 */ lwc1 $f0, 0x48($v0) +/* E24210 802B61D0 C4420050 */ lwc1 $f2, 0x50($v0) +/* E24214 802B61D4 3C018011 */ lui $at, %hi(D_8010C960) +/* E24218 802B61D8 E420C960 */ swc1 $f0, %lo(D_8010C960)($at) +/* E2421C 802B61DC 3C018011 */ lui $at, %hi(D_8010C97C) +/* E24220 802B61E0 E422C97C */ swc1 $f2, %lo(D_8010C97C)($at) +/* E24224 802B61E4 0C0AD800 */ jal func_802B6000_E24040 +/* E24228 802B61E8 00000000 */ nop +/* E2422C 802B61EC 8E020000 */ lw $v0, ($s0) +/* E24230 802B61F0 3C030088 */ lui $v1, 0x88 +/* E24234 802B61F4 00431025 */ or $v0, $v0, $v1 +/* E24238 802B61F8 0C03805E */ jal disable_player_input +/* E2423C 802B61FC AE020000 */ sw $v0, ($s0) +.L802B6200: +/* E24240 802B6200 960200C0 */ lhu $v0, 0xc0($s0) +/* E24244 802B6204 820300B6 */ lb $v1, 0xb6($s0) +/* E24248 802B6208 24420001 */ addiu $v0, $v0, 1 +/* E2424C 802B620C A60200C0 */ sh $v0, 0xc0($s0) +/* E24250 802B6210 24020001 */ addiu $v0, $zero, 1 +/* E24254 802B6214 1462001A */ bne $v1, $v0, .L802B6280 +/* E24258 802B6218 00000000 */ nop +/* E2425C 802B621C 8E050000 */ lw $a1, ($s0) +/* E24260 802B6220 00B11024 */ and $v0, $a1, $s1 +/* E24264 802B6224 10400013 */ beqz $v0, .L802B6274 +/* E24268 802B6228 3C037FFF */ lui $v1, 0x7fff +/* E2426C 802B622C 3463FFF5 */ ori $v1, $v1, 0xfff5 +/* E24270 802B6230 3C040006 */ lui $a0, 6 +/* E24274 802B6234 3484000A */ ori $a0, $a0, 0xa +/* E24278 802B6238 00A31824 */ and $v1, $a1, $v1 +/* E2427C 802B623C 8E020004 */ lw $v0, 4($s0) +/* E24280 802B6240 34630004 */ ori $v1, $v1, 4 +/* E24284 802B6244 30420003 */ andi $v0, $v0, 3 +/* E24288 802B6248 14400003 */ bnez $v0, .L802B6258 +/* E2428C 802B624C AE030000 */ sw $v1, ($s0) +/* E24290 802B6250 3C040001 */ lui $a0, 1 +/* E24294 802B6254 34840008 */ ori $a0, $a0, 8 +.L802B6258: +/* E24298 802B6258 0C037FBF */ jal func_800DFEFC +/* E2429C 802B625C 00000000 */ nop +/* E242A0 802B6260 3C03800B */ lui $v1, %hi(gCameras) +/* E242A4 802B6264 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* E242A8 802B6268 94620002 */ lhu $v0, 2($v1) +/* E242AC 802B626C 34420001 */ ori $v0, $v0, 1 +/* E242B0 802B6270 A4620002 */ sh $v0, 2($v1) +.L802B6274: +/* E242B4 802B6274 920200B6 */ lbu $v0, 0xb6($s0) +/* E242B8 802B6278 24420001 */ addiu $v0, $v0, 1 +/* E242BC 802B627C A20200B6 */ sb $v0, 0xb6($s0) +.L802B6280: +/* E242C0 802B6280 8FBF0018 */ lw $ra, 0x18($sp) +/* E242C4 802B6284 8FB10014 */ lw $s1, 0x14($sp) +/* E242C8 802B6288 8FB00010 */ lw $s0, 0x10($sp) +/* E242CC 802B628C 03E00008 */ jr $ra +/* E242D0 802B6290 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E24040/func_802B6294_E242D4.s b/asm/nonmatchings/code_E24040/func_802B6294_E242D4.s new file mode 100644 index 0000000000..daa64d6775 --- /dev/null +++ b/asm/nonmatchings/code_E24040/func_802B6294_E242D4.s @@ -0,0 +1,54 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6294_E242D4 +/* E242D4 802B6294 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E242D8 802B6298 AFB00010 */ sw $s0, 0x10($sp) +/* E242DC 802B629C 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E242E0 802B62A0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E242E4 802B62A4 AFBF0014 */ sw $ra, 0x14($sp) +/* E242E8 802B62A8 8E050004 */ lw $a1, 4($s0) +/* E242EC 802B62AC 30A21000 */ andi $v0, $a1, 0x1000 +/* E242F0 802B62B0 10400005 */ beqz $v0, .L802B62C8 +/* E242F4 802B62B4 00000000 */ nop +/* E242F8 802B62B8 0C0AD91F */ jal func_802B647C_E244BC +/* E242FC 802B62BC 00000000 */ nop +/* E24300 802B62C0 080AD8CE */ j .L802B6338 +/* E24304 802B62C4 00000000 */ nop +.L802B62C8: +/* E24308 802B62C8 8E030000 */ lw $v1, ($s0) +/* E2430C 802B62CC 04610017 */ bgez $v1, .L802B632C +/* E24310 802B62D0 3C027FFF */ lui $v0, 0x7fff +/* E24314 802B62D4 3442FFF5 */ ori $v0, $v0, 0xfff5 +/* E24318 802B62D8 00621024 */ and $v0, $v1, $v0 +/* E2431C 802B62DC 34420004 */ ori $v0, $v0, 4 +/* E24320 802B62E0 AE020000 */ sw $v0, ($s0) +/* E24324 802B62E4 30A24000 */ andi $v0, $a1, 0x4000 +/* E24328 802B62E8 10400003 */ beqz $v0, .L802B62F8 +/* E2432C 802B62EC 3C040009 */ lui $a0, 9 +/* E24330 802B62F0 080AD8C4 */ j .L802B6310 +/* E24334 802B62F4 34840005 */ ori $a0, $a0, 5 +.L802B62F8: +/* E24338 802B62F8 3C040006 */ lui $a0, 6 +/* E2433C 802B62FC 30A20003 */ andi $v0, $a1, 3 +/* E24340 802B6300 14400003 */ bnez $v0, .L802B6310 +/* E24344 802B6304 3484000A */ ori $a0, $a0, 0xa +/* E24348 802B6308 3C040001 */ lui $a0, 1 +/* E2434C 802B630C 34840008 */ ori $a0, $a0, 8 +.L802B6310: +/* E24350 802B6310 0C037FBF */ jal func_800DFEFC +/* E24354 802B6314 00000000 */ nop +/* E24358 802B6318 3C03800B */ lui $v1, %hi(gCameras) +/* E2435C 802B631C 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* E24360 802B6320 94620002 */ lhu $v0, 2($v1) +/* E24364 802B6324 34420001 */ ori $v0, $v0, 1 +/* E24368 802B6328 A4620002 */ sh $v0, 2($v1) +.L802B632C: +/* E2436C 802B632C 960200C0 */ lhu $v0, 0xc0($s0) +/* E24370 802B6330 24420001 */ addiu $v0, $v0, 1 +/* E24374 802B6334 A60200C0 */ sh $v0, 0xc0($s0) +.L802B6338: +/* E24378 802B6338 8FBF0014 */ lw $ra, 0x14($sp) +/* E2437C 802B633C 8FB00010 */ lw $s0, 0x10($sp) +/* E24380 802B6340 03E00008 */ jr $ra +/* E24384 802B6344 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E24040/func_802B6348_E24388.s b/asm/nonmatchings/code_E24040/func_802B6348_E24388.s new file mode 100644 index 0000000000..92d5980823 --- /dev/null +++ b/asm/nonmatchings/code_E24040/func_802B6348_E24388.s @@ -0,0 +1,84 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6348_E24388 +/* E24388 802B6348 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* E2438C 802B634C 3C058011 */ lui $a1, %hi(gPlayerStatus) +/* E24390 802B6350 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) +/* E24394 802B6354 AFBF004C */ sw $ra, 0x4c($sp) +/* E24398 802B6358 AFB00048 */ sw $s0, 0x48($sp) +/* E2439C 802B635C 8CA20004 */ lw $v0, 4($a1) +/* E243A0 802B6360 30421000 */ andi $v0, $v0, 0x1000 +/* E243A4 802B6364 10400005 */ beqz $v0, .L802B637C +/* E243A8 802B6368 00A0802D */ daddu $s0, $a1, $zero +/* E243AC 802B636C 0C0AD942 */ jal func_802B6508_E24548 +/* E243B0 802B6370 00000000 */ nop +/* E243B4 802B6374 080AD91B */ j .L802B646C +/* E243B8 802B6378 00000000 */ nop +.L802B637C: +/* E243BC 802B637C 8CA30000 */ lw $v1, ($a1) +/* E243C0 802B6380 0461000A */ bgez $v1, .L802B63AC +/* E243C4 802B6384 3C027FFF */ lui $v0, 0x7fff +/* E243C8 802B6388 3442FFF5 */ ori $v0, $v0, 0xfff5 +/* E243CC 802B638C 00621024 */ and $v0, $v1, $v0 +/* E243D0 802B6390 3C04800B */ lui $a0, %hi(gCameras) +/* E243D4 802B6394 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* E243D8 802B6398 94830002 */ lhu $v1, 2($a0) +/* E243DC 802B639C 34420004 */ ori $v0, $v0, 4 +/* E243E0 802B63A0 ACA20000 */ sw $v0, ($a1) +/* E243E4 802B63A4 34630001 */ ori $v1, $v1, 1 +/* E243E8 802B63A8 A4830002 */ sh $v1, 2($a0) +.L802B63AC: +/* E243EC 802B63AC 960200C0 */ lhu $v0, 0xc0($s0) +/* E243F0 802B63B0 24420001 */ addiu $v0, $v0, 1 +/* E243F4 802B63B4 0C039454 */ jal func_800E5150 +/* E243F8 802B63B8 A60200C0 */ sh $v0, 0xc0($s0) +/* E243FC 802B63BC 0200202D */ daddu $a0, $s0, $zero +/* E24400 802B63C0 27A50028 */ addiu $a1, $sp, 0x28 +/* E24404 802B63C4 27A6002C */ addiu $a2, $sp, 0x2c +/* E24408 802B63C8 C6000028 */ lwc1 $f0, 0x28($s0) +/* E2440C 802B63CC C602002C */ lwc1 $f2, 0x2c($s0) +/* E24410 802B63D0 C6040030 */ lwc1 $f4, 0x30($s0) +/* E24414 802B63D4 860200B0 */ lh $v0, 0xb0($s0) +/* E24418 802B63D8 27A70030 */ addiu $a3, $sp, 0x30 +/* E2441C 802B63DC E7A00028 */ swc1 $f0, 0x28($sp) +/* E24420 802B63E0 44820000 */ mtc1 $v0, $f0 +/* E24424 802B63E4 00000000 */ nop +/* E24428 802B63E8 46800020 */ cvt.s.w $f0, $f0 +/* E2442C 802B63EC 27A20034 */ addiu $v0, $sp, 0x34 +/* E24430 802B63F0 E7A2002C */ swc1 $f2, 0x2c($sp) +/* E24434 802B63F4 E7A40030 */ swc1 $f4, 0x30($sp) +/* E24438 802B63F8 E7A00034 */ swc1 $f0, 0x34($sp) +/* E2443C 802B63FC AFA20010 */ sw $v0, 0x10($sp) +/* E24440 802B6400 27A20038 */ addiu $v0, $sp, 0x38 +/* E24444 802B6404 AFA20014 */ sw $v0, 0x14($sp) +/* E24448 802B6408 27A2003C */ addiu $v0, $sp, 0x3c +/* E2444C 802B640C AFA20018 */ sw $v0, 0x18($sp) +/* E24450 802B6410 27A20040 */ addiu $v0, $sp, 0x40 +/* E24454 802B6414 AFA2001C */ sw $v0, 0x1c($sp) +/* E24458 802B6418 27A20044 */ addiu $v0, $sp, 0x44 +/* E2445C 802B641C 0C03791B */ jal func_800DE46C +/* E24460 802B6420 AFA20020 */ sw $v0, 0x20($sp) +/* E24464 802B6424 0C016F6A */ jal get_collider_type_by_id +/* E24468 802B6428 0040202D */ daddu $a0, $v0, $zero +/* E2446C 802B642C 304200FF */ andi $v0, $v0, 0xff +/* E24470 802B6430 2442FFFE */ addiu $v0, $v0, -2 +/* E24474 802B6434 2C420002 */ sltiu $v0, $v0, 2 +/* E24478 802B6438 1440000C */ bnez $v0, .L802B646C +/* E2447C 802B643C 00000000 */ nop +/* E24480 802B6440 0C039858 */ jal check_input_jump +/* E24484 802B6444 00000000 */ nop +/* E24488 802B6448 10400008 */ beqz $v0, .L802B646C +/* E2448C 802B644C 00000000 */ nop +/* E24490 802B6450 0C039769 */ jal set_action_state +/* E24494 802B6454 24040003 */ addiu $a0, $zero, 3 +/* E24498 802B6458 8E020000 */ lw $v0, ($s0) +/* E2449C 802B645C 2403FFF1 */ addiu $v1, $zero, -0xf +/* E244A0 802B6460 00431024 */ and $v0, $v0, $v1 +/* E244A4 802B6464 0C0AD82D */ jal func_802B60B4_E240F4 +/* E244A8 802B6468 AE020000 */ sw $v0, ($s0) +.L802B646C: +/* E244AC 802B646C 8FBF004C */ lw $ra, 0x4c($sp) +/* E244B0 802B6470 8FB00048 */ lw $s0, 0x48($sp) +/* E244B4 802B6474 03E00008 */ jr $ra +/* E244B8 802B6478 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_E24040/func_802B647C_E244BC.s b/asm/nonmatchings/code_E24040/func_802B647C_E244BC.s new file mode 100644 index 0000000000..b47ba3d734 --- /dev/null +++ b/asm/nonmatchings/code_E24040/func_802B647C_E244BC.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B647C_E244BC +/* E244BC 802B647C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E244C0 802B6480 AFB00010 */ sw $s0, 0x10($sp) +/* E244C4 802B6484 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E244C8 802B6488 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E244CC 802B648C AFBF0014 */ sw $ra, 0x14($sp) +/* E244D0 802B6490 8E030000 */ lw $v1, ($s0) +/* E244D4 802B6494 04610015 */ bgez $v1, .L802B64EC +/* E244D8 802B6498 3C027FFF */ lui $v0, 0x7fff +/* E244DC 802B649C 3442FFFF */ ori $v0, $v0, 0xffff +/* E244E0 802B64A0 3C04000A */ lui $a0, 0xa +/* E244E4 802B64A4 34840006 */ ori $a0, $a0, 6 +/* E244E8 802B64A8 00621024 */ and $v0, $v1, $v0 +/* E244EC 802B64AC 2403FFF5 */ addiu $v1, $zero, -0xb +/* E244F0 802B64B0 00431024 */ and $v0, $v0, $v1 +/* E244F4 802B64B4 8E030004 */ lw $v1, 4($s0) +/* E244F8 802B64B8 34420004 */ ori $v0, $v0, 4 +/* E244FC 802B64BC 30631000 */ andi $v1, $v1, 0x1000 +/* E24500 802B64C0 14600003 */ bnez $v1, .L802B64D0 +/* E24504 802B64C4 AE020000 */ sw $v0, ($s0) +/* E24508 802B64C8 3C040001 */ lui $a0, 1 +/* E2450C 802B64CC 34840008 */ ori $a0, $a0, 8 +.L802B64D0: +/* E24510 802B64D0 0C037FBF */ jal func_800DFEFC +/* E24514 802B64D4 00000000 */ nop +/* E24518 802B64D8 3C03800B */ lui $v1, %hi(gCameras) +/* E2451C 802B64DC 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* E24520 802B64E0 94620002 */ lhu $v0, 2($v1) +/* E24524 802B64E4 34420001 */ ori $v0, $v0, 1 +/* E24528 802B64E8 A4620002 */ sh $v0, 2($v1) +.L802B64EC: +/* E2452C 802B64EC 960200C0 */ lhu $v0, 0xc0($s0) +/* E24530 802B64F0 24420001 */ addiu $v0, $v0, 1 +/* E24534 802B64F4 A60200C0 */ sh $v0, 0xc0($s0) +/* E24538 802B64F8 8FBF0014 */ lw $ra, 0x14($sp) +/* E2453C 802B64FC 8FB00010 */ lw $s0, 0x10($sp) +/* E24540 802B6500 03E00008 */ jr $ra +/* E24544 802B6504 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E24040/func_802B6508_E24548.s b/asm/nonmatchings/code_E24040/func_802B6508_E24548.s new file mode 100644 index 0000000000..23174c4d22 --- /dev/null +++ b/asm/nonmatchings/code_E24040/func_802B6508_E24548.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6508_E24548 +/* E24548 802B6508 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2454C 802B650C AFB00010 */ sw $s0, 0x10($sp) +/* E24550 802B6510 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E24554 802B6514 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E24558 802B6518 AFBF0014 */ sw $ra, 0x14($sp) +/* E2455C 802B651C 8E030000 */ lw $v1, ($s0) +/* E24560 802B6520 04610012 */ bgez $v1, .L802B656C +/* E24564 802B6524 3C027FFF */ lui $v0, 0x7fff +/* E24568 802B6528 3442FFFF */ ori $v0, $v0, 0xffff +/* E2456C 802B652C 00621024 */ and $v0, $v1, $v0 +/* E24570 802B6530 2403FFF5 */ addiu $v1, $zero, -0xb +/* E24574 802B6534 00431024 */ and $v0, $v0, $v1 +/* E24578 802B6538 34420004 */ ori $v0, $v0, 4 +/* E2457C 802B653C 3C04800B */ lui $a0, %hi(gCameras) +/* E24580 802B6540 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* E24584 802B6544 AE020000 */ sw $v0, ($s0) +/* E24588 802B6548 94820002 */ lhu $v0, 2($a0) +/* E2458C 802B654C 8E030004 */ lw $v1, 4($s0) +/* E24590 802B6550 34420001 */ ori $v0, $v0, 1 +/* E24594 802B6554 30631000 */ andi $v1, $v1, 0x1000 +/* E24598 802B6558 10600004 */ beqz $v1, .L802B656C +/* E2459C 802B655C A4820002 */ sh $v0, 2($a0) +/* E245A0 802B6560 3C04000A */ lui $a0, 0xa +/* E245A4 802B6564 0C037FBF */ jal func_800DFEFC +/* E245A8 802B6568 34840006 */ ori $a0, $a0, 6 +.L802B656C: +/* E245AC 802B656C 960200C0 */ lhu $v0, 0xc0($s0) +/* E245B0 802B6570 24420001 */ addiu $v0, $v0, 1 +/* E245B4 802B6574 0C039454 */ jal func_800E5150 +/* E245B8 802B6578 A60200C0 */ sh $v0, 0xc0($s0) +/* E245BC 802B657C 8FBF0014 */ lw $ra, 0x14($sp) +/* E245C0 802B6580 8FB00010 */ lw $s0, 0x10($sp) +/* E245C4 802B6584 03E00008 */ jr $ra +/* E245C8 802B6588 27BD0018 */ addiu $sp, $sp, 0x18 +/* E245CC 802B658C 00000000 */ nop diff --git a/asm/nonmatchings/code_E245D0/func_802B6000_E245D0.s b/asm/nonmatchings/code_E245D0/func_802B6000_E245D0.s new file mode 100644 index 0000000000..ea7b6311bd --- /dev/null +++ b/asm/nonmatchings/code_E245D0/func_802B6000_E245D0.s @@ -0,0 +1,114 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E245D0 +/* E245D0 802B6000 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E245D4 802B6004 AFB00020 */ sw $s0, 0x20($sp) +/* E245D8 802B6008 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E245DC 802B600C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E245E0 802B6010 AFBF0024 */ sw $ra, 0x24($sp) +/* E245E4 802B6014 8E030000 */ lw $v1, ($s0) +/* E245E8 802B6018 04610024 */ bgez $v1, .L802B60AC +/* E245EC 802B601C 3C027FFF */ lui $v0, 0x7fff +/* E245F0 802B6020 3442FFFF */ ori $v0, $v0, 0xffff +/* E245F4 802B6024 00621024 */ and $v0, $v1, $v0 +/* E245F8 802B6028 0C03954C */ jal func_800E5530 +/* E245FC 802B602C AE020000 */ sw $v0, ($s0) +/* E24600 802B6030 8E030004 */ lw $v1, 4($s0) +/* E24604 802B6034 30621000 */ andi $v0, $v1, 0x1000 +/* E24608 802B6038 14400009 */ bnez $v0, .L802B6060 +/* E2460C 802B603C 30620001 */ andi $v0, $v1, 1 +/* E24610 802B6040 14400003 */ bnez $v0, .L802B6050 +/* E24614 802B6044 3C040006 */ lui $a0, 6 +/* E24618 802B6048 3C040001 */ lui $a0, 1 +/* E2461C 802B604C 34840004 */ ori $a0, $a0, 4 +.L802B6050: +/* E24620 802B6050 0C037FBF */ jal func_800DFEFC +/* E24624 802B6054 00000000 */ nop +/* E24628 802B6058 080AD81A */ j .L802B6068 +/* E2462C 802B605C 00000000 */ nop +.L802B6060: +/* E24630 802B6060 0C0AD866 */ jal func_802B6198_E24768 +/* E24634 802B6064 00000000 */ nop +.L802B6068: +/* E24638 802B6068 3C01418E */ lui $at, 0x418e +/* E2463C 802B606C 34210D84 */ ori $at, $at, 0xd84 +/* E24640 802B6070 44810000 */ mtc1 $at, $f0 +/* E24644 802B6074 3C01C136 */ lui $at, 0xc136 +/* E24648 802B6078 34212DE0 */ ori $at, $at, 0x2de0 +/* E2464C 802B607C 44811000 */ mtc1 $at, $f2 +/* E24650 802B6080 3C014060 */ lui $at, 0x4060 +/* E24654 802B6084 44812000 */ mtc1 $at, $f4 +/* E24658 802B6088 3C01BF40 */ lui $at, 0xbf40 +/* E2465C 802B608C 44813000 */ mtc1 $at, $f6 +/* E24660 802B6090 A20000B6 */ sb $zero, 0xb6($s0) +/* E24664 802B6094 A60000C0 */ sh $zero, 0xc0($s0) +/* E24668 802B6098 A60000C2 */ sh $zero, 0xc2($s0) +/* E2466C 802B609C E6000070 */ swc1 $f0, 0x70($s0) +/* E24670 802B60A0 E6020074 */ swc1 $f2, 0x74($s0) +/* E24674 802B60A4 E6040078 */ swc1 $f4, 0x78($s0) +/* E24678 802B60A8 E606007C */ swc1 $f6, 0x7c($s0) +.L802B60AC: +/* E2467C 802B60AC 0C038D12 */ jal integrate_gravity +/* E24680 802B60B0 00000000 */ nop +/* E24684 802B60B4 C60C0080 */ lwc1 $f12, 0x80($s0) +/* E24688 802B60B8 3C0140C9 */ lui $at, 0x40c9 +/* E2468C 802B60BC 34210FD0 */ ori $at, $at, 0xfd0 +/* E24690 802B60C0 44810000 */ mtc1 $at, $f0 +/* E24694 802B60C4 00000000 */ nop +/* E24698 802B60C8 46006302 */ mul.s $f12, $f12, $f0 +/* E2469C 802B60CC 00000000 */ nop +/* E246A0 802B60D0 27A50010 */ addiu $a1, $sp, 0x10 +/* E246A4 802B60D4 3C0143B4 */ lui $at, 0x43b4 +/* E246A8 802B60D8 44810000 */ mtc1 $at, $f0 +/* E246AC 802B60DC 27A60014 */ addiu $a2, $sp, 0x14 +/* E246B0 802B60E0 0C00A82D */ jal sin_cos_rad +/* E246B4 802B60E4 46006303 */ div.s $f12, $f12, $f0 +/* E246B8 802B60E8 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E246BC 802B60EC 3C014040 */ lui $at, 0x4040 +/* E246C0 802B60F0 44811000 */ mtc1 $at, $f2 +/* E246C4 802B60F4 00000000 */ nop +/* E246C8 802B60F8 46020002 */ mul.s $f0, $f0, $f2 +/* E246CC 802B60FC 00000000 */ nop +/* E246D0 802B6100 C7A40014 */ lwc1 $f4, 0x14($sp) +/* E246D4 802B6104 46022102 */ mul.s $f4, $f4, $f2 +/* E246D8 802B6108 00000000 */ nop +/* E246DC 802B610C 2402FFFF */ addiu $v0, $zero, -1 +/* E246E0 802B6110 C6020028 */ lwc1 $f2, 0x28($s0) +/* E246E4 802B6114 C60C0070 */ lwc1 $f12, 0x70($s0) +/* E246E8 802B6118 46001080 */ add.s $f2, $f2, $f0 +/* E246EC 802B611C 44803000 */ mtc1 $zero, $f6 +/* E246F0 802B6120 C6000030 */ lwc1 $f0, 0x30($s0) +/* E246F4 802B6124 4606603C */ c.lt.s $f12, $f6 +/* E246F8 802B6128 46040001 */ sub.s $f0, $f0, $f4 +/* E246FC 802B612C AFA20018 */ sw $v0, 0x18($sp) +/* E24700 802B6130 E6020028 */ swc1 $f2, 0x28($s0) +/* E24704 802B6134 45000005 */ bc1f .L802B614C +/* E24708 802B6138 E6000030 */ swc1 $f0, 0x30($s0) +/* E2470C 802B613C 0C038D45 */ jal func_800E3514 +/* E24710 802B6140 27A50018 */ addiu $a1, $sp, 0x18 +/* E24714 802B6144 080AD856 */ j .L802B6158 +/* E24718 802B6148 E600002C */ swc1 $f0, 0x2c($s0) +.L802B614C: +/* E2471C 802B614C C600002C */ lwc1 $f0, 0x2c($s0) +/* E24720 802B6150 460C0000 */ add.s $f0, $f0, $f12 +/* E24724 802B6154 E600002C */ swc1 $f0, 0x2c($s0) +.L802B6158: +/* E24728 802B6158 8FA20018 */ lw $v0, 0x18($sp) +/* E2472C 802B615C 0440000A */ bltz $v0, .L802B6188 +/* E24730 802B6160 2402001A */ addiu $v0, $zero, 0x1a +/* E24734 802B6164 820400B5 */ lb $a0, 0xb5($s0) +/* E24738 802B6168 10820005 */ beq $a0, $v0, .L802B6180 +/* E2473C 802B616C 00000000 */ nop +/* E24740 802B6170 0C039769 */ jal set_action_state +/* E24744 802B6174 00000000 */ nop +/* E24748 802B6178 080AD862 */ j .L802B6188 +/* E2474C 802B617C 00000000 */ nop +.L802B6180: +/* E24750 802B6180 0C0397DA */ jal update_locomotion_state +/* E24754 802B6184 00000000 */ nop +.L802B6188: +/* E24758 802B6188 8FBF0024 */ lw $ra, 0x24($sp) +/* E2475C 802B618C 8FB00020 */ lw $s0, 0x20($sp) +/* E24760 802B6190 03E00008 */ jr $ra +/* E24764 802B6194 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_E245D0/func_802B6198_E24768.s b/asm/nonmatchings/code_E245D0/func_802B6198_E24768.s new file mode 100644 index 0000000000..7da14058a8 --- /dev/null +++ b/asm/nonmatchings/code_E245D0/func_802B6198_E24768.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6198_E24768 +/* E24768 802B6198 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2476C 802B619C 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* E24770 802B61A0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* E24774 802B61A4 AFBF0010 */ sw $ra, 0x10($sp) +/* E24778 802B61A8 8C620004 */ lw $v0, 4($v1) +/* E2477C 802B61AC 30422000 */ andi $v0, $v0, 0x2000 +/* E24780 802B61B0 14400013 */ bnez $v0, .L802B6200 +/* E24784 802B61B4 00000000 */ nop +/* E24788 802B61B8 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* E2478C 802B61BC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* E24790 802B61C0 9062007E */ lbu $v0, 0x7e($v1) +/* E24794 802B61C4 30420010 */ andi $v0, $v0, 0x10 +/* E24798 802B61C8 14400009 */ bnez $v0, .L802B61F0 +/* E2479C 802B61CC 3C04000D */ lui $a0, 0xd +/* E247A0 802B61D0 90620080 */ lbu $v0, 0x80($v1) +/* E247A4 802B61D4 00021080 */ sll $v0, $v0, 2 +/* E247A8 802B61D8 3C04802B */ lui $a0, %hi(D_802B6300) +/* E247AC 802B61DC 00822021 */ addu $a0, $a0, $v0 +/* E247B0 802B61E0 0C037FBF */ jal func_800DFEFC +/* E247B4 802B61E4 8C846300 */ lw $a0, %lo(D_802B6300)($a0) +/* E247B8 802B61E8 080AD889 */ j .L802B6224 +/* E247BC 802B61EC 00000000 */ nop +.L802B61F0: +/* E247C0 802B61F0 0C037FBF */ jal func_800DFEFC +/* E247C4 802B61F4 3484000D */ ori $a0, $a0, 0xd +/* E247C8 802B61F8 080AD889 */ j .L802B6224 +/* E247CC 802B61FC 00000000 */ nop +.L802B6200: +/* E247D0 802B6200 8063000C */ lb $v1, 0xc($v1) +/* E247D4 802B6204 00031040 */ sll $v0, $v1, 1 +/* E247D8 802B6208 00431021 */ addu $v0, $v0, $v1 +/* E247DC 802B620C 000210C0 */ sll $v0, $v0, 3 +/* E247E0 802B6210 3C04800F */ lui $a0, %hi(D_800F7C20) +/* E247E4 802B6214 00822021 */ addu $a0, $a0, $v0 +/* E247E8 802B6218 8C847C20 */ lw $a0, %lo(D_800F7C20)($a0) +/* E247EC 802B621C 0C0398DB */ jal func_800E636C +/* E247F0 802B6220 00000000 */ nop +.L802B6224: +/* E247F4 802B6224 8FBF0010 */ lw $ra, 0x10($sp) +/* E247F8 802B6228 03E00008 */ jr $ra +/* E247FC 802B622C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E245D0/func_802B6230_E24800.s b/asm/nonmatchings/code_E245D0/func_802B6230_E24800.s new file mode 100644 index 0000000000..80e8fe3d21 --- /dev/null +++ b/asm/nonmatchings/code_E245D0/func_802B6230_E24800.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6230_E24800 +/* E24800 802B6230 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E24804 802B6234 AFB00010 */ sw $s0, 0x10($sp) +/* E24808 802B6238 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E2480C 802B623C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E24810 802B6240 AFBF0018 */ sw $ra, 0x18($sp) +/* E24814 802B6244 AFB10014 */ sw $s1, 0x14($sp) +/* E24818 802B6248 8E030000 */ lw $v1, ($s0) +/* E2481C 802B624C 0461000A */ bgez $v1, .L802B6278 +/* E24820 802B6250 0200882D */ daddu $s1, $s0, $zero +/* E24824 802B6254 3C027FFF */ lui $v0, 0x7fff +/* E24828 802B6258 3442FFFF */ ori $v0, $v0, 0xffff +/* E2482C 802B625C 3C04000A */ lui $a0, 0xa +/* E24830 802B6260 34840005 */ ori $a0, $a0, 5 +/* E24834 802B6264 00621024 */ and $v0, $v1, $v0 +/* E24838 802B6268 0C037FBF */ jal func_800DFEFC +/* E2483C 802B626C AE020000 */ sw $v0, ($s0) +/* E24840 802B6270 24020008 */ addiu $v0, $zero, 8 +/* E24844 802B6274 A6020008 */ sh $v0, 8($s0) +.L802B6278: +/* E24848 802B6278 86020008 */ lh $v0, 8($s0) +/* E2484C 802B627C 96030008 */ lhu $v1, 8($s0) +/* E24850 802B6280 1040000B */ beqz $v0, .L802B62B0 +/* E24854 802B6284 2462FFFF */ addiu $v0, $v1, -1 +/* E24858 802B6288 A6020008 */ sh $v0, 8($s0) +/* E2485C 802B628C 00021400 */ sll $v0, $v0, 0x10 +/* E24860 802B6290 00021403 */ sra $v0, $v0, 0x10 +/* E24864 802B6294 24030004 */ addiu $v1, $zero, 4 +/* E24868 802B6298 14430012 */ bne $v0, $v1, .L802B62E4 +/* E2486C 802B629C 00000000 */ nop +/* E24870 802B62A0 0C039426 */ jal func_800E5098 +/* E24874 802B62A4 24040001 */ addiu $a0, $zero, 1 +/* E24878 802B62A8 080AD8B9 */ j .L802B62E4 +/* E2487C 802B62AC 00000000 */ nop +.L802B62B0: +/* E24880 802B62B0 8E020000 */ lw $v0, ($s0) +/* E24884 802B62B4 30424000 */ andi $v0, $v0, 0x4000 +/* E24888 802B62B8 10400008 */ beqz $v0, .L802B62DC +/* E2488C 802B62BC 0000202D */ daddu $a0, $zero, $zero +/* E24890 802B62C0 C6220054 */ lwc1 $f2, 0x54($s1) +/* E24894 802B62C4 C620005C */ lwc1 $f0, 0x5c($s1) +/* E24898 802B62C8 4602003E */ c.le.s $f0, $f2 +/* E2489C 802B62CC 00000000 */ nop +/* E248A0 802B62D0 45000002 */ bc1f .L802B62DC +/* E248A4 802B62D4 24040001 */ addiu $a0, $zero, 1 +/* E248A8 802B62D8 24040002 */ addiu $a0, $zero, 2 +.L802B62DC: +/* E248AC 802B62DC 0C039769 */ jal set_action_state +/* E248B0 802B62E0 00000000 */ nop +.L802B62E4: +/* E248B4 802B62E4 8FBF0018 */ lw $ra, 0x18($sp) +/* E248B8 802B62E8 8FB10014 */ lw $s1, 0x14($sp) +/* E248BC 802B62EC 8FB00010 */ lw $s0, 0x10($sp) +/* E248C0 802B62F0 03E00008 */ jr $ra +/* E248C4 802B62F4 27BD0020 */ addiu $sp, $sp, 0x20 +/* E248C8 802B62F8 00000000 */ nop +/* E248CC 802B62FC 00000000 */ nop diff --git a/asm/nonmatchings/code_E24920/func_802B6000_E24920.s b/asm/nonmatchings/code_E24920/func_802B6000_E24920.s new file mode 100644 index 0000000000..0c4eed846b --- /dev/null +++ b/asm/nonmatchings/code_E24920/func_802B6000_E24920.s @@ -0,0 +1,125 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E24920 +/* E24920 802B6000 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E24924 802B6004 AFB1001C */ sw $s1, 0x1c($sp) +/* E24928 802B6008 3C118016 */ lui $s1, %hi(gCollisionStatus) +/* E2492C 802B600C 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus) +/* E24930 802B6010 AFB00018 */ sw $s0, 0x18($sp) +/* E24934 802B6014 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E24938 802B6018 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E2493C 802B601C AFBF0024 */ sw $ra, 0x24($sp) +/* E24940 802B6020 AFB20020 */ sw $s2, 0x20($sp) +/* E24944 802B6024 8E050004 */ lw $a1, 4($s0) +/* E24948 802B6028 3C12800B */ lui $s2, %hi(gCameras) +/* E2494C 802B602C 26521D80 */ addiu $s2, $s2, %lo(gCameras) +/* E24950 802B6030 30A21000 */ andi $v0, $a1, 0x1000 +/* E24954 802B6034 10400005 */ beqz $v0, .L802B604C +/* E24958 802B6038 00000000 */ nop +/* E2495C 802B603C 0C0AD8B3 */ jal func_802B62CC_E24BEC +/* E24960 802B6040 00000000 */ nop +/* E24964 802B6044 080AD86A */ j .L802B61A8 +/* E24968 802B6048 00000000 */ nop +.L802B604C: +/* E2496C 802B604C 8E030000 */ lw $v1, ($s0) +/* E24970 802B6050 0461002E */ bgez $v1, .L802B610C +/* E24974 802B6054 3C027F77 */ lui $v0, 0x7f77 +/* E24978 802B6058 3442FFF1 */ ori $v0, $v0, 0xfff1 +/* E2497C 802B605C C6000028 */ lwc1 $f0, 0x28($s0) +/* E24980 802B6060 C6020030 */ lwc1 $f2, 0x30($s0) +/* E24984 802B6064 00621024 */ and $v0, $v1, $v0 +/* E24988 802B6068 AE020000 */ sw $v0, ($s0) +/* E2498C 802B606C 30A24000 */ andi $v0, $a1, 0x4000 +/* E24990 802B6070 A20000B6 */ sb $zero, 0xb6($s0) +/* E24994 802B6074 A60000C0 */ sh $zero, 0xc0($s0) +/* E24998 802B6078 A60000C2 */ sh $zero, 0xc2($s0) +/* E2499C 802B607C E6000044 */ swc1 $f0, 0x44($s0) +/* E249A0 802B6080 10400004 */ beqz $v0, .L802B6094 +/* E249A4 802B6084 E6020048 */ swc1 $f2, 0x48($s0) +/* E249A8 802B6088 3C040009 */ lui $a0, 9 +/* E249AC 802B608C 080AD82B */ j .L802B60AC +/* E249B0 802B6090 34840002 */ ori $a0, $a0, 2 +.L802B6094: +/* E249B4 802B6094 3C040006 */ lui $a0, 6 +/* E249B8 802B6098 30A20001 */ andi $v0, $a1, 1 +/* E249BC 802B609C 14400003 */ bnez $v0, .L802B60AC +/* E249C0 802B60A0 3484000B */ ori $a0, $a0, 0xb +/* E249C4 802B60A4 3C040001 */ lui $a0, 1 +/* E249C8 802B60A8 34840009 */ ori $a0, $a0, 9 +.L802B60AC: +/* E249CC 802B60AC 0C037FBF */ jal func_800DFEFC +/* E249D0 802B60B0 00000000 */ nop +/* E249D4 802B60B4 34048161 */ ori $a0, $zero, 0x8161 +/* E249D8 802B60B8 0C052736 */ jal play_sound_at_player +/* E249DC 802B60BC 0000282D */ daddu $a1, $zero, $zero +/* E249E0 802B60C0 24040148 */ addiu $a0, $zero, 0x148 +/* E249E4 802B60C4 0C052736 */ jal play_sound_at_player +/* E249E8 802B60C8 0000282D */ daddu $a1, $zero, $zero +/* E249EC 802B60CC 96220002 */ lhu $v0, 2($s1) +/* E249F0 802B60D0 30424000 */ andi $v0, $v0, 0x4000 +/* E249F4 802B60D4 14400004 */ bnez $v0, .L802B60E8 +/* E249F8 802B60D8 3C04FFFB */ lui $a0, 0xfffb +/* E249FC 802B60DC 0C03954C */ jal func_800E5530 +/* E24A00 802B60E0 00000000 */ nop +/* E24A04 802B60E4 3C04FFFB */ lui $a0, 0xfffb +.L802B60E8: +/* E24A08 802B60E8 3484FFFF */ ori $a0, $a0, 0xffff +/* E24A0C 802B60EC 2402FFFF */ addiu $v0, $zero, -1 +/* E24A10 802B60F0 A6220004 */ sh $v0, 4($s1) +/* E24A14 802B60F4 8E020004 */ lw $v0, 4($s0) +/* E24A18 802B60F8 96430002 */ lhu $v1, 2($s2) +/* E24A1C 802B60FC 00441024 */ and $v0, $v0, $a0 +/* E24A20 802B6100 3063FFFB */ andi $v1, $v1, 0xfffb +/* E24A24 802B6104 AE020004 */ sw $v0, 4($s0) +/* E24A28 802B6108 A6430002 */ sh $v1, 2($s2) +.L802B610C: +/* E24A2C 802B610C C6000054 */ lwc1 $f0, 0x54($s0) +/* E24A30 802B6110 3C013F19 */ lui $at, 0x3f19 +/* E24A34 802B6114 3421999A */ ori $at, $at, 0x999a +/* E24A38 802B6118 44811000 */ mtc1 $at, $f2 +/* E24A3C 802B611C 27A40010 */ addiu $a0, $sp, 0x10 +/* E24A40 802B6120 46020002 */ mul.s $f0, $f0, $f2 +/* E24A44 802B6124 00000000 */ nop +/* E24A48 802B6128 920200B6 */ lbu $v0, 0xb6($s0) +/* E24A4C 802B612C 27A50014 */ addiu $a1, $sp, 0x14 +/* E24A50 802B6130 24420001 */ addiu $v0, $v0, 1 +/* E24A54 802B6134 A20200B6 */ sb $v0, 0xb6($s0) +/* E24A58 802B6138 0C0388C1 */ jal input_to_move_vector +/* E24A5C 802B613C E6000054 */ swc1 $f0, 0x54($s0) +/* E24A60 802B6140 0C039858 */ jal check_input_jump +/* E24A64 802B6144 00000000 */ nop +/* E24A68 802B6148 0040182D */ daddu $v1, $v0, $zero +/* E24A6C 802B614C 14600005 */ bnez $v1, .L802B6164 +/* E24A70 802B6150 00000000 */ nop +/* E24A74 802B6154 820200B6 */ lb $v0, 0xb6($s0) +/* E24A78 802B6158 0062102A */ slt $v0, $v1, $v0 +/* E24A7C 802B615C 10400012 */ beqz $v0, .L802B61A8 +/* E24A80 802B6160 00000000 */ nop +.L802B6164: +/* E24A84 802B6164 C7A00014 */ lwc1 $f0, 0x14($sp) +/* E24A88 802B6168 44801000 */ mtc1 $zero, $f2 +/* E24A8C 802B616C 00000000 */ nop +/* E24A90 802B6170 46020032 */ c.eq.s $f0, $f2 +/* E24A94 802B6174 00000000 */ nop +/* E24A98 802B6178 45000005 */ bc1f .L802B6190 +/* E24A9C 802B617C 00000000 */ nop +/* E24AA0 802B6180 0C039769 */ jal set_action_state +/* E24AA4 802B6184 0000202D */ daddu $a0, $zero, $zero +/* E24AA8 802B6188 080AD86A */ j .L802B61A8 +/* E24AAC 802B618C 00000000 */ nop +.L802B6190: +/* E24AB0 802B6190 45010003 */ bc1t .L802B61A0 +/* E24AB4 802B6194 00000000 */ nop +/* E24AB8 802B6198 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E24ABC 802B619C E6000080 */ swc1 $f0, 0x80($s0) +.L802B61A0: +/* E24AC0 802B61A0 0C0397DA */ jal update_locomotion_state +/* E24AC4 802B61A4 00000000 */ nop +.L802B61A8: +/* E24AC8 802B61A8 8FBF0024 */ lw $ra, 0x24($sp) +/* E24ACC 802B61AC 8FB20020 */ lw $s2, 0x20($sp) +/* E24AD0 802B61B0 8FB1001C */ lw $s1, 0x1c($sp) +/* E24AD4 802B61B4 8FB00018 */ lw $s0, 0x18($sp) +/* E24AD8 802B61B8 03E00008 */ jr $ra +/* E24ADC 802B61BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_E24920/func_802B61C0_E24AE0.s b/asm/nonmatchings/code_E24920/func_802B61C0_E24AE0.s new file mode 100644 index 0000000000..f12a5f49b4 --- /dev/null +++ b/asm/nonmatchings/code_E24920/func_802B61C0_E24AE0.s @@ -0,0 +1,76 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B61C0_E24AE0 +/* E24AE0 802B61C0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E24AE4 802B61C4 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* E24AE8 802B61C8 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus) +/* E24AEC 802B61CC AFB00018 */ sw $s0, 0x18($sp) +/* E24AF0 802B61D0 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E24AF4 802B61D4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E24AF8 802B61D8 AFBF0020 */ sw $ra, 0x20($sp) +/* E24AFC 802B61DC AFB1001C */ sw $s1, 0x1c($sp) +/* E24B00 802B61E0 8E020004 */ lw $v0, 4($s0) +/* E24B04 802B61E4 30421000 */ andi $v0, $v0, 0x1000 +/* E24B08 802B61E8 10400005 */ beqz $v0, .L802B6200 +/* E24B0C 802B61EC 0060882D */ daddu $s1, $v1, $zero +/* E24B10 802B61F0 0C0AD913 */ jal func_802B644C_E24D6C +/* E24B14 802B61F4 00000000 */ nop +/* E24B18 802B61F8 080AD8AE */ j .L802B62B8 +/* E24B1C 802B61FC 00000000 */ nop +.L802B6200: +/* E24B20 802B6200 8E040000 */ lw $a0, ($s0) +/* E24B24 802B6204 04810012 */ bgez $a0, .L802B6250 +/* E24B28 802B6208 3C027F77 */ lui $v0, 0x7f77 +/* E24B2C 802B620C 3442FFF1 */ ori $v0, $v0, 0xfff1 +/* E24B30 802B6210 C6000028 */ lwc1 $f0, 0x28($s0) +/* E24B34 802B6214 C6020030 */ lwc1 $f2, 0x30($s0) +/* E24B38 802B6218 94630002 */ lhu $v1, 2($v1) +/* E24B3C 802B621C 00821024 */ and $v0, $a0, $v0 +/* E24B40 802B6220 AE020000 */ sw $v0, ($s0) +/* E24B44 802B6224 A20000B6 */ sb $zero, 0xb6($s0) +/* E24B48 802B6228 A60000C0 */ sh $zero, 0xc0($s0) +/* E24B4C 802B622C A60000C2 */ sh $zero, 0xc2($s0) +/* E24B50 802B6230 30634000 */ andi $v1, $v1, 0x4000 +/* E24B54 802B6234 E6000044 */ swc1 $f0, 0x44($s0) +/* E24B58 802B6238 14600003 */ bnez $v1, .L802B6248 +/* E24B5C 802B623C E6020048 */ swc1 $f2, 0x48($s0) +/* E24B60 802B6240 0C03954C */ jal func_800E5530 +/* E24B64 802B6244 00000000 */ nop +.L802B6248: +/* E24B68 802B6248 2402FFFF */ addiu $v0, $zero, -1 +/* E24B6C 802B624C A6220004 */ sh $v0, 4($s1) +.L802B6250: +/* E24B70 802B6250 C6020054 */ lwc1 $f2, 0x54($s0) +/* E24B74 802B6254 3C013F19 */ lui $at, 0x3f19 +/* E24B78 802B6258 3421999A */ ori $at, $at, 0x999a +/* E24B7C 802B625C 44810000 */ mtc1 $at, $f0 +/* E24B80 802B6260 27A40010 */ addiu $a0, $sp, 0x10 +/* E24B84 802B6264 46001082 */ mul.s $f2, $f2, $f0 +/* E24B88 802B6268 00000000 */ nop +/* E24B8C 802B626C 920200B6 */ lbu $v0, 0xb6($s0) +/* E24B90 802B6270 27A50014 */ addiu $a1, $sp, 0x14 +/* E24B94 802B6274 24420001 */ addiu $v0, $v0, 1 +/* E24B98 802B6278 A20200B6 */ sb $v0, 0xb6($s0) +/* E24B9C 802B627C 0C0388C1 */ jal input_to_move_vector +/* E24BA0 802B6280 E6020054 */ swc1 $f2, 0x54($s0) +/* E24BA4 802B6284 0C039858 */ jal check_input_jump +/* E24BA8 802B6288 00000000 */ nop +/* E24BAC 802B628C C7A20014 */ lwc1 $f2, 0x14($sp) +/* E24BB0 802B6290 44800000 */ mtc1 $zero, $f0 +/* E24BB4 802B6294 00000000 */ nop +/* E24BB8 802B6298 46001032 */ c.eq.s $f2, $f0 +/* E24BBC 802B629C 00000000 */ nop +/* E24BC0 802B62A0 45010003 */ bc1t .L802B62B0 +/* E24BC4 802B62A4 00000000 */ nop +/* E24BC8 802B62A8 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E24BCC 802B62AC E6000080 */ swc1 $f0, 0x80($s0) +.L802B62B0: +/* E24BD0 802B62B0 0C0397DA */ jal update_locomotion_state +/* E24BD4 802B62B4 00000000 */ nop +.L802B62B8: +/* E24BD8 802B62B8 8FBF0020 */ lw $ra, 0x20($sp) +/* E24BDC 802B62BC 8FB1001C */ lw $s1, 0x1c($sp) +/* E24BE0 802B62C0 8FB00018 */ lw $s0, 0x18($sp) +/* E24BE4 802B62C4 03E00008 */ jr $ra +/* E24BE8 802B62C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s b/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s new file mode 100644 index 0000000000..40e16be75c --- /dev/null +++ b/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s @@ -0,0 +1,105 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B62CC_E24BEC +/* E24BEC 802B62CC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E24BF0 802B62D0 AFB1001C */ sw $s1, 0x1c($sp) +/* E24BF4 802B62D4 3C118016 */ lui $s1, %hi(gCollisionStatus) +/* E24BF8 802B62D8 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus) +/* E24BFC 802B62DC AFB00018 */ sw $s0, 0x18($sp) +/* E24C00 802B62E0 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E24C04 802B62E4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E24C08 802B62E8 AFBF0024 */ sw $ra, 0x24($sp) +/* E24C0C 802B62EC AFB20020 */ sw $s2, 0x20($sp) +/* E24C10 802B62F0 8E030000 */ lw $v1, ($s0) +/* E24C14 802B62F4 0461001A */ bgez $v1, .L802B6360 +/* E24C18 802B62F8 0220902D */ daddu $s2, $s1, $zero +/* E24C1C 802B62FC 3C027FFF */ lui $v0, 0x7fff +/* E24C20 802B6300 3442FFFF */ ori $v0, $v0, 0xffff +/* E24C24 802B6304 24040148 */ addiu $a0, $zero, 0x148 +/* E24C28 802B6308 0000282D */ daddu $a1, $zero, $zero +/* E24C2C 802B630C 00621024 */ and $v0, $v1, $v0 +/* E24C30 802B6310 C6000028 */ lwc1 $f0, 0x28($s0) +/* E24C34 802B6314 C6020030 */ lwc1 $f2, 0x30($s0) +/* E24C38 802B6318 2403FFF1 */ addiu $v1, $zero, -0xf +/* E24C3C 802B631C AE020000 */ sw $v0, ($s0) +/* E24C40 802B6320 00431024 */ and $v0, $v0, $v1 +/* E24C44 802B6324 A20000B6 */ sb $zero, 0xb6($s0) +/* E24C48 802B6328 A60000C0 */ sh $zero, 0xc0($s0) +/* E24C4C 802B632C A60000C2 */ sh $zero, 0xc2($s0) +/* E24C50 802B6330 AE020000 */ sw $v0, ($s0) +/* E24C54 802B6334 E6000044 */ swc1 $f0, 0x44($s0) +/* E24C58 802B6338 0C052736 */ jal play_sound_at_player +/* E24C5C 802B633C E6020048 */ swc1 $f2, 0x48($s0) +/* E24C60 802B6340 96220002 */ lhu $v0, 2($s1) +/* E24C64 802B6344 30424000 */ andi $v0, $v0, 0x4000 +/* E24C68 802B6348 14400004 */ bnez $v0, .L802B635C +/* E24C6C 802B634C 2402FFFF */ addiu $v0, $zero, -1 +/* E24C70 802B6350 0C03954C */ jal func_800E5530 +/* E24C74 802B6354 00000000 */ nop +/* E24C78 802B6358 2402FFFF */ addiu $v0, $zero, -1 +.L802B635C: +/* E24C7C 802B635C A6420004 */ sh $v0, 4($s2) +.L802B6360: +/* E24C80 802B6360 C6000054 */ lwc1 $f0, 0x54($s0) +/* E24C84 802B6364 3C013F19 */ lui $at, 0x3f19 +/* E24C88 802B6368 3421999A */ ori $at, $at, 0x999a +/* E24C8C 802B636C 44811000 */ mtc1 $at, $f2 +/* E24C90 802B6370 27A40010 */ addiu $a0, $sp, 0x10 +/* E24C94 802B6374 46020002 */ mul.s $f0, $f0, $f2 +/* E24C98 802B6378 00000000 */ nop +/* E24C9C 802B637C 920200B6 */ lbu $v0, 0xb6($s0) +/* E24CA0 802B6380 27A50014 */ addiu $a1, $sp, 0x14 +/* E24CA4 802B6384 24420001 */ addiu $v0, $v0, 1 +/* E24CA8 802B6388 A20200B6 */ sb $v0, 0xb6($s0) +/* E24CAC 802B638C 0C0388C1 */ jal input_to_move_vector +/* E24CB0 802B6390 E6000054 */ swc1 $f0, 0x54($s0) +/* E24CB4 802B6394 C7A00014 */ lwc1 $f0, 0x14($sp) +/* E24CB8 802B6398 44801000 */ mtc1 $zero, $f2 +/* E24CBC 802B639C 00000000 */ nop +/* E24CC0 802B63A0 46020032 */ c.eq.s $f0, $f2 +/* E24CC4 802B63A4 00000000 */ nop +/* E24CC8 802B63A8 45010020 */ bc1t .L802B642C +/* E24CCC 802B63AC 0000202D */ daddu $a0, $zero, $zero +/* E24CD0 802B63B0 45010003 */ bc1t .L802B63C0 +/* E24CD4 802B63B4 00000000 */ nop +/* E24CD8 802B63B8 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E24CDC 802B63BC E6000080 */ swc1 $f0, 0x80($s0) +.L802B63C0: +/* E24CE0 802B63C0 8E0200E8 */ lw $v0, 0xe8($s0) +/* E24CE4 802B63C4 00420018 */ mult $v0, $v0 +/* E24CE8 802B63C8 00001812 */ mflo $v1 +/* E24CEC 802B63CC 8E0200EC */ lw $v0, 0xec($s0) +/* E24CF0 802B63D0 00000000 */ nop +/* E24CF4 802B63D4 00420018 */ mult $v0, $v0 +/* E24CF8 802B63D8 00003812 */ mflo $a3 +/* E24CFC 802B63DC 00671021 */ addu $v0, $v1, $a3 +/* E24D00 802B63E0 44826000 */ mtc1 $v0, $f12 +/* E24D04 802B63E4 00000000 */ nop +/* E24D08 802B63E8 46806320 */ cvt.s.w $f12, $f12 +/* E24D0C 802B63EC 46006084 */ sqrt.s $f2, $f12 +/* E24D10 802B63F0 46021032 */ c.eq.s $f2, $f2 +/* E24D14 802B63F4 00000000 */ nop +/* E24D18 802B63F8 45010004 */ bc1t .L802B640C +/* E24D1C 802B63FC 00000000 */ nop +/* E24D20 802B6400 0C0187BC */ jal sqrtf +/* E24D24 802B6404 00000000 */ nop +/* E24D28 802B6408 46000086 */ mov.s $f2, $f0 +.L802B640C: +/* E24D2C 802B640C 3C01425C */ lui $at, 0x425c +/* E24D30 802B6410 44810000 */ mtc1 $at, $f0 +/* E24D34 802B6414 00000000 */ nop +/* E24D38 802B6418 4602003C */ c.lt.s $f0, $f2 +/* E24D3C 802B641C 00000000 */ nop +/* E24D40 802B6420 45000002 */ bc1f .L802B642C +/* E24D44 802B6424 24040001 */ addiu $a0, $zero, 1 +/* E24D48 802B6428 24040002 */ addiu $a0, $zero, 2 +.L802B642C: +/* E24D4C 802B642C 0C039769 */ jal set_action_state +/* E24D50 802B6430 00000000 */ nop +/* E24D54 802B6434 8FBF0024 */ lw $ra, 0x24($sp) +/* E24D58 802B6438 8FB20020 */ lw $s2, 0x20($sp) +/* E24D5C 802B643C 8FB1001C */ lw $s1, 0x1c($sp) +/* E24D60 802B6440 8FB00018 */ lw $s0, 0x18($sp) +/* E24D64 802B6444 03E00008 */ jr $ra +/* E24D68 802B6448 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_E24920/func_802B644C_E24D6C.s b/asm/nonmatchings/code_E24920/func_802B644C_E24D6C.s new file mode 100644 index 0000000000..6670fb1b96 --- /dev/null +++ b/asm/nonmatchings/code_E24920/func_802B644C_E24D6C.s @@ -0,0 +1,98 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B644C_E24D6C +/* E24D6C 802B644C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E24D70 802B6450 3C058016 */ lui $a1, %hi(gCollisionStatus) +/* E24D74 802B6454 24A5A550 */ addiu $a1, $a1, %lo(gCollisionStatus) +/* E24D78 802B6458 AFB00018 */ sw $s0, 0x18($sp) +/* E24D7C 802B645C 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E24D80 802B6460 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E24D84 802B6464 AFBF0020 */ sw $ra, 0x20($sp) +/* E24D88 802B6468 AFB1001C */ sw $s1, 0x1c($sp) +/* E24D8C 802B646C 8E020000 */ lw $v0, ($s0) +/* E24D90 802B6470 04410016 */ bgez $v0, .L802B64CC +/* E24D94 802B6474 00A0882D */ daddu $s1, $a1, $zero +/* E24D98 802B6478 3C037FFF */ lui $v1, 0x7fff +/* E24D9C 802B647C 3463FFFF */ ori $v1, $v1, 0xffff +/* E24DA0 802B6480 00431824 */ and $v1, $v0, $v1 +/* E24DA4 802B6484 C6000028 */ lwc1 $f0, 0x28($s0) +/* E24DA8 802B6488 C6020030 */ lwc1 $f2, 0x30($s0) +/* E24DAC 802B648C 2404FFF1 */ addiu $a0, $zero, -0xf +/* E24DB0 802B6490 AE030000 */ sw $v1, ($s0) +/* E24DB4 802B6494 A20000B6 */ sb $zero, 0xb6($s0) +/* E24DB8 802B6498 A60000C0 */ sh $zero, 0xc0($s0) +/* E24DBC 802B649C A60000C2 */ sh $zero, 0xc2($s0) +/* E24DC0 802B64A0 94A20002 */ lhu $v0, 2($a1) +/* E24DC4 802B64A4 00641824 */ and $v1, $v1, $a0 +/* E24DC8 802B64A8 AE030000 */ sw $v1, ($s0) +/* E24DCC 802B64AC 30424000 */ andi $v0, $v0, 0x4000 +/* E24DD0 802B64B0 E6000044 */ swc1 $f0, 0x44($s0) +/* E24DD4 802B64B4 14400003 */ bnez $v0, .L802B64C4 +/* E24DD8 802B64B8 E6020048 */ swc1 $f2, 0x48($s0) +/* E24DDC 802B64BC 0C03954C */ jal func_800E5530 +/* E24DE0 802B64C0 00000000 */ nop +.L802B64C4: +/* E24DE4 802B64C4 2402FFFF */ addiu $v0, $zero, -1 +/* E24DE8 802B64C8 A6220004 */ sh $v0, 4($s1) +.L802B64CC: +/* E24DEC 802B64CC C6020054 */ lwc1 $f2, 0x54($s0) +/* E24DF0 802B64D0 3C013F19 */ lui $at, 0x3f19 +/* E24DF4 802B64D4 3421999A */ ori $at, $at, 0x999a +/* E24DF8 802B64D8 44810000 */ mtc1 $at, $f0 +/* E24DFC 802B64DC 27A40010 */ addiu $a0, $sp, 0x10 +/* E24E00 802B64E0 46001082 */ mul.s $f2, $f2, $f0 +/* E24E04 802B64E4 00000000 */ nop +/* E24E08 802B64E8 920200B6 */ lbu $v0, 0xb6($s0) +/* E24E0C 802B64EC 27A50014 */ addiu $a1, $sp, 0x14 +/* E24E10 802B64F0 24420001 */ addiu $v0, $v0, 1 +/* E24E14 802B64F4 A20200B6 */ sb $v0, 0xb6($s0) +/* E24E18 802B64F8 0C0388C1 */ jal input_to_move_vector +/* E24E1C 802B64FC E6020054 */ swc1 $f2, 0x54($s0) +/* E24E20 802B6500 C7A20014 */ lwc1 $f2, 0x14($sp) +/* E24E24 802B6504 44800000 */ mtc1 $zero, $f0 +/* E24E28 802B6508 00000000 */ nop +/* E24E2C 802B650C 46001032 */ c.eq.s $f2, $f0 +/* E24E30 802B6510 00000000 */ nop +/* E24E34 802B6514 45010003 */ bc1t .L802B6524 +/* E24E38 802B6518 00000000 */ nop +/* E24E3C 802B651C C7A00010 */ lwc1 $f0, 0x10($sp) +/* E24E40 802B6520 E6000080 */ swc1 $f0, 0x80($s0) +.L802B6524: +/* E24E44 802B6524 8E0200E8 */ lw $v0, 0xe8($s0) +/* E24E48 802B6528 00420018 */ mult $v0, $v0 +/* E24E4C 802B652C 00001812 */ mflo $v1 +/* E24E50 802B6530 8E0200EC */ lw $v0, 0xec($s0) +/* E24E54 802B6534 00000000 */ nop +/* E24E58 802B6538 00420018 */ mult $v0, $v0 +/* E24E5C 802B653C 00003812 */ mflo $a3 +/* E24E60 802B6540 00671021 */ addu $v0, $v1, $a3 +/* E24E64 802B6544 44826000 */ mtc1 $v0, $f12 +/* E24E68 802B6548 00000000 */ nop +/* E24E6C 802B654C 46806320 */ cvt.s.w $f12, $f12 +/* E24E70 802B6550 46006084 */ sqrt.s $f2, $f12 +/* E24E74 802B6554 46021032 */ c.eq.s $f2, $f2 +/* E24E78 802B6558 00000000 */ nop +/* E24E7C 802B655C 45010004 */ bc1t .L802B6570 +/* E24E80 802B6560 00000000 */ nop +/* E24E84 802B6564 0C0187BC */ jal sqrtf +/* E24E88 802B6568 00000000 */ nop +/* E24E8C 802B656C 46000086 */ mov.s $f2, $f0 +.L802B6570: +/* E24E90 802B6570 3C01425C */ lui $at, 0x425c +/* E24E94 802B6574 44810000 */ mtc1 $at, $f0 +/* E24E98 802B6578 00000000 */ nop +/* E24E9C 802B657C 4602003C */ c.lt.s $f0, $f2 +/* E24EA0 802B6580 00000000 */ nop +/* E24EA4 802B6584 45000002 */ bc1f .L802B6590 +/* E24EA8 802B6588 24040001 */ addiu $a0, $zero, 1 +/* E24EAC 802B658C 24040002 */ addiu $a0, $zero, 2 +.L802B6590: +/* E24EB0 802B6590 0C039769 */ jal set_action_state +/* E24EB4 802B6594 00000000 */ nop +/* E24EB8 802B6598 8FBF0020 */ lw $ra, 0x20($sp) +/* E24EBC 802B659C 8FB1001C */ lw $s1, 0x1c($sp) +/* E24EC0 802B65A0 8FB00018 */ lw $s0, 0x18($sp) +/* E24EC4 802B65A4 03E00008 */ jr $ra +/* E24EC8 802B65A8 27BD0028 */ addiu $sp, $sp, 0x28 +/* E24ECC 802B65AC 00000000 */ nop diff --git a/asm/nonmatchings/code_E24ED0/func_802B6000_E24ED0.s b/asm/nonmatchings/code_E24ED0/func_802B6000_E24ED0.s new file mode 100644 index 0000000000..436e5f2b6d --- /dev/null +++ b/asm/nonmatchings/code_E24ED0/func_802B6000_E24ED0.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E24ED0 +/* E24ED0 802B6000 3C020100 */ lui $v0, 0x100 +/* E24ED4 802B6004 00821024 */ and $v0, $a0, $v0 +/* E24ED8 802B6008 10400003 */ beqz $v0, .L802B6018 +/* E24EDC 802B600C 3C02FFF9 */ lui $v0, 0xfff9 +/* E24EE0 802B6010 03E00008 */ jr $ra +/* E24EE4 802B6014 24020001 */ addiu $v0, $zero, 1 +.L802B6018: +/* E24EE8 802B6018 3442FFEF */ ori $v0, $v0, 0xffef +/* E24EEC 802B601C 00822021 */ addu $a0, $a0, $v0 +/* E24EF0 802B6020 2C82000B */ sltiu $v0, $a0, 0xb +/* E24EF4 802B6024 10400006 */ beqz $v0, .L802B6040 +/* E24EF8 802B6028 00041080 */ sll $v0, $a0, 2 +/* E24EFC 802B602C 3C01802B */ lui $at, %hi(D_802B6DC0) +/* E24F00 802B6030 00220821 */ addu $at, $at, $v0 +/* E24F04 802B6034 8C226DC0 */ lw $v0, %lo(D_802B6DC0)($at) +/* E24F08 802B6038 00400008 */ jr $v0 +/* E24F0C 802B603C 00000000 */ nop +.L802B6040: +/* E24F10 802B6040 03E00008 */ jr $ra +/* E24F14 802B6044 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s b/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s new file mode 100644 index 0000000000..cab76bec78 --- /dev/null +++ b/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s @@ -0,0 +1,161 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6048_E24F18 +/* E24F18 802B6048 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* E24F1C 802B604C AFB3002C */ sw $s3, 0x2c($sp) +/* E24F20 802B6050 AFB40030 */ sw $s4, 0x30($sp) +/* E24F24 802B6054 3C148011 */ lui $s4, %hi(gPlayerStatus) +/* E24F28 802B6058 2694EFC8 */ addiu $s4, $s4, %lo(gPlayerStatus) +/* E24F2C 802B605C 3C038011 */ lui $v1, %hi(gPlayerData+0x1) +/* E24F30 802B6060 8063F291 */ lb $v1, %lo(gPlayerData+0x1)($v1) +/* E24F34 802B6064 24020002 */ addiu $v0, $zero, 2 +/* E24F38 802B6068 AFBF0034 */ sw $ra, 0x34($sp) +/* E24F3C 802B606C AFB20028 */ sw $s2, 0x28($sp) +/* E24F40 802B6070 AFB10024 */ sw $s1, 0x24($sp) +/* E24F44 802B6074 AFB00020 */ sw $s0, 0x20($sp) +/* E24F48 802B6078 F7BA0050 */ sdc1 $f26, 0x50($sp) +/* E24F4C 802B607C F7B80048 */ sdc1 $f24, 0x48($sp) +/* E24F50 802B6080 F7B60040 */ sdc1 $f22, 0x40($sp) +/* E24F54 802B6084 F7B40038 */ sdc1 $f20, 0x38($sp) +/* E24F58 802B6088 14620008 */ bne $v1, $v0, .L802B60AC +/* E24F5C 802B608C 0080982D */ daddu $s3, $a0, $zero +/* E24F60 802B6090 3C013F99 */ lui $at, 0x3f99 +/* E24F64 802B6094 3421999A */ ori $at, $at, 0x999a +/* E24F68 802B6098 4481C000 */ mtc1 $at, $f24 +/* E24F6C 802B609C 24120001 */ addiu $s2, $zero, 1 +/* E24F70 802B60A0 2411001C */ addiu $s1, $zero, 0x1c +/* E24F74 802B60A4 080AD83A */ j .L802B60E8 +/* E24F78 802B60A8 2410211A */ addiu $s0, $zero, 0x211a +.L802B60AC: +/* E24F7C 802B60AC 24020001 */ addiu $v0, $zero, 1 +/* E24F80 802B60B0 14620008 */ bne $v1, $v0, .L802B60D4 +/* E24F84 802B60B4 24120001 */ addiu $s2, $zero, 1 +/* E24F88 802B60B8 3C013F4C */ lui $at, 0x3f4c +/* E24F8C 802B60BC 3421CCCD */ ori $at, $at, 0xcccd +/* E24F90 802B60C0 4481C000 */ mtc1 $at, $f24 +/* E24F94 802B60C4 0040902D */ daddu $s2, $v0, $zero +/* E24F98 802B60C8 24110010 */ addiu $s1, $zero, 0x10 +/* E24F9C 802B60CC 080AD83A */ j .L802B60E8 +/* E24FA0 802B60D0 24102119 */ addiu $s0, $zero, 0x2119 +.L802B60D4: +/* E24FA4 802B60D4 3C013ECC */ lui $at, 0x3ecc +/* E24FA8 802B60D8 3421CCCD */ ori $at, $at, 0xcccd +/* E24FAC 802B60DC 4481C000 */ mtc1 $at, $f24 +/* E24FB0 802B60E0 24110004 */ addiu $s1, $zero, 4 +/* E24FB4 802B60E4 24102118 */ addiu $s0, $zero, 0x2118 +.L802B60E8: +/* E24FB8 802B60E8 0C0394D2 */ jal func_800E5348 +/* E24FBC 802B60EC 00000000 */ nop +/* E24FC0 802B60F0 3C0140C9 */ lui $at, 0x40c9 +/* E24FC4 802B60F4 34210FD0 */ ori $at, $at, 0xfd0 +/* E24FC8 802B60F8 44811000 */ mtc1 $at, $f2 +/* E24FCC 802B60FC 00000000 */ nop +/* E24FD0 802B6100 46020502 */ mul.s $f20, $f0, $f2 +/* E24FD4 802B6104 00000000 */ nop +/* E24FD8 802B6108 3C0143B4 */ lui $at, 0x43b4 +/* E24FDC 802B610C 44810000 */ mtc1 $at, $f0 +/* E24FE0 802B6110 00000000 */ nop +/* E24FE4 802B6114 4600A503 */ div.s $f20, $f20, $f0 +/* E24FE8 802B6118 0C00A85B */ jal sin_rad +/* E24FEC 802B611C 4600A306 */ mov.s $f12, $f20 +/* E24FF0 802B6120 3C0141C8 */ lui $at, 0x41c8 +/* E24FF4 802B6124 44811000 */ mtc1 $at, $f2 +/* E24FF8 802B6128 00000000 */ nop +/* E24FFC 802B612C 46020582 */ mul.s $f22, $f0, $f2 +/* E25000 802B6130 00000000 */ nop +/* E25004 802B6134 0C00A874 */ jal cos_rad +/* E25008 802B6138 4600A306 */ mov.s $f12, $f20 +/* E2500C 802B613C 3C01C1C8 */ lui $at, 0xc1c8 +/* E25010 802B6140 44811000 */ mtc1 $at, $f2 +/* E25014 802B6144 00000000 */ nop +/* E25018 802B6148 46020082 */ mul.s $f2, $f0, $f2 +/* E2501C 802B614C 00000000 */ nop +/* E25020 802B6150 06610008 */ bgez $s3, .L802B6174 +/* E25024 802B6154 24130003 */ addiu $s3, $zero, 3 +/* E25028 802B6158 C6800028 */ lwc1 $f0, 0x28($s4) +/* E2502C 802B615C 24130006 */ addiu $s3, $zero, 6 +/* E25030 802B6160 46160680 */ add.s $f26, $f0, $f22 +/* E25034 802B6164 C6800030 */ lwc1 $f0, 0x30($s4) +/* E25038 802B6168 C694002C */ lwc1 $f20, 0x2c($s4) +/* E2503C 802B616C 080AD86D */ j .L802B61B4 +/* E25040 802B6170 46020580 */ add.s $f22, $f0, $f2 +.L802B6174: +/* E25044 802B6174 3C02802B */ lui $v0, %hi(D_802B6DB0) +/* E25048 802B6178 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) +/* E2504C 802B617C C4400000 */ lwc1 $f0, ($v0) +/* E25050 802B6180 46160680 */ add.s $f26, $f0, $f22 +/* E25054 802B6184 C4400008 */ lwc1 $f0, 8($v0) +/* E25058 802B6188 868300B0 */ lh $v1, 0xb0($s4) +/* E2505C 802B618C 46020580 */ add.s $f22, $f0, $f2 +/* E25060 802B6190 C4420004 */ lwc1 $f2, 4($v0) +/* E25064 802B6194 44830000 */ mtc1 $v1, $f0 +/* E25068 802B6198 00000000 */ nop +/* E2506C 802B619C 46800020 */ cvt.s.w $f0, $f0 +/* E25070 802B61A0 46001080 */ add.s $f2, $f2, $f0 +/* E25074 802B61A4 3C0140A0 */ lui $at, 0x40a0 +/* E25078 802B61A8 44810000 */ mtc1 $at, $f0 +/* E2507C 802B61AC 24110001 */ addiu $s1, $zero, 1 +/* E25080 802B61B0 46001501 */ sub.s $f20, $f2, $f0 +.L802B61B4: +/* E25084 802B61B4 0000202D */ daddu $a0, $zero, $zero +/* E25088 802B61B8 24050002 */ addiu $a1, $zero, 2 +/* E2508C 802B61BC 4407C000 */ mfc1 $a3, $f24 +/* E25090 802B61C0 0C0B2D72 */ jal exec_ShakeCamX +/* E25094 802B61C4 0240302D */ daddu $a2, $s2, $zero +/* E25098 802B61C8 0000202D */ daddu $a0, $zero, $zero +/* E2509C 802B61CC 44910000 */ mtc1 $s1, $f0 +/* E250A0 802B61D0 00000000 */ nop +/* E250A4 802B61D4 46800020 */ cvt.s.w $f0, $f0 +/* E250A8 802B61D8 26430003 */ addiu $v1, $s2, 3 +/* E250AC 802B61DC 00031040 */ sll $v0, $v1, 1 +/* E250B0 802B61E0 4405D000 */ mfc1 $a1, $f26 +/* E250B4 802B61E4 4406A000 */ mfc1 $a2, $f20 +/* E250B8 802B61E8 4407B000 */ mfc1 $a3, $f22 +/* E250BC 802B61EC 00431021 */ addu $v0, $v0, $v1 +/* E250C0 802B61F0 E7A00010 */ swc1 $f0, 0x10($sp) +/* E250C4 802B61F4 AFB30014 */ sw $s3, 0x14($sp) +/* E250C8 802B61F8 AFA00018 */ sw $zero, 0x18($sp) +/* E250CC 802B61FC 0C01C0DC */ jal func_80070370 +/* E250D0 802B6200 AFA2001C */ sw $v0, 0x1c($sp) +/* E250D4 802B6204 0C03A752 */ jal is_ability_active +/* E250D8 802B6208 2404000F */ addiu $a0, $zero, 0xf +/* E250DC 802B620C 2443FFFF */ addiu $v1, $v0, -1 +/* E250E0 802B6210 2C620006 */ sltiu $v0, $v1, 6 +/* E250E4 802B6214 10400011 */ beqz $v0, .L802B625C +/* E250E8 802B6218 00031080 */ sll $v0, $v1, 2 +/* E250EC 802B621C 3C01802B */ lui $at, %hi(D_802B6DF0) +/* E250F0 802B6220 00220821 */ addu $at, $at, $v0 +/* E250F4 802B6224 8C226DF0 */ lw $v0, %lo(D_802B6DF0)($at) +/* E250F8 802B6228 00400008 */ jr $v0 +/* E250FC 802B622C 00000000 */ nop +/* E25100 802B6230 080AD897 */ j .L802B625C +/* E25104 802B6234 24100372 */ addiu $s0, $zero, 0x372 +/* E25108 802B6238 080AD897 */ j .L802B625C +/* E2510C 802B623C 241000F1 */ addiu $s0, $zero, 0xf1 +/* E25110 802B6240 080AD897 */ j .L802B625C +/* E25114 802B6244 241000DC */ addiu $s0, $zero, 0xdc +/* E25118 802B6248 080AD897 */ j .L802B625C +/* E2511C 802B624C 24102072 */ addiu $s0, $zero, 0x2072 +/* E25120 802B6250 080AD897 */ j .L802B625C +/* E25124 802B6254 24102073 */ addiu $s0, $zero, 0x2073 +/* E25128 802B6258 2410205B */ addiu $s0, $zero, 0x205b +.L802B625C: +/* E2512C 802B625C 0200202D */ daddu $a0, $s0, $zero +/* E25130 802B6260 0C052736 */ jal play_sound_at_player +/* E25134 802B6264 0000282D */ daddu $a1, $zero, $zero +/* E25138 802B6268 24040100 */ addiu $a0, $zero, 0x100 +/* E2513C 802B626C 0C00A3C2 */ jal start_rumble +/* E25140 802B6270 24050032 */ addiu $a1, $zero, 0x32 +/* E25144 802B6274 8FBF0034 */ lw $ra, 0x34($sp) +/* E25148 802B6278 8FB40030 */ lw $s4, 0x30($sp) +/* E2514C 802B627C 8FB3002C */ lw $s3, 0x2c($sp) +/* E25150 802B6280 8FB20028 */ lw $s2, 0x28($sp) +/* E25154 802B6284 8FB10024 */ lw $s1, 0x24($sp) +/* E25158 802B6288 8FB00020 */ lw $s0, 0x20($sp) +/* E2515C 802B628C D7BA0050 */ ldc1 $f26, 0x50($sp) +/* E25160 802B6290 D7B80048 */ ldc1 $f24, 0x48($sp) +/* E25164 802B6294 D7B60040 */ ldc1 $f22, 0x40($sp) +/* E25168 802B6298 D7B40038 */ ldc1 $f20, 0x38($sp) +/* E2516C 802B629C 03E00008 */ jr $ra +/* E25170 802B62A0 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s b/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s new file mode 100644 index 0000000000..51f0a4a319 --- /dev/null +++ b/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s @@ -0,0 +1,276 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B62A4_E25174 +/* E25174 802B62A4 27BDFF88 */ addiu $sp, $sp, -0x78 +/* E25178 802B62A8 AFBF0048 */ sw $ra, 0x48($sp) +/* E2517C 802B62AC AFB30044 */ sw $s3, 0x44($sp) +/* E25180 802B62B0 AFB20040 */ sw $s2, 0x40($sp) +/* E25184 802B62B4 AFB1003C */ sw $s1, 0x3c($sp) +/* E25188 802B62B8 AFB00038 */ sw $s0, 0x38($sp) +/* E2518C 802B62BC F7BC0070 */ sdc1 $f28, 0x70($sp) +/* E25190 802B62C0 F7BA0068 */ sdc1 $f26, 0x68($sp) +/* E25194 802B62C4 F7B80060 */ sdc1 $f24, 0x60($sp) +/* E25198 802B62C8 F7B60058 */ sdc1 $f22, 0x58($sp) +/* E2519C 802B62CC 0C0394D2 */ jal func_800E5348 +/* E251A0 802B62D0 F7B40050 */ sdc1 $f20, 0x50($sp) +/* E251A4 802B62D4 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* E251A8 802B62D8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* E251AC 802B62DC 8E4400A4 */ lw $a0, 0xa4($s2) +/* E251B0 802B62E0 0C0AD800 */ jal func_802B6000_E24ED0 +/* E251B4 802B62E4 46000586 */ mov.s $f22, $f0 +/* E251B8 802B62E8 10400030 */ beqz $v0, .L802B63AC +/* E251BC 802B62EC 27A50020 */ addiu $a1, $sp, 0x20 +/* E251C0 802B62F0 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E251C4 802B62F4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E251C8 802B62F8 3C0142B4 */ lui $at, 0x42b4 +/* E251CC 802B62FC 4481A000 */ mtc1 $at, $f20 +/* E251D0 802B6300 00031080 */ sll $v0, $v1, 2 +/* E251D4 802B6304 00431021 */ addu $v0, $v0, $v1 +/* E251D8 802B6308 00021080 */ sll $v0, $v0, 2 +/* E251DC 802B630C 00431023 */ subu $v0, $v0, $v1 +/* E251E0 802B6310 000218C0 */ sll $v1, $v0, 3 +/* E251E4 802B6314 00431021 */ addu $v0, $v0, $v1 +/* E251E8 802B6318 000210C0 */ sll $v0, $v0, 3 +/* E251EC 802B631C 4614B000 */ add.s $f0, $f22, $f20 +/* E251F0 802B6320 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E251F4 802B6324 00220821 */ addu $at, $at, $v0 +/* E251F8 802B6328 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) +/* E251FC 802B632C 0C00A6C9 */ jal clamp_angle +/* E25200 802B6330 460C0301 */ sub.s $f12, $f0, $f12 +/* E25204 802B6334 46000086 */ mov.s $f2, $f0 +/* E25208 802B6338 4602A03E */ c.le.s $f20, $f2 +/* E2520C 802B633C 00000000 */ nop +/* E25210 802B6340 45000015 */ bc1f .L802B6398 +/* E25214 802B6344 00000000 */ nop +/* E25218 802B6348 3C014387 */ lui $at, 0x4387 +/* E2521C 802B634C 44810000 */ mtc1 $at, $f0 +/* E25220 802B6350 00000000 */ nop +/* E25224 802B6354 4600103C */ c.lt.s $f2, $f0 +/* E25228 802B6358 00000000 */ nop +/* E2522C 802B635C 4500000E */ bc1f .L802B6398 +/* E25230 802B6360 00000000 */ nop +/* E25234 802B6364 3C01C1F0 */ lui $at, 0xc1f0 +/* E25238 802B6368 44810000 */ mtc1 $at, $f0 +/* E2523C 802B636C 080AD8EA */ j .L802B63A8 +/* E25240 802B6370 4600B580 */ add.s $f22, $f22, $f0 +.L802B6374: +/* E25244 802B6374 3C02802B */ lui $v0, %hi(D_802B6DB0) +/* E25248 802B6378 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) +/* E2524C 802B637C C7A00028 */ lwc1 $f0, 0x28($sp) +/* E25250 802B6380 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* E25254 802B6384 C7A40030 */ lwc1 $f4, 0x30($sp) +/* E25258 802B6388 E4400000 */ swc1 $f0, ($v0) +/* E2525C 802B638C E4420004 */ swc1 $f2, 4($v0) +/* E25260 802B6390 080AD919 */ j .L802B6464 +/* E25264 802B6394 E4440008 */ swc1 $f4, 8($v0) +.L802B6398: +/* E25268 802B6398 3C0141F0 */ lui $at, 0x41f0 +/* E2526C 802B639C 44810000 */ mtc1 $at, $f0 +/* E25270 802B63A0 00000000 */ nop +/* E25274 802B63A4 4600B580 */ add.s $f22, $f22, $f0 +.L802B63A8: +/* E25278 802B63A8 27A50020 */ addiu $a1, $sp, 0x20 +.L802B63AC: +/* E2527C 802B63AC 3C0140C9 */ lui $at, 0x40c9 +/* E25280 802B63B0 34210FD0 */ ori $at, $at, 0xfd0 +/* E25284 802B63B4 44816000 */ mtc1 $at, $f12 +/* E25288 802B63B8 27A60024 */ addiu $a2, $sp, 0x24 +/* E2528C 802B63BC 460CB302 */ mul.s $f12, $f22, $f12 +/* E25290 802B63C0 00000000 */ nop +/* E25294 802B63C4 24100001 */ addiu $s0, $zero, 1 +/* E25298 802B63C8 27B30030 */ addiu $s3, $sp, 0x30 +/* E2529C 802B63CC 3C0143B4 */ lui $at, 0x43b4 +/* E252A0 802B63D0 44810000 */ mtc1 $at, $f0 +/* E252A4 802B63D4 3C014080 */ lui $at, 0x4080 +/* E252A8 802B63D8 4481A000 */ mtc1 $at, $f20 +/* E252AC 802B63DC 0C00A82D */ jal sin_cos_rad +/* E252B0 802B63E0 46006303 */ div.s $f12, $f12, $f0 +/* E252B4 802B63E4 C65C0028 */ lwc1 $f28, 0x28($s2) +/* E252B8 802B63E8 C65A002C */ lwc1 $f26, 0x2c($s2) +/* E252BC 802B63EC C6580030 */ lwc1 $f24, 0x30($s2) +.L802B63F0: +/* E252C0 802B63F0 C7A00020 */ lwc1 $f0, 0x20($sp) +/* E252C4 802B63F4 44901000 */ mtc1 $s0, $f2 +/* E252C8 802B63F8 00000000 */ nop +/* E252CC 802B63FC 468010A0 */ cvt.s.w $f2, $f2 +/* E252D0 802B6400 46020002 */ mul.s $f0, $f0, $f2 +/* E252D4 802B6404 00000000 */ nop +/* E252D8 802B6408 C7A40024 */ lwc1 $f4, 0x24($sp) +/* E252DC 802B640C 46022102 */ mul.s $f4, $f4, $f2 +/* E252E0 802B6410 00000000 */ nop +/* E252E4 802B6414 24040003 */ addiu $a0, $zero, 3 +/* E252E8 802B6418 0240282D */ daddu $a1, $s2, $zero +/* E252EC 802B641C 4600E000 */ add.s $f0, $f28, $f0 +/* E252F0 802B6420 27A60028 */ addiu $a2, $sp, 0x28 +/* E252F4 802B6424 27A7002C */ addiu $a3, $sp, 0x2c +/* E252F8 802B6428 4604C101 */ sub.s $f4, $f24, $f4 +/* E252FC 802B642C E7BA002C */ swc1 $f26, 0x2c($sp) +/* E25300 802B6430 E7A00028 */ swc1 $f0, 0x28($sp) +/* E25304 802B6434 E7A40030 */ swc1 $f4, 0x30($sp) +/* E25308 802B6438 AFB30010 */ sw $s3, 0x10($sp) +/* E2530C 802B643C E7B40014 */ swc1 $f20, 0x14($sp) +/* E25310 802B6440 0C037B01 */ jal do_lateral_collision +/* E25314 802B6444 E7B60018 */ swc1 $f22, 0x18($sp) +/* E25318 802B6448 0040882D */ daddu $s1, $v0, $zero +/* E2531C 802B644C 0621FFC9 */ bgez $s1, .L802B6374 +/* E25320 802B6450 00000000 */ nop +/* E25324 802B6454 26100001 */ addiu $s0, $s0, 1 +/* E25328 802B6458 2A020010 */ slti $v0, $s0, 0x10 +/* E2532C 802B645C 1440FFE4 */ bnez $v0, .L802B63F0 +/* E25330 802B6460 00000000 */ nop +.L802B6464: +/* E25334 802B6464 2A020010 */ slti $v0, $s0, 0x10 +/* E25338 802B6468 14400061 */ bnez $v0, .L802B65F0 +/* E2533C 802B646C 00000000 */ nop +/* E25340 802B6470 0C0394D2 */ jal func_800E5348 +/* E25344 802B6474 00000000 */ nop +/* E25348 802B6478 8E4400A4 */ lw $a0, 0xa4($s2) +/* E2534C 802B647C 0C0AD800 */ jal func_802B6000_E24ED0 +/* E25350 802B6480 46000586 */ mov.s $f22, $f0 +/* E25354 802B6484 14400030 */ bnez $v0, .L802B6548 +/* E25358 802B6488 27A50020 */ addiu $a1, $sp, 0x20 +/* E2535C 802B648C 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E25360 802B6490 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E25364 802B6494 3C0142B4 */ lui $at, 0x42b4 +/* E25368 802B6498 4481A000 */ mtc1 $at, $f20 +/* E2536C 802B649C 00031080 */ sll $v0, $v1, 2 +/* E25370 802B64A0 00431021 */ addu $v0, $v0, $v1 +/* E25374 802B64A4 00021080 */ sll $v0, $v0, 2 +/* E25378 802B64A8 00431023 */ subu $v0, $v0, $v1 +/* E2537C 802B64AC 000218C0 */ sll $v1, $v0, 3 +/* E25380 802B64B0 00431021 */ addu $v0, $v0, $v1 +/* E25384 802B64B4 000210C0 */ sll $v0, $v0, 3 +/* E25388 802B64B8 4614B000 */ add.s $f0, $f22, $f20 +/* E2538C 802B64BC 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E25390 802B64C0 00220821 */ addu $at, $at, $v0 +/* E25394 802B64C4 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) +/* E25398 802B64C8 0C00A6C9 */ jal clamp_angle +/* E2539C 802B64CC 460C0301 */ sub.s $f12, $f0, $f12 +/* E253A0 802B64D0 46000086 */ mov.s $f2, $f0 +/* E253A4 802B64D4 4602A03E */ c.le.s $f20, $f2 +/* E253A8 802B64D8 00000000 */ nop +/* E253AC 802B64DC 45000015 */ bc1f .L802B6534 +/* E253B0 802B64E0 00000000 */ nop +/* E253B4 802B64E4 3C014387 */ lui $at, 0x4387 +/* E253B8 802B64E8 44810000 */ mtc1 $at, $f0 +/* E253BC 802B64EC 00000000 */ nop +/* E253C0 802B64F0 4600103C */ c.lt.s $f2, $f0 +/* E253C4 802B64F4 00000000 */ nop +/* E253C8 802B64F8 4500000E */ bc1f .L802B6534 +/* E253CC 802B64FC 00000000 */ nop +/* E253D0 802B6500 3C014170 */ lui $at, 0x4170 +/* E253D4 802B6504 44810000 */ mtc1 $at, $f0 +/* E253D8 802B6508 080AD951 */ j .L802B6544 +/* E253DC 802B650C 4600B580 */ add.s $f22, $f22, $f0 +.L802B6510: +/* E253E0 802B6510 3C02802B */ lui $v0, %hi(D_802B6DB0) +/* E253E4 802B6514 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) +/* E253E8 802B6518 C7A00028 */ lwc1 $f0, 0x28($sp) +/* E253EC 802B651C C7A2002C */ lwc1 $f2, 0x2c($sp) +/* E253F0 802B6520 C7A40030 */ lwc1 $f4, 0x30($sp) +/* E253F4 802B6524 E4400000 */ swc1 $f0, ($v0) +/* E253F8 802B6528 E4420004 */ swc1 $f2, 4($v0) +/* E253FC 802B652C 080AD97C */ j .L802B65F0 +/* E25400 802B6530 E4440008 */ swc1 $f4, 8($v0) +.L802B6534: +/* E25404 802B6534 3C01C170 */ lui $at, 0xc170 +/* E25408 802B6538 44810000 */ mtc1 $at, $f0 +/* E2540C 802B653C 00000000 */ nop +/* E25410 802B6540 4600B580 */ add.s $f22, $f22, $f0 +.L802B6544: +/* E25414 802B6544 27A50020 */ addiu $a1, $sp, 0x20 +.L802B6548: +/* E25418 802B6548 3C0140C9 */ lui $at, 0x40c9 +/* E2541C 802B654C 34210FD0 */ ori $at, $at, 0xfd0 +/* E25420 802B6550 44816000 */ mtc1 $at, $f12 +/* E25424 802B6554 27A60024 */ addiu $a2, $sp, 0x24 +/* E25428 802B6558 460CB302 */ mul.s $f12, $f22, $f12 +/* E2542C 802B655C 00000000 */ nop +/* E25430 802B6560 24100001 */ addiu $s0, $zero, 1 +/* E25434 802B6564 27B30030 */ addiu $s3, $sp, 0x30 +/* E25438 802B6568 3C0143B4 */ lui $at, 0x43b4 +/* E2543C 802B656C 44810000 */ mtc1 $at, $f0 +/* E25440 802B6570 3C014080 */ lui $at, 0x4080 +/* E25444 802B6574 4481A000 */ mtc1 $at, $f20 +/* E25448 802B6578 0C00A82D */ jal sin_cos_rad +/* E2544C 802B657C 46006303 */ div.s $f12, $f12, $f0 +.L802B6580: +/* E25450 802B6580 C7A00020 */ lwc1 $f0, 0x20($sp) +/* E25454 802B6584 44901000 */ mtc1 $s0, $f2 +/* E25458 802B6588 00000000 */ nop +/* E2545C 802B658C 468010A0 */ cvt.s.w $f2, $f2 +/* E25460 802B6590 46020002 */ mul.s $f0, $f0, $f2 +/* E25464 802B6594 00000000 */ nop +/* E25468 802B6598 C7A40024 */ lwc1 $f4, 0x24($sp) +/* E2546C 802B659C 46022102 */ mul.s $f4, $f4, $f2 +/* E25470 802B65A0 00000000 */ nop +/* E25474 802B65A4 24040003 */ addiu $a0, $zero, 3 +/* E25478 802B65A8 0240282D */ daddu $a1, $s2, $zero +/* E2547C 802B65AC 4600E000 */ add.s $f0, $f28, $f0 +/* E25480 802B65B0 27A60028 */ addiu $a2, $sp, 0x28 +/* E25484 802B65B4 27A7002C */ addiu $a3, $sp, 0x2c +/* E25488 802B65B8 4604C101 */ sub.s $f4, $f24, $f4 +/* E2548C 802B65BC E7BA002C */ swc1 $f26, 0x2c($sp) +/* E25490 802B65C0 E7A00028 */ swc1 $f0, 0x28($sp) +/* E25494 802B65C4 E7A40030 */ swc1 $f4, 0x30($sp) +/* E25498 802B65C8 AFB30010 */ sw $s3, 0x10($sp) +/* E2549C 802B65CC E7B40014 */ swc1 $f20, 0x14($sp) +/* E254A0 802B65D0 0C037B01 */ jal do_lateral_collision +/* E254A4 802B65D4 E7B60018 */ swc1 $f22, 0x18($sp) +/* E254A8 802B65D8 0040882D */ daddu $s1, $v0, $zero +/* E254AC 802B65DC 0621FFCC */ bgez $s1, .L802B6510 +/* E254B0 802B65E0 26100001 */ addiu $s0, $s0, 1 +/* E254B4 802B65E4 2A020010 */ slti $v0, $s0, 0x10 +/* E254B8 802B65E8 1440FFE5 */ bnez $v0, .L802B6580 +/* E254BC 802B65EC 00000000 */ nop +.L802B65F0: +/* E254C0 802B65F0 06200020 */ bltz $s1, .L802B6674 +/* E254C4 802B65F4 32224000 */ andi $v0, $s1, 0x4000 +/* E254C8 802B65F8 1040001F */ beqz $v0, .L802B6678 +/* E254CC 802B65FC 0220102D */ daddu $v0, $s1, $zero +/* E254D0 802B6600 3C108011 */ lui $s0, %hi(gPlayerData+0x1) +/* E254D4 802B6604 8210F291 */ lb $s0, %lo(gPlayerData+0x1)($s0) +/* E254D8 802B6608 0C0441A9 */ jal get_entity_type +/* E254DC 802B660C 0220202D */ daddu $a0, $s1, $zero +/* E254E0 802B6610 2443FFF9 */ addiu $v1, $v0, -7 +/* E254E4 802B6614 2C620020 */ sltiu $v0, $v1, 0x20 +/* E254E8 802B6618 10400016 */ beqz $v0, .L802B6674 +/* E254EC 802B661C 00031080 */ sll $v0, $v1, 2 +/* E254F0 802B6620 3C01802B */ lui $at, %hi(D_802B6E08) +/* E254F4 802B6624 00220821 */ addu $at, $at, $v0 +/* E254F8 802B6628 8C226E08 */ lw $v0, %lo(D_802B6E08)($at) +/* E254FC 802B662C 00400008 */ jr $v0 +/* E25500 802B6630 00000000 */ nop +/* E25504 802B6634 0603000F */ bgezl $s0, .L802B6674 +/* E25508 802B6638 2411FFFF */ addiu $s1, $zero, -1 +/* E2550C 802B663C 080AD998 */ j .L802B6660 +/* E25510 802B6640 00000000 */ nop +/* E25514 802B6644 5E00000B */ bgtzl $s0, .L802B6674 +/* E25518 802B6648 2411FFFF */ addiu $s1, $zero, -1 +/* E2551C 802B664C 080AD998 */ j .L802B6660 +/* E25520 802B6650 00000000 */ nop +/* E25524 802B6654 2A020002 */ slti $v0, $s0, 2 +/* E25528 802B6658 50400006 */ beql $v0, $zero, .L802B6674 +/* E2552C 802B665C 2411FFFF */ addiu $s1, $zero, -1 +.L802B6660: +/* E25530 802B6660 8E420004 */ lw $v0, 4($s2) +/* E25534 802B6664 34420400 */ ori $v0, $v0, 0x400 +/* E25538 802B6668 080AD99D */ j .L802B6674 +/* E2553C 802B666C AE420004 */ sw $v0, 4($s2) +/* E25540 802B6670 2411FFFF */ addiu $s1, $zero, -1 +.L802B6674: +/* E25544 802B6674 0220102D */ daddu $v0, $s1, $zero +.L802B6678: +/* E25548 802B6678 8FBF0048 */ lw $ra, 0x48($sp) +/* E2554C 802B667C 8FB30044 */ lw $s3, 0x44($sp) +/* E25550 802B6680 8FB20040 */ lw $s2, 0x40($sp) +/* E25554 802B6684 8FB1003C */ lw $s1, 0x3c($sp) +/* E25558 802B6688 8FB00038 */ lw $s0, 0x38($sp) +/* E2555C 802B668C D7BC0070 */ ldc1 $f28, 0x70($sp) +/* E25560 802B6690 D7BA0068 */ ldc1 $f26, 0x68($sp) +/* E25564 802B6694 D7B80060 */ ldc1 $f24, 0x60($sp) +/* E25568 802B6698 D7B60058 */ ldc1 $f22, 0x58($sp) +/* E2556C 802B669C D7B40050 */ ldc1 $f20, 0x50($sp) +/* E25570 802B66A0 03E00008 */ jr $ra +/* E25574 802B66A4 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s b/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s new file mode 100644 index 0000000000..4a0c0f49b6 --- /dev/null +++ b/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s @@ -0,0 +1,105 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B66A8_E25578 +/* E25578 802B66A8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E2557C 802B66AC AFB00010 */ sw $s0, 0x10($sp) +/* E25580 802B66B0 3C10802B */ lui $s0, %hi(D_802B6DB0) +/* E25584 802B66B4 26106DB0 */ addiu $s0, $s0, %lo(D_802B6DB0) +/* E25588 802B66B8 AFBF0018 */ sw $ra, 0x18($sp) +/* E2558C 802B66BC AFB10014 */ sw $s1, 0x14($sp) +/* E25590 802B66C0 8E040000 */ lw $a0, ($s0) +/* E25594 802B66C4 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E25598 802B66C8 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E2559C 802B66CC AC80001C */ sw $zero, 0x1c($a0) +/* E255A0 802B66D0 8E230000 */ lw $v1, ($s1) +/* E255A4 802B66D4 04630033 */ bgezl $v1, .L802B67A4 +/* E255A8 802B66D8 3C04FEFF */ lui $a0, 0xfeff +/* E255AC 802B66DC 3C027FFF */ lui $v0, 0x7fff +/* E255B0 802B66E0 3442FFFF */ ori $v0, $v0, 0xffff +/* E255B4 802B66E4 00621024 */ and $v0, $v1, $v0 +/* E255B8 802B66E8 3C030020 */ lui $v1, 0x20 +/* E255BC 802B66EC 00431025 */ or $v0, $v0, $v1 +/* E255C0 802B66F0 AE220000 */ sw $v0, ($s1) +/* E255C4 802B66F4 AC800018 */ sw $zero, 0x18($a0) +/* E255C8 802B66F8 A22000B6 */ sb $zero, 0xb6($s1) +/* E255CC 802B66FC AE200054 */ sw $zero, 0x54($s1) +/* E255D0 802B6700 0C0AD8A9 */ jal func_802B62A4_E25174 +/* E255D4 802B6704 A62000BC */ sh $zero, 0xbc($s1) +/* E255D8 802B6708 8E030000 */ lw $v1, ($s0) +/* E255DC 802B670C 0040282D */ daddu $a1, $v0, $zero +/* E255E0 802B6710 AC650010 */ sw $a1, 0x10($v1) +/* E255E4 802B6714 3C038011 */ lui $v1, %hi(gPlayerData+0x1) +/* E255E8 802B6718 8063F291 */ lb $v1, %lo(gPlayerData+0x1)($v1) +/* E255EC 802B671C 24020002 */ addiu $v0, $zero, 2 +/* E255F0 802B6720 14620008 */ bne $v1, $v0, .L802B6744 +/* E255F4 802B6724 24020001 */ addiu $v0, $zero, 1 +/* E255F8 802B6728 24102117 */ addiu $s0, $zero, 0x2117 +/* E255FC 802B672C 3C040006 */ lui $a0, 6 +/* E25600 802B6730 04A10012 */ bgez $a1, .L802B677C +/* E25604 802B6734 3484001A */ ori $a0, $a0, 0x1a +/* E25608 802B6738 3C040006 */ lui $a0, 6 +/* E2560C 802B673C 080AD9DF */ j .L802B677C +/* E25610 802B6740 34840018 */ ori $a0, $a0, 0x18 +.L802B6744: +/* E25614 802B6744 14620008 */ bne $v1, $v0, .L802B6768 +/* E25618 802B6748 24102115 */ addiu $s0, $zero, 0x2115 +/* E2561C 802B674C 24102116 */ addiu $s0, $zero, 0x2116 +/* E25620 802B6750 3C040006 */ lui $a0, 6 +/* E25624 802B6754 04A10009 */ bgez $a1, .L802B677C +/* E25628 802B6758 34840016 */ ori $a0, $a0, 0x16 +/* E2562C 802B675C 3C040006 */ lui $a0, 6 +/* E25630 802B6760 080AD9DF */ j .L802B677C +/* E25634 802B6764 34840014 */ ori $a0, $a0, 0x14 +.L802B6768: +/* E25638 802B6768 3C040006 */ lui $a0, 6 +/* E2563C 802B676C 04A10003 */ bgez $a1, .L802B677C +/* E25640 802B6770 34840012 */ ori $a0, $a0, 0x12 +/* E25644 802B6774 3C040006 */ lui $a0, 6 +/* E25648 802B6778 34840010 */ ori $a0, $a0, 0x10 +.L802B677C: +/* E2564C 802B677C 0C037FBF */ jal func_800DFEFC +/* E25650 802B6780 00000000 */ nop +/* E25654 802B6784 0200202D */ daddu $a0, $s0, $zero +/* E25658 802B6788 0C052736 */ jal play_sound_at_player +/* E2565C 802B678C 0000282D */ daddu $a1, $zero, $zero +/* E25660 802B6790 3C02802B */ lui $v0, %hi(D_802B6DB0) +/* E25664 802B6794 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) +/* E25668 802B6798 AC40000C */ sw $zero, 0xc($v0) +/* E2566C 802B679C AC400014 */ sw $zero, 0x14($v0) +/* E25670 802B67A0 3C04FEFF */ lui $a0, 0xfeff +.L802B67A4: +/* E25674 802B67A4 3484FFFF */ ori $a0, $a0, 0xffff +/* E25678 802B67A8 8E220000 */ lw $v0, ($s1) +/* E2567C 802B67AC 3C03802B */ lui $v1, %hi(D_802B6DB0) +/* E25680 802B67B0 8C636DB0 */ lw $v1, %lo(D_802B6DB0)($v1) +/* E25684 802B67B4 00442024 */ and $a0, $v0, $a0 +/* E25688 802B67B8 AE240000 */ sw $a0, ($s1) +/* E2568C 802B67BC 8C620018 */ lw $v0, 0x18($v1) +/* E25690 802B67C0 28420003 */ slti $v0, $v0, 3 +/* E25694 802B67C4 10400007 */ beqz $v0, .L802B67E4 +/* E25698 802B67C8 3C020004 */ lui $v0, 4 +/* E2569C 802B67CC 00821024 */ and $v0, $a0, $v0 +/* E256A0 802B67D0 10400004 */ beqz $v0, .L802B67E4 +/* E256A4 802B67D4 3C022000 */ lui $v0, 0x2000 +/* E256A8 802B67D8 00821025 */ or $v0, $a0, $v0 +/* E256AC 802B67DC 080ADA03 */ j .L802B680C +/* E256B0 802B67E0 AE220000 */ sw $v0, ($s1) +.L802B67E4: +/* E256B4 802B67E4 3C04802B */ lui $a0, %hi(D_802B6DB0) +/* E256B8 802B67E8 8C846DB0 */ lw $a0, %lo(D_802B6DB0)($a0) +/* E256BC 802B67EC 8C830018 */ lw $v1, 0x18($a0) +/* E256C0 802B67F0 28620002 */ slti $v0, $v1, 2 +/* E256C4 802B67F4 10400003 */ beqz $v0, .L802B6804 +/* E256C8 802B67F8 24620001 */ addiu $v0, $v1, 1 +/* E256CC 802B67FC 080ADA03 */ j .L802B680C +/* E256D0 802B6800 AC820018 */ sw $v0, 0x18($a0) +.L802B6804: +/* E256D4 802B6804 0C0ADA08 */ jal func_802B6820_E256F0 +/* E256D8 802B6808 00000000 */ nop +.L802B680C: +/* E256DC 802B680C 8FBF0018 */ lw $ra, 0x18($sp) +/* E256E0 802B6810 8FB10014 */ lw $s1, 0x14($sp) +/* E256E4 802B6814 8FB00010 */ lw $s0, 0x10($sp) +/* E256E8 802B6818 03E00008 */ jr $ra +/* E256EC 802B681C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s b/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s new file mode 100644 index 0000000000..7140aa1c02 --- /dev/null +++ b/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s @@ -0,0 +1,387 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6820_E256F0 +/* E256F0 802B6820 27BDFF88 */ addiu $sp, $sp, -0x78 +/* E256F4 802B6824 AFB20040 */ sw $s2, 0x40($sp) +/* E256F8 802B6828 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* E256FC 802B682C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* E25700 802B6830 AFBF004C */ sw $ra, 0x4c($sp) +/* E25704 802B6834 AFB40048 */ sw $s4, 0x48($sp) +/* E25708 802B6838 AFB30044 */ sw $s3, 0x44($sp) +/* E2570C 802B683C AFB1003C */ sw $s1, 0x3c($sp) +/* E25710 802B6840 AFB00038 */ sw $s0, 0x38($sp) +/* E25714 802B6844 F7BC0070 */ sdc1 $f28, 0x70($sp) +/* E25718 802B6848 F7BA0068 */ sdc1 $f26, 0x68($sp) +/* E2571C 802B684C F7B80060 */ sdc1 $f24, 0x60($sp) +/* E25720 802B6850 F7B60058 */ sdc1 $f22, 0x58($sp) +/* E25724 802B6854 F7B40050 */ sdc1 $f20, 0x50($sp) +/* E25728 802B6858 3C148016 */ lui $s4, %hi(gCollisionStatus) +/* E2572C 802B685C 2694A550 */ addiu $s4, $s4, %lo(gCollisionStatus) +/* E25730 802B6860 0C0394D2 */ jal func_800E5348 +/* E25734 802B6864 00000000 */ nop +/* E25738 802B6868 8E4400A4 */ lw $a0, 0xa4($s2) +/* E2573C 802B686C 0C0AD800 */ jal func_802B6000_E24ED0 +/* E25740 802B6870 46000586 */ mov.s $f22, $f0 +/* E25744 802B6874 10400024 */ beqz $v0, .L802B6908 +/* E25748 802B6878 27A50020 */ addiu $a1, $sp, 0x20 +/* E2574C 802B687C 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E25750 802B6880 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E25754 802B6884 3C0142B4 */ lui $at, 0x42b4 +/* E25758 802B6888 4481A000 */ mtc1 $at, $f20 +/* E2575C 802B688C 00031080 */ sll $v0, $v1, 2 +/* E25760 802B6890 00431021 */ addu $v0, $v0, $v1 +/* E25764 802B6894 00021080 */ sll $v0, $v0, 2 +/* E25768 802B6898 00431023 */ subu $v0, $v0, $v1 +/* E2576C 802B689C 000218C0 */ sll $v1, $v0, 3 +/* E25770 802B68A0 00431021 */ addu $v0, $v0, $v1 +/* E25774 802B68A4 000210C0 */ sll $v0, $v0, 3 +/* E25778 802B68A8 4614B000 */ add.s $f0, $f22, $f20 +/* E2577C 802B68AC 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E25780 802B68B0 00220821 */ addu $at, $at, $v0 +/* E25784 802B68B4 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) +/* E25788 802B68B8 0C00A6C9 */ jal clamp_angle +/* E2578C 802B68BC 460C0301 */ sub.s $f12, $f0, $f12 +/* E25790 802B68C0 46000086 */ mov.s $f2, $f0 +/* E25794 802B68C4 4602A03E */ c.le.s $f20, $f2 +/* E25798 802B68C8 00000000 */ nop +/* E2579C 802B68CC 45000009 */ bc1f .L802B68F4 +/* E257A0 802B68D0 00000000 */ nop +/* E257A4 802B68D4 3C014387 */ lui $at, 0x4387 +/* E257A8 802B68D8 44810000 */ mtc1 $at, $f0 +/* E257AC 802B68DC 00000000 */ nop +/* E257B0 802B68E0 4600103C */ c.lt.s $f2, $f0 +/* E257B4 802B68E4 3C01C1F0 */ lui $at, 0xc1f0 +/* E257B8 802B68E8 44810000 */ mtc1 $at, $f0 +/* E257BC 802B68EC 45030005 */ bc1tl .L802B6904 +/* E257C0 802B68F0 4600B580 */ add.s $f22, $f22, $f0 +.L802B68F4: +/* E257C4 802B68F4 3C0141F0 */ lui $at, 0x41f0 +/* E257C8 802B68F8 44810000 */ mtc1 $at, $f0 +/* E257CC 802B68FC 00000000 */ nop +/* E257D0 802B6900 4600B580 */ add.s $f22, $f22, $f0 +.L802B6904: +/* E257D4 802B6904 27A50020 */ addiu $a1, $sp, 0x20 +.L802B6908: +/* E257D8 802B6908 3C0140C9 */ lui $at, 0x40c9 +/* E257DC 802B690C 34210FD0 */ ori $at, $at, 0xfd0 +/* E257E0 802B6910 44816000 */ mtc1 $at, $f12 +/* E257E4 802B6914 27A60024 */ addiu $a2, $sp, 0x24 +/* E257E8 802B6918 460CB302 */ mul.s $f12, $f22, $f12 +/* E257EC 802B691C 00000000 */ nop +/* E257F0 802B6920 24110001 */ addiu $s1, $zero, 1 +/* E257F4 802B6924 27B30030 */ addiu $s3, $sp, 0x30 +/* E257F8 802B6928 3C0143B4 */ lui $at, 0x43b4 +/* E257FC 802B692C 44810000 */ mtc1 $at, $f0 +/* E25800 802B6930 3C014080 */ lui $at, 0x4080 +/* E25804 802B6934 4481A000 */ mtc1 $at, $f20 +/* E25808 802B6938 0C00A82D */ jal sin_cos_rad +/* E2580C 802B693C 46006303 */ div.s $f12, $f12, $f0 +/* E25810 802B6940 C65C0028 */ lwc1 $f28, 0x28($s2) +/* E25814 802B6944 C65A002C */ lwc1 $f26, 0x2c($s2) +/* E25818 802B6948 C6580030 */ lwc1 $f24, 0x30($s2) +.L802B694C: +/* E2581C 802B694C C7A40020 */ lwc1 $f4, 0x20($sp) +/* E25820 802B6950 44910000 */ mtc1 $s1, $f0 +/* E25824 802B6954 00000000 */ nop +/* E25828 802B6958 46800020 */ cvt.s.w $f0, $f0 +/* E2582C 802B695C 46002102 */ mul.s $f4, $f4, $f0 +/* E25830 802B6960 00000000 */ nop +/* E25834 802B6964 C7A20024 */ lwc1 $f2, 0x24($sp) +/* E25838 802B6968 46001082 */ mul.s $f2, $f2, $f0 +/* E2583C 802B696C 00000000 */ nop +/* E25840 802B6970 24040003 */ addiu $a0, $zero, 3 +/* E25844 802B6974 0240282D */ daddu $a1, $s2, $zero +/* E25848 802B6978 4604E100 */ add.s $f4, $f28, $f4 +/* E2584C 802B697C 27A60028 */ addiu $a2, $sp, 0x28 +/* E25850 802B6980 27A7002C */ addiu $a3, $sp, 0x2c +/* E25854 802B6984 4602C081 */ sub.s $f2, $f24, $f2 +/* E25858 802B6988 E7BA002C */ swc1 $f26, 0x2c($sp) +/* E2585C 802B698C E7A40028 */ swc1 $f4, 0x28($sp) +/* E25860 802B6990 E7A20030 */ swc1 $f2, 0x30($sp) +/* E25864 802B6994 AFB30010 */ sw $s3, 0x10($sp) +/* E25868 802B6998 E7B40014 */ swc1 $f20, 0x14($sp) +/* E2586C 802B699C 0C037B01 */ jal do_lateral_collision +/* E25870 802B69A0 E7B60018 */ swc1 $f22, 0x18($sp) +/* E25874 802B69A4 3C03802B */ lui $v1, %hi(D_802B6DB0) +/* E25878 802B69A8 8C636DB0 */ lw $v1, %lo(D_802B6DB0)($v1) +/* E2587C 802B69AC 8C630014 */ lw $v1, 0x14($v1) +/* E25880 802B69B0 14600009 */ bnez $v1, .L802B69D8 +/* E25884 802B69B4 0040802D */ daddu $s0, $v0, $zero +/* E25888 802B69B8 06000009 */ bltz $s0, .L802B69E0 +/* E2588C 802B69BC A6900014 */ sh $s0, 0x14($s4) +/* E25890 802B69C0 32024000 */ andi $v0, $s0, 0x4000 +/* E25894 802B69C4 10400004 */ beqz $v0, .L802B69D8 +/* E25898 802B69C8 00000000 */ nop +/* E2589C 802B69CC 0C04417A */ jal get_entity_by_index +/* E258A0 802B69D0 0200202D */ daddu $a0, $s0, $zero +/* E258A4 802B69D4 A0400007 */ sb $zero, 7($v0) +.L802B69D8: +/* E258A8 802B69D8 06010005 */ bgez $s0, .L802B69F0 +/* E258AC 802B69DC 2A220010 */ slti $v0, $s1, 0x10 +.L802B69E0: +/* E258B0 802B69E0 26310001 */ addiu $s1, $s1, 1 +/* E258B4 802B69E4 2A220010 */ slti $v0, $s1, 0x10 +/* E258B8 802B69E8 1440FFD8 */ bnez $v0, .L802B694C +/* E258BC 802B69EC 00000000 */ nop +.L802B69F0: +/* E258C0 802B69F0 14400062 */ bnez $v0, .L802B6B7C +/* E258C4 802B69F4 00000000 */ nop +/* E258C8 802B69F8 0C0394D2 */ jal func_800E5348 +/* E258CC 802B69FC 00000000 */ nop +/* E258D0 802B6A00 8E4400A4 */ lw $a0, 0xa4($s2) +/* E258D4 802B6A04 0C0AD800 */ jal func_802B6000_E24ED0 +/* E258D8 802B6A08 46000586 */ mov.s $f22, $f0 +/* E258DC 802B6A0C 14400024 */ bnez $v0, .L802B6AA0 +/* E258E0 802B6A10 27A50020 */ addiu $a1, $sp, 0x20 +/* E258E4 802B6A14 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E258E8 802B6A18 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E258EC 802B6A1C 3C0142B4 */ lui $at, 0x42b4 +/* E258F0 802B6A20 4481A000 */ mtc1 $at, $f20 +/* E258F4 802B6A24 00031080 */ sll $v0, $v1, 2 +/* E258F8 802B6A28 00431021 */ addu $v0, $v0, $v1 +/* E258FC 802B6A2C 00021080 */ sll $v0, $v0, 2 +/* E25900 802B6A30 00431023 */ subu $v0, $v0, $v1 +/* E25904 802B6A34 000218C0 */ sll $v1, $v0, 3 +/* E25908 802B6A38 00431021 */ addu $v0, $v0, $v1 +/* E2590C 802B6A3C 000210C0 */ sll $v0, $v0, 3 +/* E25910 802B6A40 4614B000 */ add.s $f0, $f22, $f20 +/* E25914 802B6A44 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E25918 802B6A48 00220821 */ addu $at, $at, $v0 +/* E2591C 802B6A4C C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) +/* E25920 802B6A50 0C00A6C9 */ jal clamp_angle +/* E25924 802B6A54 460C0301 */ sub.s $f12, $f0, $f12 +/* E25928 802B6A58 46000086 */ mov.s $f2, $f0 +/* E2592C 802B6A5C 4602A03E */ c.le.s $f20, $f2 +/* E25930 802B6A60 00000000 */ nop +/* E25934 802B6A64 45000009 */ bc1f .L802B6A8C +/* E25938 802B6A68 00000000 */ nop +/* E2593C 802B6A6C 3C014387 */ lui $at, 0x4387 +/* E25940 802B6A70 44810000 */ mtc1 $at, $f0 +/* E25944 802B6A74 00000000 */ nop +/* E25948 802B6A78 4600103C */ c.lt.s $f2, $f0 +/* E2594C 802B6A7C 3C014170 */ lui $at, 0x4170 +/* E25950 802B6A80 44810000 */ mtc1 $at, $f0 +/* E25954 802B6A84 45030005 */ bc1tl .L802B6A9C +/* E25958 802B6A88 4600B580 */ add.s $f22, $f22, $f0 +.L802B6A8C: +/* E2595C 802B6A8C 3C01C170 */ lui $at, 0xc170 +/* E25960 802B6A90 44810000 */ mtc1 $at, $f0 +/* E25964 802B6A94 00000000 */ nop +/* E25968 802B6A98 4600B580 */ add.s $f22, $f22, $f0 +.L802B6A9C: +/* E2596C 802B6A9C 27A50020 */ addiu $a1, $sp, 0x20 +.L802B6AA0: +/* E25970 802B6AA0 3C0140C9 */ lui $at, 0x40c9 +/* E25974 802B6AA4 34210FD0 */ ori $at, $at, 0xfd0 +/* E25978 802B6AA8 44816000 */ mtc1 $at, $f12 +/* E2597C 802B6AAC 27A60024 */ addiu $a2, $sp, 0x24 +/* E25980 802B6AB0 460CB302 */ mul.s $f12, $f22, $f12 +/* E25984 802B6AB4 00000000 */ nop +/* E25988 802B6AB8 24110001 */ addiu $s1, $zero, 1 +/* E2598C 802B6ABC 27B30030 */ addiu $s3, $sp, 0x30 +/* E25990 802B6AC0 3C0143B4 */ lui $at, 0x43b4 +/* E25994 802B6AC4 44810000 */ mtc1 $at, $f0 +/* E25998 802B6AC8 3C014080 */ lui $at, 0x4080 +/* E2599C 802B6ACC 4481A000 */ mtc1 $at, $f20 +/* E259A0 802B6AD0 0C00A82D */ jal sin_cos_rad +/* E259A4 802B6AD4 46006303 */ div.s $f12, $f12, $f0 +.L802B6AD8: +/* E259A8 802B6AD8 C7A40020 */ lwc1 $f4, 0x20($sp) +/* E259AC 802B6ADC 44910000 */ mtc1 $s1, $f0 +/* E259B0 802B6AE0 00000000 */ nop +/* E259B4 802B6AE4 46800020 */ cvt.s.w $f0, $f0 +/* E259B8 802B6AE8 46002102 */ mul.s $f4, $f4, $f0 +/* E259BC 802B6AEC 00000000 */ nop +/* E259C0 802B6AF0 C7A20024 */ lwc1 $f2, 0x24($sp) +/* E259C4 802B6AF4 46001082 */ mul.s $f2, $f2, $f0 +/* E259C8 802B6AF8 00000000 */ nop +/* E259CC 802B6AFC 24040003 */ addiu $a0, $zero, 3 +/* E259D0 802B6B00 0240282D */ daddu $a1, $s2, $zero +/* E259D4 802B6B04 4604E100 */ add.s $f4, $f28, $f4 +/* E259D8 802B6B08 27A60028 */ addiu $a2, $sp, 0x28 +/* E259DC 802B6B0C 27A7002C */ addiu $a3, $sp, 0x2c +/* E259E0 802B6B10 4602C081 */ sub.s $f2, $f24, $f2 +/* E259E4 802B6B14 E7BA002C */ swc1 $f26, 0x2c($sp) +/* E259E8 802B6B18 E7A40028 */ swc1 $f4, 0x28($sp) +/* E259EC 802B6B1C E7A20030 */ swc1 $f2, 0x30($sp) +/* E259F0 802B6B20 AFB30010 */ sw $s3, 0x10($sp) +/* E259F4 802B6B24 E7B40014 */ swc1 $f20, 0x14($sp) +/* E259F8 802B6B28 0C037B01 */ jal do_lateral_collision +/* E259FC 802B6B2C E7B60018 */ swc1 $f22, 0x18($sp) +/* E25A00 802B6B30 3C03802B */ lui $v1, %hi(D_802B6DB0) +/* E25A04 802B6B34 8C636DB0 */ lw $v1, %lo(D_802B6DB0)($v1) +/* E25A08 802B6B38 8C630014 */ lw $v1, 0x14($v1) +/* E25A0C 802B6B3C 14600009 */ bnez $v1, .L802B6B64 +/* E25A10 802B6B40 0040802D */ daddu $s0, $v0, $zero +/* E25A14 802B6B44 06000009 */ bltz $s0, .L802B6B6C +/* E25A18 802B6B48 A6900014 */ sh $s0, 0x14($s4) +/* E25A1C 802B6B4C 32024000 */ andi $v0, $s0, 0x4000 +/* E25A20 802B6B50 10400004 */ beqz $v0, .L802B6B64 +/* E25A24 802B6B54 00000000 */ nop +/* E25A28 802B6B58 0C04417A */ jal get_entity_by_index +/* E25A2C 802B6B5C 0200202D */ daddu $a0, $s0, $zero +/* E25A30 802B6B60 A0400007 */ sb $zero, 7($v0) +.L802B6B64: +/* E25A34 802B6B64 06010005 */ bgez $s0, .L802B6B7C +/* E25A38 802B6B68 00000000 */ nop +.L802B6B6C: +/* E25A3C 802B6B6C 26310001 */ addiu $s1, $s1, 1 +/* E25A40 802B6B70 2A220010 */ slti $v0, $s1, 0x10 +/* E25A44 802B6B74 1440FFD8 */ bnez $v0, .L802B6AD8 +/* E25A48 802B6B78 00000000 */ nop +.L802B6B7C: +/* E25A4C 802B6B7C 3C02802B */ lui $v0, %hi(D_802B6DB0) +/* E25A50 802B6B80 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) +/* E25A54 802B6B84 8C440018 */ lw $a0, 0x18($v0) +/* E25A58 802B6B88 24020002 */ addiu $v0, $zero, 2 +/* E25A5C 802B6B8C 14820032 */ bne $a0, $v0, .L802B6C58 +/* E25A60 802B6B90 00000000 */ nop +/* E25A64 802B6B94 3C038011 */ lui $v1, %hi(gPlayerData+0x1) +/* E25A68 802B6B98 8063F291 */ lb $v1, %lo(gPlayerData+0x1)($v1) +/* E25A6C 802B6B9C 14640003 */ bne $v1, $a0, .L802B6BAC +/* E25A70 802B6BA0 24020001 */ addiu $v0, $zero, 1 +/* E25A74 802B6BA4 080ADAEE */ j .L802B6BB8 +/* E25A78 802B6BA8 24042117 */ addiu $a0, $zero, 0x2117 +.L802B6BAC: +/* E25A7C 802B6BAC 14620002 */ bne $v1, $v0, .L802B6BB8 +/* E25A80 802B6BB0 24042115 */ addiu $a0, $zero, 0x2115 +/* E25A84 802B6BB4 24042116 */ addiu $a0, $zero, 0x2116 +.L802B6BB8: +/* E25A88 802B6BB8 0C052736 */ jal play_sound_at_player +/* E25A8C 802B6BBC 0000282D */ daddu $a1, $zero, $zero +/* E25A90 802B6BC0 3C02802B */ lui $v0, %hi(D_802B6DB0) +/* E25A94 802B6BC4 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) +/* E25A98 802B6BC8 0C0AD812 */ jal func_802B6048_E24F18 +/* E25A9C 802B6BCC 8C440010 */ lw $a0, 0x10($v0) +/* E25AA0 802B6BD0 86840014 */ lh $a0, 0x14($s4) +/* E25AA4 802B6BD4 96820014 */ lhu $v0, 0x14($s4) +/* E25AA8 802B6BD8 04800007 */ bltz $a0, .L802B6BF8 +/* E25AAC 802B6BDC 30424000 */ andi $v0, $v0, 0x4000 +/* E25AB0 802B6BE0 10400005 */ beqz $v0, .L802B6BF8 +/* E25AB4 802B6BE4 00000000 */ nop +/* E25AB8 802B6BE8 0C04417A */ jal get_entity_by_index +/* E25ABC 802B6BEC 00000000 */ nop +/* E25AC0 802B6BF0 080ADB03 */ j .L802B6C0C +/* E25AC4 802B6BF4 A0400007 */ sb $zero, 7($v0) +.L802B6BF8: +/* E25AC8 802B6BF8 3C02802B */ lui $v0, %hi(D_802B6DB0) +/* E25ACC 802B6BFC 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) +/* E25AD0 802B6C00 8C420010 */ lw $v0, 0x10($v0) +/* E25AD4 802B6C04 04410014 */ bgez $v0, .L802B6C58 +/* E25AD8 802B6C08 00000000 */ nop +.L802B6C0C: +/* E25ADC 802B6C0C 8E420000 */ lw $v0, ($s2) +/* E25AE0 802B6C10 3C030100 */ lui $v1, 0x100 +/* E25AE4 802B6C14 00431025 */ or $v0, $v0, $v1 +/* E25AE8 802B6C18 AE420000 */ sw $v0, ($s2) +/* E25AEC 802B6C1C 3C02802B */ lui $v0, %hi(D_802B6DB0) +/* E25AF0 802B6C20 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) +/* E25AF4 802B6C24 8C420010 */ lw $v0, 0x10($v0) +/* E25AF8 802B6C28 0441000B */ bgez $v0, .L802B6C58 +/* E25AFC 802B6C2C 00000000 */ nop +/* E25B00 802B6C30 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* E25B04 802B6C34 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) +/* E25B08 802B6C38 28420002 */ slti $v0, $v0, 2 +/* E25B0C 802B6C3C 14400006 */ bnez $v0, .L802B6C58 +/* E25B10 802B6C40 24030001 */ addiu $v1, $zero, 1 +/* E25B14 802B6C44 3C028016 */ lui $v0, %hi(D_8015A578) +/* E25B18 802B6C48 2442A578 */ addiu $v0, $v0, %lo(D_8015A578) +/* E25B1C 802B6C4C C640002C */ lwc1 $f0, 0x2c($s2) +/* E25B20 802B6C50 A0430000 */ sb $v1, ($v0) +/* E25B24 802B6C54 E4400008 */ swc1 $f0, 8($v0) +.L802B6C58: +/* E25B28 802B6C58 824200B6 */ lb $v0, 0xb6($s2) +/* E25B2C 802B6C5C 14400009 */ bnez $v0, .L802B6C84 +/* E25B30 802B6C60 924300B6 */ lbu $v1, 0xb6($s2) +/* E25B34 802B6C64 06000007 */ bltz $s0, .L802B6C84 +/* E25B38 802B6C68 00000000 */ nop +/* E25B3C 802B6C6C 3C02802B */ lui $v0, %hi(D_802B6DB0) +/* E25B40 802B6C70 8C426DB0 */ lw $v0, %lo(D_802B6DB0)($v0) +/* E25B44 802B6C74 8C420014 */ lw $v0, 0x14($v0) +/* E25B48 802B6C78 14400002 */ bnez $v0, .L802B6C84 +/* E25B4C 802B6C7C 24620001 */ addiu $v0, $v1, 1 +/* E25B50 802B6C80 A24200B6 */ sb $v0, 0xb6($s2) +.L802B6C84: +/* E25B54 802B6C84 824300B6 */ lb $v1, 0xb6($s2) +/* E25B58 802B6C88 24020001 */ addiu $v0, $zero, 1 +/* E25B5C 802B6C8C 14620004 */ bne $v1, $v0, .L802B6CA0 +/* E25B60 802B6C90 00000000 */ nop +/* E25B64 802B6C94 06010002 */ bgez $s0, .L802B6CA0 +/* E25B68 802B6C98 24020002 */ addiu $v0, $zero, 2 +/* E25B6C 802B6C9C A24200B6 */ sb $v0, 0xb6($s2) +.L802B6CA0: +/* E25B70 802B6CA0 3C05802B */ lui $a1, %hi(D_802B6DB0) +/* E25B74 802B6CA4 24A56DB0 */ addiu $a1, $a1, %lo(D_802B6DB0) +/* E25B78 802B6CA8 8CA30000 */ lw $v1, ($a1) +/* E25B7C 802B6CAC 8C620018 */ lw $v0, 0x18($v1) +/* E25B80 802B6CB0 24420001 */ addiu $v0, $v0, 1 +/* E25B84 802B6CB4 06000003 */ bltz $s0, .L802B6CC4 +/* E25B88 802B6CB8 AC620018 */ sw $v0, 0x18($v1) +/* E25B8C 802B6CBC 24020001 */ addiu $v0, $zero, 1 +/* E25B90 802B6CC0 AC620014 */ sw $v0, 0x14($v1) +.L802B6CC4: +/* E25B94 802B6CC4 8CA20000 */ lw $v0, ($a1) +/* E25B98 802B6CC8 8C430018 */ lw $v1, 0x18($v0) +/* E25B9C 802B6CCC 24020006 */ addiu $v0, $zero, 6 +/* E25BA0 802B6CD0 14620005 */ bne $v1, $v0, .L802B6CE8 +/* E25BA4 802B6CD4 3C03FFDF */ lui $v1, 0xffdf +/* E25BA8 802B6CD8 8E420000 */ lw $v0, ($s2) +/* E25BAC 802B6CDC 3463FFFF */ ori $v1, $v1, 0xffff +/* E25BB0 802B6CE0 00431024 */ and $v0, $v0, $v1 +/* E25BB4 802B6CE4 AE420000 */ sw $v0, ($s2) +.L802B6CE8: +/* E25BB8 802B6CE8 964400BC */ lhu $a0, 0xbc($s2) +/* E25BBC 802B6CEC 24020001 */ addiu $v0, $zero, 1 +/* E25BC0 802B6CF0 14820020 */ bne $a0, $v0, .L802B6D74 +/* E25BC4 802B6CF4 00000000 */ nop +/* E25BC8 802B6CF8 8CA30000 */ lw $v1, ($a1) +/* E25BCC 802B6CFC 8C620018 */ lw $v0, 0x18($v1) +/* E25BD0 802B6D00 28420007 */ slti $v0, $v0, 7 +/* E25BD4 802B6D04 14400005 */ bnez $v0, .L802B6D1C +/* E25BD8 802B6D08 00000000 */ nop +/* E25BDC 802B6D0C 8E4200E0 */ lw $v0, 0xe0($s2) +/* E25BE0 802B6D10 30424000 */ andi $v0, $v0, 0x4000 +/* E25BE4 802B6D14 54400001 */ bnel $v0, $zero, .L802B6D1C +/* E25BE8 802B6D18 AC64001C */ sw $a0, 0x1c($v1) +.L802B6D1C: +/* E25BEC 802B6D1C 3C03802B */ lui $v1, %hi(D_802B6DB0) +/* E25BF0 802B6D20 8C636DB0 */ lw $v1, %lo(D_802B6DB0)($v1) +/* E25BF4 802B6D24 8C62001C */ lw $v0, 0x1c($v1) +/* E25BF8 802B6D28 14400006 */ bnez $v0, .L802B6D44 +/* E25BFC 802B6D2C AC600014 */ sw $zero, 0x14($v1) +/* E25C00 802B6D30 8C630018 */ lw $v1, 0x18($v1) +/* E25C04 802B6D34 2402000A */ addiu $v0, $zero, 0xa +/* E25C08 802B6D38 0043102A */ slt $v0, $v0, $v1 +/* E25C0C 802B6D3C 10400009 */ beqz $v0, .L802B6D64 +/* E25C10 802B6D40 3C03FFDF */ lui $v1, 0xffdf +.L802B6D44: +/* E25C14 802B6D44 3C03FEFF */ lui $v1, 0xfeff +/* E25C18 802B6D48 3463FFFF */ ori $v1, $v1, 0xffff +/* E25C1C 802B6D4C 8E420000 */ lw $v0, ($s2) +/* E25C20 802B6D50 0000202D */ daddu $a0, $zero, $zero +/* E25C24 802B6D54 00431024 */ and $v0, $v0, $v1 +/* E25C28 802B6D58 0C039769 */ jal set_action_state +/* E25C2C 802B6D5C AE420000 */ sw $v0, ($s2) +/* E25C30 802B6D60 3C03FFDF */ lui $v1, 0xffdf +.L802B6D64: +/* E25C34 802B6D64 8E420000 */ lw $v0, ($s2) +/* E25C38 802B6D68 3463FFFF */ ori $v1, $v1, 0xffff +/* E25C3C 802B6D6C 00431024 */ and $v0, $v0, $v1 +/* E25C40 802B6D70 AE420000 */ sw $v0, ($s2) +.L802B6D74: +/* E25C44 802B6D74 8FBF004C */ lw $ra, 0x4c($sp) +/* E25C48 802B6D78 8FB40048 */ lw $s4, 0x48($sp) +/* E25C4C 802B6D7C 8FB30044 */ lw $s3, 0x44($sp) +/* E25C50 802B6D80 8FB20040 */ lw $s2, 0x40($sp) +/* E25C54 802B6D84 8FB1003C */ lw $s1, 0x3c($sp) +/* E25C58 802B6D88 8FB00038 */ lw $s0, 0x38($sp) +/* E25C5C 802B6D8C D7BC0070 */ ldc1 $f28, 0x70($sp) +/* E25C60 802B6D90 D7BA0068 */ ldc1 $f26, 0x68($sp) +/* E25C64 802B6D94 D7B80060 */ ldc1 $f24, 0x60($sp) +/* E25C68 802B6D98 D7B60058 */ ldc1 $f22, 0x58($sp) +/* E25C6C 802B6D9C D7B40050 */ ldc1 $f20, 0x50($sp) +/* E25C70 802B6DA0 03E00008 */ jr $ra +/* E25C74 802B6DA4 27BD0078 */ addiu $sp, $sp, 0x78 +/* E25C78 802B6DA8 00000000 */ nop +/* E25C7C 802B6DAC 00000000 */ nop diff --git a/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s b/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s new file mode 100644 index 0000000000..bac32c2463 --- /dev/null +++ b/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s @@ -0,0 +1,663 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E25D60 +/* E25D60 802B6000 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* E25D64 802B6004 AFB5002C */ sw $s5, 0x2c($sp) +/* E25D68 802B6008 AFB1001C */ sw $s1, 0x1c($sp) +/* E25D6C 802B600C 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E25D70 802B6010 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E25D74 802B6014 AFBF0030 */ sw $ra, 0x30($sp) +/* E25D78 802B6018 AFB40028 */ sw $s4, 0x28($sp) +/* E25D7C 802B601C AFB30024 */ sw $s3, 0x24($sp) +/* E25D80 802B6020 AFB20020 */ sw $s2, 0x20($sp) +/* E25D84 802B6024 AFB00018 */ sw $s0, 0x18($sp) +/* E25D88 802B6028 F7B80048 */ sdc1 $f24, 0x48($sp) +/* E25D8C 802B602C F7B60040 */ sdc1 $f22, 0x40($sp) +/* E25D90 802B6030 F7B40038 */ sdc1 $f20, 0x38($sp) +/* E25D94 802B6034 8E220000 */ lw $v0, ($s1) +/* E25D98 802B6038 3C108011 */ lui $s0, %hi(D_8010F250) +/* E25D9C 802B603C 2610F250 */ addiu $s0, $s0, %lo(D_8010F250) +/* E25DA0 802B6040 0441009D */ bgez $v0, .L802B62B8 +/* E25DA4 802B6044 0000A82D */ daddu $s5, $zero, $zero +/* E25DA8 802B6048 3C037FF7 */ lui $v1, 0x7ff7 +/* E25DAC 802B604C 3463FFFF */ ori $v1, $v1, 0xffff +/* E25DB0 802B6050 3C05FFFB */ lui $a1, 0xfffb +/* E25DB4 802B6054 34A5FFFF */ ori $a1, $a1, 0xffff +/* E25DB8 802B6058 24150001 */ addiu $s5, $zero, 1 +/* E25DBC 802B605C 24040028 */ addiu $a0, $zero, 0x28 +/* E25DC0 802B6060 00431824 */ and $v1, $v0, $v1 +/* E25DC4 802B6064 3C020002 */ lui $v0, 2 +/* E25DC8 802B6068 AE230000 */ sw $v1, ($s1) +/* E25DCC 802B606C 00621825 */ or $v1, $v1, $v0 +/* E25DD0 802B6070 24020019 */ addiu $v0, $zero, 0x19 +/* E25DD4 802B6074 AE230000 */ sw $v1, ($s1) +/* E25DD8 802B6078 A6200008 */ sh $zero, 8($s1) +/* E25DDC 802B607C A22000B6 */ sb $zero, 0xb6($s1) +/* E25DE0 802B6080 A2000000 */ sb $zero, ($s0) +/* E25DE4 802B6084 A2000001 */ sb $zero, 1($s0) +/* E25DE8 802B6088 AE000010 */ sw $zero, 0x10($s0) +/* E25DEC 802B608C AE000014 */ sw $zero, 0x14($s0) +/* E25DF0 802B6090 AE000018 */ sw $zero, 0x18($s0) +/* E25DF4 802B6094 A2000002 */ sb $zero, 2($s0) +/* E25DF8 802B6098 AE000008 */ sw $zero, 8($s0) +/* E25DFC 802B609C AE00000C */ sw $zero, 0xc($s0) +/* E25E00 802B60A0 AE000030 */ sw $zero, 0x30($s0) +/* E25E04 802B60A4 AE2000D8 */ sw $zero, 0xd8($s1) +/* E25E08 802B60A8 A602002C */ sh $v0, 0x2c($s0) +/* E25E0C 802B60AC 8E230004 */ lw $v1, 4($s1) +/* E25E10 802B60B0 2402000F */ addiu $v0, $zero, 0xf +/* E25E14 802B60B4 A602002E */ sh $v0, 0x2e($s0) +/* E25E18 802B60B8 3C020001 */ lui $v0, 1 +/* E25E1C 802B60BC 3C014220 */ lui $at, 0x4220 +/* E25E20 802B60C0 4481A000 */ mtc1 $at, $f20 +/* E25E24 802B60C4 3C014000 */ lui $at, 0x4000 +/* E25E28 802B60C8 44810000 */ mtc1 $at, $f0 +/* E25E2C 802B60CC 3C013F00 */ lui $at, 0x3f00 +/* E25E30 802B60D0 44811000 */ mtc1 $at, $f2 +/* E25E34 802B60D4 00651824 */ and $v1, $v1, $a1 +/* E25E38 802B60D8 9205002D */ lbu $a1, 0x2d($s0) +/* E25E3C 802B60DC 00621825 */ or $v1, $v1, $v0 +/* E25E40 802B60E0 AE230004 */ sw $v1, 4($s1) +/* E25E44 802B60E4 E6140020 */ swc1 $f20, 0x20($s0) +/* E25E48 802B60E8 E6000024 */ swc1 $f0, 0x24($s0) +/* E25E4C 802B60EC E6020028 */ swc1 $f2, 0x28($s0) +/* E25E50 802B60F0 0C03A752 */ jal is_ability_active +/* E25E54 802B60F4 A2050003 */ sb $a1, 3($s0) +/* E25E58 802B60F8 0002102B */ sltu $v0, $zero, $v0 +/* E25E5C 802B60FC 00029080 */ sll $s2, $v0, 2 +/* E25E60 802B6100 0C03A752 */ jal is_ability_active +/* E25E64 802B6104 2404002D */ addiu $a0, $zero, 0x2d +/* E25E68 802B6108 54400001 */ bnel $v0, $zero, .L802B6110 +/* E25E6C 802B610C 36520002 */ ori $s2, $s2, 2 +.L802B6110: +/* E25E70 802B6110 0C03A752 */ jal is_ability_active +/* E25E74 802B6114 24040027 */ addiu $a0, $zero, 0x27 +/* E25E78 802B6118 10400010 */ beqz $v0, .L802B615C +/* E25E7C 802B611C 2402001E */ addiu $v0, $zero, 0x1e +/* E25E80 802B6120 36520001 */ ori $s2, $s2, 1 +/* E25E84 802B6124 A602002C */ sh $v0, 0x2c($s0) +/* E25E88 802B6128 9203002D */ lbu $v1, 0x2d($s0) +/* E25E8C 802B612C 3C01402C */ lui $at, 0x402c +/* E25E90 802B6130 3421CCCD */ ori $at, $at, 0xcccd +/* E25E94 802B6134 44810000 */ mtc1 $at, $f0 +/* E25E98 802B6138 3C013F66 */ lui $at, 0x3f66 +/* E25E9C 802B613C 34216666 */ ori $at, $at, 0x6666 +/* E25EA0 802B6140 44811000 */ mtc1 $at, $f2 +/* E25EA4 802B6144 24020014 */ addiu $v0, $zero, 0x14 +/* E25EA8 802B6148 E6140020 */ swc1 $f20, 0x20($s0) +/* E25EAC 802B614C A602002E */ sh $v0, 0x2e($s0) +/* E25EB0 802B6150 A2030003 */ sb $v1, 3($s0) +/* E25EB4 802B6154 E6000024 */ swc1 $f0, 0x24($s0) +/* E25EB8 802B6158 E6020028 */ swc1 $f2, 0x28($s0) +.L802B615C: +/* E25EBC 802B615C 2414FFFF */ addiu $s4, $zero, -1 +/* E25EC0 802B6160 3C130001 */ lui $s3, 1 +/* E25EC4 802B6164 12400011 */ beqz $s2, .L802B61AC +/* E25EC8 802B6168 36730010 */ ori $s3, $s3, 0x10 +/* E25ECC 802B616C 32420004 */ andi $v0, $s2, 4 +/* E25ED0 802B6170 10400005 */ beqz $v0, .L802B6188 +/* E25ED4 802B6174 32420002 */ andi $v0, $s2, 2 +/* E25ED8 802B6178 24140002 */ addiu $s4, $zero, 2 +/* E25EDC 802B617C 3C130001 */ lui $s3, 1 +/* E25EE0 802B6180 080AD86B */ j .L802B61AC +/* E25EE4 802B6184 36730012 */ ori $s3, $s3, 0x12 +.L802B6188: +/* E25EE8 802B6188 10400003 */ beqz $v0, .L802B6198 +/* E25EEC 802B618C 32420001 */ andi $v0, $s2, 1 +/* E25EF0 802B6190 080AD86B */ j .L802B61AC +/* E25EF4 802B6194 24140004 */ addiu $s4, $zero, 4 +.L802B6198: +/* E25EF8 802B6198 10400005 */ beqz $v0, .L802B61B0 +/* E25EFC 802B619C 24022111 */ addiu $v0, $zero, 0x2111 +/* E25F00 802B61A0 0000A02D */ daddu $s4, $zero, $zero +/* E25F04 802B61A4 3C130001 */ lui $s3, 1 +/* E25F08 802B61A8 36730011 */ ori $s3, $s3, 0x11 +.L802B61AC: +/* E25F0C 802B61AC 24022111 */ addiu $v0, $zero, 0x2111 +.L802B61B0: +/* E25F10 802B61B0 AE020030 */ sw $v0, 0x30($s0) +/* E25F14 802B61B4 2402FFFD */ addiu $v0, $zero, -3 +/* E25F18 802B61B8 02421824 */ and $v1, $s2, $v0 +/* E25F1C 802B61BC 24020004 */ addiu $v0, $zero, 4 +/* E25F20 802B61C0 14620004 */ bne $v1, $v0, .L802B61D4 +/* E25F24 802B61C4 24020001 */ addiu $v0, $zero, 1 +/* E25F28 802B61C8 24022113 */ addiu $v0, $zero, 0x2113 +/* E25F2C 802B61CC AE020030 */ sw $v0, 0x30($s0) +/* E25F30 802B61D0 24020001 */ addiu $v0, $zero, 1 +.L802B61D4: +/* E25F34 802B61D4 14620004 */ bne $v1, $v0, .L802B61E8 +/* E25F38 802B61D8 24020005 */ addiu $v0, $zero, 5 +/* E25F3C 802B61DC 24022112 */ addiu $v0, $zero, 0x2112 +/* E25F40 802B61E0 AE020030 */ sw $v0, 0x30($s0) +/* E25F44 802B61E4 24020005 */ addiu $v0, $zero, 5 +.L802B61E8: +/* E25F48 802B61E8 14620002 */ bne $v1, $v0, .L802B61F4 +/* E25F4C 802B61EC 24022114 */ addiu $v0, $zero, 0x2114 +/* E25F50 802B61F0 AE020030 */ sw $v0, 0x30($s0) +.L802B61F4: +/* E25F54 802B61F4 8E040030 */ lw $a0, 0x30($s0) +/* E25F58 802B61F8 0C052736 */ jal play_sound_at_player +/* E25F5C 802B61FC 0000282D */ daddu $a1, $zero, $zero +/* E25F60 802B6200 0C037FDE */ jal func_800DFF78 +/* E25F64 802B6204 0260202D */ daddu $a0, $s3, $zero +/* E25F68 802B6208 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E25F6C 802B620C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E25F70 802B6210 C6200080 */ lwc1 $f0, 0x80($s1) +/* E25F74 802B6214 00031080 */ sll $v0, $v1, 2 +/* E25F78 802B6218 00431021 */ addu $v0, $v0, $v1 +/* E25F7C 802B621C 00021080 */ sll $v0, $v0, 2 +/* E25F80 802B6220 00431023 */ subu $v0, $v0, $v1 +/* E25F84 802B6224 000218C0 */ sll $v1, $v0, 3 +/* E25F88 802B6228 00431021 */ addu $v0, $v0, $v1 +/* E25F8C 802B622C 000210C0 */ sll $v0, $v0, 3 +/* E25F90 802B6230 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E25F94 802B6234 00220821 */ addu $at, $at, $v0 +/* E25F98 802B6238 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) +/* E25F9C 802B623C 0C00A6C9 */ jal clamp_angle +/* E25FA0 802B6240 460C0301 */ sub.s $f12, $f0, $f12 +/* E25FA4 802B6244 3C014334 */ lui $at, 0x4334 +/* E25FA8 802B6248 44811000 */ mtc1 $at, $f2 +/* E25FAC 802B624C 00000000 */ nop +/* E25FB0 802B6250 4602003E */ c.le.s $f0, $f2 +/* E25FB4 802B6254 00000000 */ nop +/* E25FB8 802B6258 45020004 */ bc1fl .L802B626C +/* E25FBC 802B625C 26940001 */ addiu $s4, $s4, 1 +/* E25FC0 802B6260 C6000020 */ lwc1 $f0, 0x20($s0) +/* E25FC4 802B6264 080AD89E */ j .L802B6278 +/* E25FC8 802B6268 E62000D4 */ swc1 $f0, 0xd4($s1) +.L802B626C: +/* E25FCC 802B626C C6000020 */ lwc1 $f0, 0x20($s0) +/* E25FD0 802B6270 46000007 */ neg.s $f0, $f0 +/* E25FD4 802B6274 E62000D4 */ swc1 $f0, 0xd4($s1) +.L802B6278: +/* E25FD8 802B6278 12400006 */ beqz $s2, .L802B6294 +/* E25FDC 802B627C 0280202D */ daddu $a0, $s4, $zero +/* E25FE0 802B6280 0220282D */ daddu $a1, $s1, $zero +/* E25FE4 802B6284 3C063F80 */ lui $a2, 0x3f80 +/* E25FE8 802B6288 0C01C4B4 */ jal func_800712D0 +/* E25FEC 802B628C 240703E8 */ addiu $a3, $zero, 0x3e8 +/* E25FF0 802B6290 AE2200D8 */ sw $v0, 0xd8($s1) +.L802B6294: +/* E25FF4 802B6294 0C03963C */ jal func_800E58F0 +/* E25FF8 802B6298 00000000 */ nop +/* E25FFC 802B629C 27A40010 */ addiu $a0, $sp, 0x10 +/* E26000 802B62A0 0C0388C1 */ jal input_to_move_vector +/* E26004 802B62A4 27A50014 */ addiu $a1, $sp, 0x14 +/* E26008 802B62A8 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E2600C 802B62AC C7A20014 */ lwc1 $f2, 0x14($sp) +/* E26010 802B62B0 E6200080 */ swc1 $f0, 0x80($s1) +/* E26014 802B62B4 E602001C */ swc1 $f2, 0x1c($s0) +.L802B62B8: +/* E26018 802B62B8 3C058011 */ lui $a1, %hi(D_8010C944) +/* E2601C 802B62BC 24A5C944 */ addiu $a1, $a1, %lo(D_8010C944) +/* E26020 802B62C0 3C068011 */ lui $a2, %hi(D_8010F6B8) +/* E26024 802B62C4 24C6F6B8 */ addiu $a2, $a2, %lo(D_8010F6B8) +/* E26028 802B62C8 8CA20000 */ lw $v0, ($a1) +/* E2602C 802B62CC C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E26030 802B62D0 00022040 */ sll $a0, $v0, 1 +/* E26034 802B62D4 24420001 */ addiu $v0, $v0, 1 +/* E26038 802B62D8 4600018D */ trunc.w.s $f6, $f0 +/* E2603C 802B62DC 44033000 */ mfc1 $v1, $f6 +/* E26040 802B62E0 3C018011 */ lui $at, %hi(D_8010F6B8) +/* E26044 802B62E4 00240821 */ addu $at, $at, $a0 +/* E26048 802B62E8 A423F6B8 */ sh $v1, %lo(D_8010F6B8)($at) +/* E2604C 802B62EC ACA20000 */ sw $v0, ($a1) +/* E26050 802B62F0 28420006 */ slti $v0, $v0, 6 +/* E26054 802B62F4 50400001 */ beql $v0, $zero, .L802B62FC +/* E26058 802B62F8 ACA00000 */ sw $zero, ($a1) +.L802B62FC: +/* E2605C 802B62FC 8CA30000 */ lw $v1, ($a1) +/* E26060 802B6300 C6200028 */ lwc1 $f0, 0x28($s1) +/* E26064 802B6304 00031080 */ sll $v0, $v1, 2 +/* E26068 802B6308 4600018D */ trunc.w.s $f6, $f0 +/* E2606C 802B630C 3C018011 */ lui $at, %hi(D_8010EF28) +/* E26070 802B6310 00220821 */ addu $at, $at, $v0 +/* E26074 802B6314 E426EF28 */ swc1 $f6, %lo(D_8010EF28)($at) +/* E26078 802B6318 24640001 */ addiu $a0, $v1, 1 +/* E2607C 802B631C C620002C */ lwc1 $f0, 0x2c($s1) +/* E26080 802B6320 00031840 */ sll $v1, $v1, 1 +/* E26084 802B6324 4600018D */ trunc.w.s $f6, $f0 +/* E26088 802B6328 3C018011 */ lui $at, %hi(D_8010EF10) +/* E2608C 802B632C 00220821 */ addu $at, $at, $v0 +/* E26090 802B6330 E426EF10 */ swc1 $f6, %lo(D_8010EF10)($at) +/* E26094 802B6334 C6200030 */ lwc1 $f0, 0x30($s1) +/* E26098 802B6338 00661821 */ addu $v1, $v1, $a2 +/* E2609C 802B633C ACA40000 */ sw $a0, ($a1) +/* E260A0 802B6340 4600018D */ trunc.w.s $f6, $f0 +/* E260A4 802B6344 3C018011 */ lui $at, %hi(D_8010EF40) +/* E260A8 802B6348 00220821 */ addu $at, $at, $v0 +/* E260AC 802B634C E426EF40 */ swc1 $f6, %lo(D_8010EF40)($at) +/* E260B0 802B6350 C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E260B4 802B6354 28840006 */ slti $a0, $a0, 6 +/* E260B8 802B6358 4600018D */ trunc.w.s $f6, $f0 +/* E260BC 802B635C 44023000 */ mfc1 $v0, $f6 +/* E260C0 802B6360 14800002 */ bnez $a0, .L802B636C +/* E260C4 802B6364 A4620000 */ sh $v0, ($v1) +/* E260C8 802B6368 ACA00000 */ sw $zero, ($a1) +.L802B636C: +/* E260CC 802B636C 16A0001A */ bnez $s5, .L802B63D8 +/* E260D0 802B6370 00000000 */ nop +/* E260D4 802B6374 0C039838 */ jal check_input_hammer +/* E260D8 802B6378 00000000 */ nop +/* E260DC 802B637C 14400005 */ bnez $v0, .L802B6394 +/* E260E0 802B6380 3C05FFFE */ lui $a1, 0xfffe +/* E260E4 802B6384 0C039858 */ jal check_input_jump +/* E260E8 802B6388 00000000 */ nop +/* E260EC 802B638C 10400012 */ beqz $v0, .L802B63D8 +/* E260F0 802B6390 3C05FFFE */ lui $a1, 0xfffe +.L802B6394: +/* E260F4 802B6394 34A5FFFF */ ori $a1, $a1, 0xffff +/* E260F8 802B6398 3C06FFFD */ lui $a2, 0xfffd +/* E260FC 802B639C 34C6FFFF */ ori $a2, $a2, 0xffff +/* E26100 802B63A0 8E040030 */ lw $a0, 0x30($s0) +/* E26104 802B63A4 8E220004 */ lw $v0, 4($s1) +/* E26108 802B63A8 8E230000 */ lw $v1, ($s1) +/* E2610C 802B63AC 00451024 */ and $v0, $v0, $a1 +/* E26110 802B63B0 00661824 */ and $v1, $v1, $a2 +/* E26114 802B63B4 AE220004 */ sw $v0, 4($s1) +/* E26118 802B63B8 0C05271B */ jal stop_sound +/* E2611C 802B63BC AE230000 */ sw $v1, ($s1) +/* E26120 802B63C0 27A40010 */ addiu $a0, $sp, 0x10 +/* E26124 802B63C4 0C0388C1 */ jal input_to_move_vector +/* E26128 802B63C8 27A50014 */ addiu $a1, $sp, 0x14 +/* E2612C 802B63CC C7A00010 */ lwc1 $f0, 0x10($sp) +/* E26130 802B63D0 080ADA5B */ j .L802B696C +/* E26134 802B63D4 E6200080 */ swc1 $f0, 0x80($s1) +.L802B63D8: +/* E26138 802B63D8 82020003 */ lb $v0, 3($s0) +/* E2613C 802B63DC 2842000B */ slti $v0, $v0, 0xb +/* E26140 802B63E0 1040000C */ beqz $v0, .L802B6414 +/* E26144 802B63E4 00000000 */ nop +/* E26148 802B63E8 8E2200E0 */ lw $v0, 0xe0($s1) +/* E2614C 802B63EC 30422000 */ andi $v0, $v0, 0x2000 +/* E26150 802B63F0 10400008 */ beqz $v0, .L802B6414 +/* E26154 802B63F4 24020001 */ addiu $v0, $zero, 1 +/* E26158 802B63F8 822300B5 */ lb $v1, 0xb5($s1) +/* E2615C 802B63FC 8E2400E8 */ lw $a0, 0xe8($s1) +/* E26160 802B6400 8E2500EC */ lw $a1, 0xec($s1) +/* E26164 802B6404 A2020001 */ sb $v0, 1($s0) +/* E26168 802B6408 AE030004 */ sw $v1, 4($s0) +/* E2616C 802B640C AE040008 */ sw $a0, 8($s0) +/* E26170 802B6410 AE05000C */ sw $a1, 0xc($s0) +.L802B6414: +/* E26174 802B6414 822300B6 */ lb $v1, 0xb6($s1) +/* E26178 802B6418 28620002 */ slti $v0, $v1, 2 +/* E2617C 802B641C 1440004C */ bnez $v0, .L802B6550 +/* E26180 802B6420 00000000 */ nop +/* E26184 802B6424 C6000010 */ lwc1 $f0, 0x10($s0) +/* E26188 802B6428 3C013F80 */ lui $at, 0x3f80 +/* E2618C 802B642C 44811000 */ mtc1 $at, $f2 +/* E26190 802B6430 00000000 */ nop +/* E26194 802B6434 46020001 */ sub.s $f0, $f0, $f2 +/* E26198 802B6438 4480C000 */ mtc1 $zero, $f24 +/* E2619C 802B643C 00000000 */ nop +/* E261A0 802B6440 4618003C */ c.lt.s $f0, $f24 +/* E261A4 802B6444 00000000 */ nop +/* E261A8 802B6448 45000002 */ bc1f .L802B6454 +/* E261AC 802B644C E6000010 */ swc1 $f0, 0x10($s0) +/* E261B0 802B6450 E6180010 */ swc1 $f24, 0x10($s0) +.L802B6454: +/* E261B4 802B6454 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E261B8 802B6458 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E261BC 802B645C C6200080 */ lwc1 $f0, 0x80($s1) +/* E261C0 802B6460 00031080 */ sll $v0, $v1, 2 +/* E261C4 802B6464 00431021 */ addu $v0, $v0, $v1 +/* E261C8 802B6468 00021080 */ sll $v0, $v0, 2 +/* E261CC 802B646C 00431023 */ subu $v0, $v0, $v1 +/* E261D0 802B6470 000218C0 */ sll $v1, $v0, 3 +/* E261D4 802B6474 00431021 */ addu $v0, $v0, $v1 +/* E261D8 802B6478 000210C0 */ sll $v0, $v0, 3 +/* E261DC 802B647C 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E261E0 802B6480 00220821 */ addu $at, $at, $v0 +/* E261E4 802B6484 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) +/* E261E8 802B6488 0C00A6C9 */ jal clamp_angle +/* E261EC 802B648C 460C0301 */ sub.s $f12, $f0, $f12 +/* E261F0 802B6490 3C0140C9 */ lui $at, 0x40c9 +/* E261F4 802B6494 34210FD0 */ ori $at, $at, 0xfd0 +/* E261F8 802B6498 4481A000 */ mtc1 $at, $f20 +/* E261FC 802B649C 00000000 */ nop +/* E26200 802B64A0 46140302 */ mul.s $f12, $f0, $f20 +/* E26204 802B64A4 00000000 */ nop +/* E26208 802B64A8 3C0143B4 */ lui $at, 0x43b4 +/* E2620C 802B64AC 4481B000 */ mtc1 $at, $f22 +/* E26210 802B64B0 E7A00010 */ swc1 $f0, 0x10($sp) +/* E26214 802B64B4 0C00A85B */ jal sin_rad +/* E26218 802B64B8 46166303 */ div.s $f12, $f12, $f22 +/* E2621C 802B64BC C7AC0010 */ lwc1 $f12, 0x10($sp) +/* E26220 802B64C0 46146302 */ mul.s $f12, $f12, $f20 +/* E26224 802B64C4 00000000 */ nop +/* E26228 802B64C8 C6020010 */ lwc1 $f2, 0x10($s0) +/* E2622C 802B64CC 46020002 */ mul.s $f0, $f0, $f2 +/* E26230 802B64D0 00000000 */ nop +/* E26234 802B64D4 46166303 */ div.s $f12, $f12, $f22 +/* E26238 802B64D8 0C00A874 */ jal cos_rad +/* E2623C 802B64DC E6000014 */ swc1 $f0, 0x14($s0) +/* E26240 802B64E0 46000007 */ neg.s $f0, $f0 +/* E26244 802B64E4 C6020010 */ lwc1 $f2, 0x10($s0) +/* E26248 802B64E8 96220008 */ lhu $v0, 8($s1) +/* E2624C 802B64EC 46020002 */ mul.s $f0, $f0, $f2 +/* E26250 802B64F0 00000000 */ nop +/* E26254 802B64F4 2442FFFF */ addiu $v0, $v0, -1 +/* E26258 802B64F8 A6220008 */ sh $v0, 8($s1) +/* E2625C 802B64FC 00021400 */ sll $v0, $v0, 0x10 +/* E26260 802B6500 14400011 */ bnez $v0, .L802B6548 +/* E26264 802B6504 E6000018 */ swc1 $f0, 0x18($s0) +/* E26268 802B6508 0000202D */ daddu $a0, $zero, $zero +/* E2626C 802B650C 24020004 */ addiu $v0, $zero, 4 +/* E26270 802B6510 0C039769 */ jal set_action_state +/* E26274 802B6514 A2020000 */ sb $v0, ($s0) +/* E26278 802B6518 3C05FFFD */ lui $a1, 0xfffd +/* E2627C 802B651C 34A5FFFF */ ori $a1, $a1, 0xffff +/* E26280 802B6520 3C06FFFE */ lui $a2, 0xfffe +/* E26284 802B6524 34C6FFFF */ ori $a2, $a2, 0xffff +/* E26288 802B6528 8E040030 */ lw $a0, 0x30($s0) +/* E2628C 802B652C 8E220000 */ lw $v0, ($s1) +/* E26290 802B6530 8E230004 */ lw $v1, 4($s1) +/* E26294 802B6534 00451024 */ and $v0, $v0, $a1 +/* E26298 802B6538 00661824 */ and $v1, $v1, $a2 +/* E2629C 802B653C AE220000 */ sw $v0, ($s1) +/* E262A0 802B6540 0C05271B */ jal stop_sound +/* E262A4 802B6544 AE230004 */ sw $v1, 4($s1) +.L802B6548: +/* E262A8 802B6548 080ADA5B */ j .L802B696C +/* E262AC 802B654C E6380054 */ swc1 $f24, 0x54($s1) +.L802B6550: +/* E262B0 802B6550 14600012 */ bnez $v1, .L802B659C +/* E262B4 802B6554 3C030004 */ lui $v1, 4 +/* E262B8 802B6558 8E220004 */ lw $v0, 4($s1) +/* E262BC 802B655C 00431024 */ and $v0, $v0, $v1 +/* E262C0 802B6560 1440000D */ bnez $v0, .L802B6598 +/* E262C4 802B6564 24020001 */ addiu $v0, $zero, 1 +/* E262C8 802B6568 3C028016 */ lui $v0, %hi(gCollisionStatus) +/* E262CC 802B656C 8442A550 */ lh $v0, %lo(gCollisionStatus)($v0) +/* E262D0 802B6570 0440000A */ bltz $v0, .L802B659C +/* E262D4 802B6574 00000000 */ nop +/* E262D8 802B6578 92020002 */ lbu $v0, 2($s0) +/* E262DC 802B657C 24420001 */ addiu $v0, $v0, 1 +/* E262E0 802B6580 A2020002 */ sb $v0, 2($s0) +/* E262E4 802B6584 00021600 */ sll $v0, $v0, 0x18 +/* E262E8 802B6588 00021603 */ sra $v0, $v0, 0x18 +/* E262EC 802B658C 2842000A */ slti $v0, $v0, 0xa +/* E262F0 802B6590 14400002 */ bnez $v0, .L802B659C +/* E262F4 802B6594 24020001 */ addiu $v0, $zero, 1 +.L802B6598: +/* E262F8 802B6598 A22200B6 */ sb $v0, 0xb6($s1) +.L802B659C: +/* E262FC 802B659C 86240008 */ lh $a0, 8($s1) +/* E26300 802B65A0 8603002E */ lh $v1, 0x2e($s0) +/* E26304 802B65A4 0064102A */ slt $v0, $v1, $a0 +/* E26308 802B65A8 5440003F */ bnel $v0, $zero, .L802B66A8 +/* E2630C 802B65AC 00831023 */ subu $v0, $a0, $v1 +/* E26310 802B65B0 C600001C */ lwc1 $f0, 0x1c($s0) +/* E26314 802B65B4 44801000 */ mtc1 $zero, $f2 +/* E26318 802B65B8 00000000 */ nop +/* E2631C 802B65BC 46020032 */ c.eq.s $f0, $f2 +/* E26320 802B65C0 00000000 */ nop +/* E26324 802B65C4 45010002 */ bc1t .L802B65D0 +/* E26328 802B65C8 46001606 */ mov.s $f24, $f2 +/* E2632C 802B65CC C6180024 */ lwc1 $f24, 0x24($s0) +.L802B65D0: +/* E26330 802B65D0 C6000010 */ lwc1 $f0, 0x10($s0) +/* E26334 802B65D4 3C01802B */ lui $at, %hi(D_802B69A0) +/* E26338 802B65D8 D42269A0 */ ldc1 $f2, %lo(D_802B69A0)($at) +/* E2633C 802B65DC 46000021 */ cvt.d.s $f0, $f0 +/* E26340 802B65E0 46220000 */ add.d $f0, $f0, $f2 +/* E26344 802B65E4 3C014110 */ lui $at, 0x4110 +/* E26348 802B65E8 44811000 */ mtc1 $at, $f2 +/* E2634C 802B65EC 46200020 */ cvt.s.d $f0, $f0 +/* E26350 802B65F0 4600103C */ c.lt.s $f2, $f0 +/* E26354 802B65F4 00000000 */ nop +/* E26358 802B65F8 45000002 */ bc1f .L802B6604 +/* E2635C 802B65FC E6000010 */ swc1 $f0, 0x10($s0) +/* E26360 802B6600 E6020010 */ swc1 $f2, 0x10($s0) +.L802B6604: +/* E26364 802B6604 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E26368 802B6608 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E2636C 802B660C C6200080 */ lwc1 $f0, 0x80($s1) +/* E26370 802B6610 00031080 */ sll $v0, $v1, 2 +/* E26374 802B6614 00431021 */ addu $v0, $v0, $v1 +/* E26378 802B6618 00021080 */ sll $v0, $v0, 2 +/* E2637C 802B661C 00431023 */ subu $v0, $v0, $v1 +/* E26380 802B6620 000218C0 */ sll $v1, $v0, 3 +/* E26384 802B6624 00431021 */ addu $v0, $v0, $v1 +/* E26388 802B6628 000210C0 */ sll $v0, $v0, 3 +/* E2638C 802B662C 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E26390 802B6630 00220821 */ addu $at, $at, $v0 +/* E26394 802B6634 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) +/* E26398 802B6638 0C00A6C9 */ jal clamp_angle +/* E2639C 802B663C 460C0301 */ sub.s $f12, $f0, $f12 +/* E263A0 802B6640 3C0140C9 */ lui $at, 0x40c9 +/* E263A4 802B6644 34210FD0 */ ori $at, $at, 0xfd0 +/* E263A8 802B6648 4481A000 */ mtc1 $at, $f20 +/* E263AC 802B664C 00000000 */ nop +/* E263B0 802B6650 46140302 */ mul.s $f12, $f0, $f20 +/* E263B4 802B6654 00000000 */ nop +/* E263B8 802B6658 3C0143B4 */ lui $at, 0x43b4 +/* E263BC 802B665C 4481B000 */ mtc1 $at, $f22 +/* E263C0 802B6660 E7A00010 */ swc1 $f0, 0x10($sp) +/* E263C4 802B6664 0C00A85B */ jal sin_rad +/* E263C8 802B6668 46166303 */ div.s $f12, $f12, $f22 +/* E263CC 802B666C C7AC0010 */ lwc1 $f12, 0x10($sp) +/* E263D0 802B6670 46146302 */ mul.s $f12, $f12, $f20 +/* E263D4 802B6674 00000000 */ nop +/* E263D8 802B6678 C6020010 */ lwc1 $f2, 0x10($s0) +/* E263DC 802B667C 46020002 */ mul.s $f0, $f0, $f2 +/* E263E0 802B6680 00000000 */ nop +/* E263E4 802B6684 46166303 */ div.s $f12, $f12, $f22 +/* E263E8 802B6688 0C00A874 */ jal cos_rad +/* E263EC 802B668C E6000014 */ swc1 $f0, 0x14($s0) +/* E263F0 802B6690 C6020010 */ lwc1 $f2, 0x10($s0) +/* E263F4 802B6694 46000007 */ neg.s $f0, $f0 +/* E263F8 802B6698 46020002 */ mul.s $f0, $f0, $f2 +/* E263FC 802B669C 00000000 */ nop +/* E26400 802B66A0 080AD9CE */ j .L802B6738 +/* E26404 802B66A4 E6000018 */ swc1 $f0, 0x18($s0) +.L802B66A8: +/* E26408 802B66A8 2442FFFF */ addiu $v0, $v0, -1 +/* E2640C 802B66AC C6020028 */ lwc1 $f2, 0x28($s0) +/* E26410 802B66B0 44820000 */ mtc1 $v0, $f0 +/* E26414 802B66B4 00000000 */ nop +/* E26418 802B66B8 46800020 */ cvt.s.w $f0, $f0 +/* E2641C 802B66BC 46020002 */ mul.s $f0, $f0, $f2 +/* E26420 802B66C0 00000000 */ nop +/* E26424 802B66C4 C6020024 */ lwc1 $f2, 0x24($s0) +/* E26428 802B66C8 46001601 */ sub.s $f24, $f2, $f0 +/* E2642C 802B66CC 3C01802B */ lui $at, %hi(D_802B69A8) +/* E26430 802B66D0 D42269A8 */ ldc1 $f2, %lo(D_802B69A8)($at) +/* E26434 802B66D4 4600C021 */ cvt.d.s $f0, $f24 +/* E26438 802B66D8 4622003C */ c.lt.d $f0, $f2 +/* E2643C 802B66DC 00000000 */ nop +/* E26440 802B66E0 45000004 */ bc1f .L802B66F4 +/* E26444 802B66E4 00000000 */ nop +/* E26448 802B66E8 3C013DCC */ lui $at, 0x3dcc +/* E2644C 802B66EC 3421CCCD */ ori $at, $at, 0xcccd +/* E26450 802B66F0 4481C000 */ mtc1 $at, $f24 +.L802B66F4: +/* E26454 802B66F4 C600001C */ lwc1 $f0, 0x1c($s0) +/* E26458 802B66F8 44802000 */ mtc1 $zero, $f4 +/* E2645C 802B66FC 00000000 */ nop +/* E26460 802B6700 46040032 */ c.eq.s $f0, $f4 +/* E26464 802B6704 00000000 */ nop +/* E26468 802B6708 45030001 */ bc1tl .L802B6710 +/* E2646C 802B670C 46002606 */ mov.s $f24, $f4 +.L802B6710: +/* E26470 802B6710 C6000010 */ lwc1 $f0, 0x10($s0) +/* E26474 802B6714 3C013F80 */ lui $at, 0x3f80 +/* E26478 802B6718 44811000 */ mtc1 $at, $f2 +/* E2647C 802B671C 00000000 */ nop +/* E26480 802B6720 46020001 */ sub.s $f0, $f0, $f2 +/* E26484 802B6724 4604003C */ c.lt.s $f0, $f4 +/* E26488 802B6728 00000000 */ nop +/* E2648C 802B672C 45000002 */ bc1f .L802B6738 +/* E26490 802B6730 E6000010 */ swc1 $f0, 0x10($s0) +/* E26494 802B6734 E6040010 */ swc1 $f4, 0x10($s0) +.L802B6738: +/* E26498 802B6738 96220008 */ lhu $v0, 8($s1) +/* E2649C 802B673C 822300B5 */ lb $v1, 0xb5($s1) +/* E264A0 802B6740 24420001 */ addiu $v0, $v0, 1 +/* E264A4 802B6744 10600007 */ beqz $v1, .L802B6764 +/* E264A8 802B6748 A6220008 */ sh $v0, 8($s1) +/* E264AC 802B674C 04600030 */ bltz $v1, .L802B6810 +/* E264B0 802B6750 28620003 */ slti $v0, $v1, 3 +/* E264B4 802B6754 1040002E */ beqz $v0, .L802B6810 +/* E264B8 802B6758 00000000 */ nop +/* E264BC 802B675C 080ADA00 */ j .L802B6800 +/* E264C0 802B6760 00000000 */ nop +.L802B6764: +/* E264C4 802B6764 27A40010 */ addiu $a0, $sp, 0x10 +/* E264C8 802B6768 0C0388C1 */ jal input_to_move_vector +/* E264CC 802B676C 27A50014 */ addiu $a1, $sp, 0x14 +/* E264D0 802B6770 0C039454 */ jal func_800E5150 +/* E264D4 802B6774 00000000 */ nop +/* E264D8 802B6778 0C039858 */ jal check_input_jump +/* E264DC 802B677C 00000000 */ nop +/* E264E0 802B6780 10400010 */ beqz $v0, .L802B67C4 +/* E264E4 802B6784 00000000 */ nop +/* E264E8 802B6788 C7A20014 */ lwc1 $f2, 0x14($sp) +/* E264EC 802B678C 44800000 */ mtc1 $zero, $f0 +/* E264F0 802B6790 00000000 */ nop +/* E264F4 802B6794 46001032 */ c.eq.s $f2, $f0 +/* E264F8 802B6798 00000000 */ nop +/* E264FC 802B679C 45000007 */ bc1f .L802B67BC +/* E26500 802B67A0 00000000 */ nop +/* E26504 802B67A4 C6220080 */ lwc1 $f2, 0x80($s1) +/* E26508 802B67A8 C7A00010 */ lwc1 $f0, 0x10($sp) +/* E2650C 802B67AC 46001032 */ c.eq.s $f2, $f0 +/* E26510 802B67B0 00000000 */ nop +/* E26514 802B67B4 45010003 */ bc1t .L802B67C4 +/* E26518 802B67B8 00000000 */ nop +.L802B67BC: +/* E2651C 802B67BC C7A00010 */ lwc1 $f0, 0x10($sp) +/* E26520 802B67C0 E6200080 */ swc1 $f0, 0x80($s1) +.L802B67C4: +/* E26524 802B67C4 C7A00014 */ lwc1 $f0, 0x14($sp) +/* E26528 802B67C8 44801000 */ mtc1 $zero, $f2 +/* E2652C 802B67CC 00000000 */ nop +/* E26530 802B67D0 46020032 */ c.eq.s $f0, $f2 +/* E26534 802B67D4 00000000 */ nop +/* E26538 802B67D8 45010006 */ bc1t .L802B67F4 +/* E2653C 802B67DC 26220054 */ addiu $v0, $s1, 0x54 +/* E26540 802B67E0 C620005C */ lwc1 $f0, 0x5c($s1) +/* E26544 802B67E4 46180002 */ mul.s $f0, $f0, $f24 +/* E26548 802B67E8 00000000 */ nop +/* E2654C 802B67EC 080ADA04 */ j .L802B6810 +/* E26550 802B67F0 E4400000 */ swc1 $f0, ($v0) +.L802B67F4: +/* E26554 802B67F4 46001006 */ mov.s $f0, $f2 +/* E26558 802B67F8 080ADA04 */ j .L802B6810 +/* E2655C 802B67FC E4400000 */ swc1 $f0, ($v0) +.L802B6800: +/* E26560 802B6800 C620005C */ lwc1 $f0, 0x5c($s1) +/* E26564 802B6804 46180002 */ mul.s $f0, $f0, $f24 +/* E26568 802B6808 00000000 */ nop +/* E2656C 802B680C E6200054 */ swc1 $f0, 0x54($s1) +.L802B6810: +/* E26570 802B6810 822200B6 */ lb $v0, 0xb6($s1) +/* E26574 802B6814 14400010 */ bnez $v0, .L802B6858 +/* E26578 802B6818 00000000 */ nop +/* E2657C 802B681C 92020003 */ lbu $v0, 3($s0) +/* E26580 802B6820 2442FFFF */ addiu $v0, $v0, -1 +/* E26584 802B6824 A2020003 */ sb $v0, 3($s0) +/* E26588 802B6828 00021600 */ sll $v0, $v0, 0x18 +/* E2658C 802B682C 18400009 */ blez $v0, .L802B6854 +/* E26590 802B6830 24020001 */ addiu $v0, $zero, 1 +/* E26594 802B6834 86220008 */ lh $v0, 8($s1) +/* E26598 802B6838 28420002 */ slti $v0, $v0, 2 +/* E2659C 802B683C 1440004B */ bnez $v0, .L802B696C +/* E265A0 802B6840 00000000 */ nop +/* E265A4 802B6844 C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E265A8 802B6848 C62C00D4 */ lwc1 $f12, 0xd4($s1) +/* E265AC 802B684C 080ADA58 */ j .L802B6960 +/* E265B0 802B6850 460C0300 */ add.s $f12, $f0, $f12 +.L802B6854: +/* E265B4 802B6854 A22200B6 */ sb $v0, 0xb6($s1) +.L802B6858: +/* E265B8 802B6858 822300B6 */ lb $v1, 0xb6($s1) +/* E265BC 802B685C 24020001 */ addiu $v0, $zero, 1 +/* E265C0 802B6860 14620042 */ bne $v1, $v0, .L802B696C +/* E265C4 802B6864 00000000 */ nop +/* E265C8 802B6868 C62200A8 */ lwc1 $f2, 0xa8($s1) +/* E265CC 802B686C C62000D4 */ lwc1 $f0, 0xd4($s1) +/* E265D0 802B6870 82020001 */ lb $v0, 1($s0) +/* E265D4 802B6874 46001000 */ add.s $f0, $f2, $f0 +/* E265D8 802B6878 E7A20010 */ swc1 $f2, 0x10($sp) +/* E265DC 802B687C 10400008 */ beqz $v0, .L802B68A0 +/* E265E0 802B6880 E62000A8 */ swc1 $f0, 0xa8($s1) +/* E265E4 802B6884 3C02FFFD */ lui $v0, 0xfffd +/* E265E8 802B6888 3442FFFF */ ori $v0, $v0, 0xffff +/* E265EC 802B688C 3C040001 */ lui $a0, 1 +/* E265F0 802B6890 34840002 */ ori $a0, $a0, 2 +/* E265F4 802B6894 8E230000 */ lw $v1, ($s1) +/* E265F8 802B6898 080ADA52 */ j .L802B6948 +/* E265FC 802B689C 24050002 */ addiu $a1, $zero, 2 +.L802B68A0: +/* E26600 802B68A0 46001106 */ mov.s $f4, $f2 +/* E26604 802B68A4 4600203C */ c.lt.s $f4, $f0 +/* E26608 802B68A8 00000000 */ nop +/* E2660C 802B68AC 45000013 */ bc1f .L802B68FC +/* E26610 802B68B0 00000000 */ nop +/* E26614 802B68B4 3C014334 */ lui $at, 0x4334 +/* E26618 802B68B8 44811000 */ mtc1 $at, $f2 +/* E2661C 802B68BC 00000000 */ nop +/* E26620 802B68C0 4600103E */ c.le.s $f2, $f0 +/* E26624 802B68C4 00000000 */ nop +/* E26628 802B68C8 45000024 */ bc1f .L802B695C +/* E2662C 802B68CC 00000000 */ nop +/* E26630 802B68D0 4602203C */ c.lt.s $f4, $f2 +/* E26634 802B68D4 00000000 */ nop +/* E26638 802B68D8 45000020 */ bc1f .L802B695C +/* E2663C 802B68DC 3C02FFFD */ lui $v0, 0xfffd +/* E26640 802B68E0 3442FFFF */ ori $v0, $v0, 0xffff +/* E26644 802B68E4 3C040001 */ lui $a0, 1 +/* E26648 802B68E8 34840002 */ ori $a0, $a0, 2 +/* E2664C 802B68EC 8E230000 */ lw $v1, ($s1) +/* E26650 802B68F0 24050002 */ addiu $a1, $zero, 2 +/* E26654 802B68F4 080ADA52 */ j .L802B6948 +/* E26658 802B68F8 E62200A8 */ swc1 $f2, 0xa8($s1) +.L802B68FC: +/* E2665C 802B68FC 44802000 */ mtc1 $zero, $f4 +/* E26660 802B6900 00000000 */ nop +/* E26664 802B6904 4604003E */ c.le.s $f0, $f4 +/* E26668 802B6908 00000000 */ nop +/* E2666C 802B690C 45000013 */ bc1f .L802B695C +/* E26670 802B6910 00000000 */ nop +/* E26674 802B6914 3C0142B4 */ lui $at, 0x42b4 +/* E26678 802B6918 44810000 */ mtc1 $at, $f0 +/* E2667C 802B691C 00000000 */ nop +/* E26680 802B6920 4600103C */ c.lt.s $f2, $f0 +/* E26684 802B6924 00000000 */ nop +/* E26688 802B6928 4500000C */ bc1f .L802B695C +/* E2668C 802B692C 3C02FFFD */ lui $v0, 0xfffd +/* E26690 802B6930 3442FFFF */ ori $v0, $v0, 0xffff +/* E26694 802B6934 3C040001 */ lui $a0, 1 +/* E26698 802B6938 34840002 */ ori $a0, $a0, 2 +/* E2669C 802B693C 8E230000 */ lw $v1, ($s1) +/* E266A0 802B6940 24050002 */ addiu $a1, $zero, 2 +/* E266A4 802B6944 E62400A8 */ swc1 $f4, 0xa8($s1) +.L802B6948: +/* E266A8 802B6948 A6250008 */ sh $a1, 8($s1) +/* E266AC 802B694C A22500B6 */ sb $a1, 0xb6($s1) +/* E266B0 802B6950 00621824 */ and $v1, $v1, $v0 +/* E266B4 802B6954 0C037FBF */ jal func_800DFEFC +/* E266B8 802B6958 AE230000 */ sw $v1, ($s1) +.L802B695C: +/* E266BC 802B695C C62C00A8 */ lwc1 $f12, 0xa8($s1) +.L802B6960: +/* E266C0 802B6960 0C00A6C9 */ jal clamp_angle +/* E266C4 802B6964 00000000 */ nop +/* E266C8 802B6968 E62000A8 */ swc1 $f0, 0xa8($s1) +.L802B696C: +/* E266CC 802B696C 8FBF0030 */ lw $ra, 0x30($sp) +/* E266D0 802B6970 8FB5002C */ lw $s5, 0x2c($sp) +/* E266D4 802B6974 8FB40028 */ lw $s4, 0x28($sp) +/* E266D8 802B6978 8FB30024 */ lw $s3, 0x24($sp) +/* E266DC 802B697C 8FB20020 */ lw $s2, 0x20($sp) +/* E266E0 802B6980 8FB1001C */ lw $s1, 0x1c($sp) +/* E266E4 802B6984 8FB00018 */ lw $s0, 0x18($sp) +/* E266E8 802B6988 D7B80048 */ ldc1 $f24, 0x48($sp) +/* E266EC 802B698C D7B60040 */ ldc1 $f22, 0x40($sp) +/* E266F0 802B6990 D7B40038 */ ldc1 $f20, 0x38($sp) +/* E266F4 802B6994 03E00008 */ jr $ra +/* E266F8 802B6998 27BD0050 */ addiu $sp, $sp, 0x50 +/* E266FC 802B699C 00000000 */ nop diff --git a/asm/nonmatchings/code_E26710/func_802B6000_E26710.s b/asm/nonmatchings/code_E26710/func_802B6000_E26710.s new file mode 100644 index 0000000000..929fc289a6 --- /dev/null +++ b/asm/nonmatchings/code_E26710/func_802B6000_E26710.s @@ -0,0 +1,401 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E26710 +/* E26710 802B6000 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E26714 802B6004 AFB00018 */ sw $s0, 0x18($sp) +/* E26718 802B6008 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E2671C 802B600C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E26720 802B6010 AFBF0020 */ sw $ra, 0x20($sp) +/* E26724 802B6014 AFB1001C */ sw $s1, 0x1c($sp) +/* E26728 802B6018 F7B40028 */ sdc1 $f20, 0x28($sp) +/* E2672C 802B601C 8E040000 */ lw $a0, ($s0) +/* E26730 802B6020 3C118016 */ lui $s1, %hi(gCollisionStatus) +/* E26734 802B6024 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus) +/* E26738 802B6028 0481003E */ bgez $a0, .L802B6124 +/* E2673C 802B602C 3C027FFF */ lui $v0, 0x7fff +/* E26740 802B6030 3442FFFF */ ori $v0, $v0, 0xffff +/* E26744 802B6034 3C030002 */ lui $v1, 2 +/* E26748 802B6038 3463000A */ ori $v1, $v1, 0xa +/* E2674C 802B603C 00821024 */ and $v0, $a0, $v0 +/* E26750 802B6040 00431025 */ or $v0, $v0, $v1 +/* E26754 802B6044 0C03963C */ jal func_800E58F0 +/* E26758 802B6048 AE020000 */ sw $v0, ($s0) +/* E2675C 802B604C 3C014180 */ lui $at, 0x4180 +/* E26760 802B6050 44810000 */ mtc1 $at, $f0 +/* E26764 802B6054 3C01C0EC */ lui $at, 0xc0ec +/* E26768 802B6058 34215C14 */ ori $at, $at, 0x5c14 +/* E2676C 802B605C 44811000 */ mtc1 $at, $f2 +/* E26770 802B6060 3C01405C */ lui $at, 0x405c +/* E26774 802B6064 34219AAA */ ori $at, $at, 0x9aaa +/* E26778 802B6068 44812000 */ mtc1 $at, $f4 +/* E2677C 802B606C 3C01BF40 */ lui $at, 0xbf40 +/* E26780 802B6070 44813000 */ mtc1 $at, $f6 +/* E26784 802B6074 3C040008 */ lui $a0, 8 +/* E26788 802B6078 A20000B6 */ sb $zero, 0xb6($s0) +/* E2678C 802B607C AE000054 */ sw $zero, 0x54($s0) +/* E26790 802B6080 E6000070 */ swc1 $f0, 0x70($s0) +/* E26794 802B6084 E6020074 */ swc1 $f2, 0x74($s0) +/* E26798 802B6088 E6040078 */ swc1 $f4, 0x78($s0) +/* E2679C 802B608C 0C037FDE */ jal func_800DFF78 +/* E267A0 802B6090 E606007C */ swc1 $f6, 0x7c($s0) +/* E267A4 802B6094 0C03805E */ jal disable_player_input +/* E267A8 802B6098 00000000 */ nop +/* E267AC 802B609C 8E020000 */ lw $v0, ($s0) +/* E267B0 802B60A0 3C04800B */ lui $a0, %hi(gCameras) +/* E267B4 802B60A4 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* E267B8 802B60A8 34420200 */ ori $v0, $v0, 0x200 +/* E267BC 802B60AC AE020000 */ sw $v0, ($s0) +/* E267C0 802B60B0 94820002 */ lhu $v0, 2($a0) +/* E267C4 802B60B4 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E267C8 802B60B8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E267CC 802B60BC 34420001 */ ori $v0, $v0, 1 +/* E267D0 802B60C0 A4820002 */ sh $v0, 2($a0) +/* E267D4 802B60C4 00031080 */ sll $v0, $v1, 2 +/* E267D8 802B60C8 00431021 */ addu $v0, $v0, $v1 +/* E267DC 802B60CC 00021080 */ sll $v0, $v0, 2 +/* E267E0 802B60D0 00431023 */ subu $v0, $v0, $v1 +/* E267E4 802B60D4 000218C0 */ sll $v1, $v0, 3 +/* E267E8 802B60D8 00431021 */ addu $v0, $v0, $v1 +/* E267EC 802B60DC 000210C0 */ sll $v0, $v0, 3 +/* E267F0 802B60E0 00441021 */ addu $v0, $v0, $a0 +/* E267F4 802B60E4 C6000080 */ lwc1 $f0, 0x80($s0) +/* E267F8 802B60E8 C44C006C */ lwc1 $f12, 0x6c($v0) +/* E267FC 802B60EC 0C00A6C9 */ jal clamp_angle +/* E26800 802B60F0 460C0301 */ sub.s $f12, $f0, $f12 +/* E26804 802B60F4 3C014334 */ lui $at, 0x4334 +/* E26808 802B60F8 44811000 */ mtc1 $at, $f2 +/* E2680C 802B60FC 3C01C270 */ lui $at, 0xc270 +/* E26810 802B6100 44812000 */ mtc1 $at, $f4 +/* E26814 802B6104 4602003E */ c.le.s $f0, $f2 +/* E26818 802B6108 00000000 */ nop +/* E2681C 802B610C 45020005 */ bc1fl .L802B6124 +/* E26820 802B6110 E60400D4 */ swc1 $f4, 0xd4($s0) +/* E26824 802B6114 3C014270 */ lui $at, 0x4270 +/* E26828 802B6118 44812000 */ mtc1 $at, $f4 +/* E2682C 802B611C 00000000 */ nop +/* E26830 802B6120 E60400D4 */ swc1 $f4, 0xd4($s0) +.L802B6124: +/* E26834 802B6124 820200B6 */ lb $v0, 0xb6($s0) +/* E26838 802B6128 28420004 */ slti $v0, $v0, 4 +/* E2683C 802B612C 1040001E */ beqz $v0, .L802B61A8 +/* E26840 802B6130 00000000 */ nop +/* E26844 802B6134 C60200D4 */ lwc1 $f2, 0xd4($s0) +/* E26848 802B6138 44802000 */ mtc1 $zero, $f4 +/* E2684C 802B613C 00000000 */ nop +/* E26850 802B6140 4602203E */ c.le.s $f4, $f2 +/* E26854 802B6144 00000000 */ nop +/* E26858 802B6148 4500000C */ bc1f .L802B617C +/* E2685C 802B614C 00000000 */ nop +/* E26860 802B6150 C60000A8 */ lwc1 $f0, 0xa8($s0) +/* E26864 802B6154 46020000 */ add.s $f0, $f0, $f2 +/* E26868 802B6158 3C0143B4 */ lui $at, 0x43b4 +/* E2686C 802B615C 44811000 */ mtc1 $at, $f2 +/* E26870 802B6160 00000000 */ nop +/* E26874 802B6164 4600103E */ c.le.s $f2, $f0 +/* E26878 802B6168 00000000 */ nop +/* E2687C 802B616C 4500000E */ bc1f .L802B61A8 +/* E26880 802B6170 E60000A8 */ swc1 $f0, 0xa8($s0) +/* E26884 802B6174 080AD869 */ j .L802B61A4 +/* E26888 802B6178 46020001 */ sub.s $f0, $f0, $f2 +.L802B617C: +/* E2688C 802B617C C60000A8 */ lwc1 $f0, 0xa8($s0) +/* E26890 802B6180 46020080 */ add.s $f2, $f0, $f2 +/* E26894 802B6184 4604103C */ c.lt.s $f2, $f4 +/* E26898 802B6188 00000000 */ nop +/* E2689C 802B618C 45000006 */ bc1f .L802B61A8 +/* E268A0 802B6190 E60200A8 */ swc1 $f2, 0xa8($s0) +/* E268A4 802B6194 3C0143B4 */ lui $at, 0x43b4 +/* E268A8 802B6198 44810000 */ mtc1 $at, $f0 +/* E268AC 802B619C 00000000 */ nop +/* E268B0 802B61A0 46001000 */ add.s $f0, $f2, $f0 +.L802B61A4: +/* E268B4 802B61A4 E60000A8 */ swc1 $f0, 0xa8($s0) +.L802B61A8: +/* E268B8 802B61A8 C6020070 */ lwc1 $f2, 0x70($s0) +/* E268BC 802B61AC 44800000 */ mtc1 $zero, $f0 +/* E268C0 802B61B0 00000000 */ nop +/* E268C4 802B61B4 4600103E */ c.le.s $f2, $f0 +/* E268C8 802B61B8 00000000 */ nop +/* E268CC 802B61BC 45000009 */ bc1f .L802B61E4 +/* E268D0 802B61C0 00000000 */ nop +/* E268D4 802B61C4 3C028011 */ lui $v0, %hi(D_8010C944) +/* E268D8 802B61C8 8C42C944 */ lw $v0, %lo(D_8010C944)($v0) +/* E268DC 802B61CC C600002C */ lwc1 $f0, 0x2c($s0) +/* E268E0 802B61D0 00021080 */ sll $v0, $v0, 2 +/* E268E4 802B61D4 4600020D */ trunc.w.s $f8, $f0 +/* E268E8 802B61D8 3C018011 */ lui $at, %hi(D_8010EF10) +/* E268EC 802B61DC 00220821 */ addu $at, $at, $v0 +/* E268F0 802B61E0 E428EF10 */ swc1 $f8, %lo(D_8010EF10)($at) +.L802B61E4: +/* E268F4 802B61E4 3C058011 */ lui $a1, %hi(D_8010C944) +/* E268F8 802B61E8 24A5C944 */ addiu $a1, $a1, %lo(D_8010C944) +/* E268FC 802B61EC 8CA20000 */ lw $v0, ($a1) +/* E26900 802B61F0 C60000A8 */ lwc1 $f0, 0xa8($s0) +/* E26904 802B61F4 00022040 */ sll $a0, $v0, 1 +/* E26908 802B61F8 24420001 */ addiu $v0, $v0, 1 +/* E2690C 802B61FC 4600020D */ trunc.w.s $f8, $f0 +/* E26910 802B6200 44034000 */ mfc1 $v1, $f8 +/* E26914 802B6204 3C018011 */ lui $at, %hi(D_8010F6B8) +/* E26918 802B6208 00240821 */ addu $at, $at, $a0 +/* E2691C 802B620C A423F6B8 */ sh $v1, %lo(D_8010F6B8)($at) +/* E26920 802B6210 ACA20000 */ sw $v0, ($a1) +/* E26924 802B6214 28420006 */ slti $v0, $v0, 6 +/* E26928 802B6218 50400001 */ beql $v0, $zero, .L802B6220 +/* E2692C 802B621C ACA00000 */ sw $zero, ($a1) +.L802B6220: +/* E26930 802B6220 820300B6 */ lb $v1, 0xb6($s0) +/* E26934 802B6224 2C62000D */ sltiu $v0, $v1, 0xd +/* E26938 802B6228 104000DE */ beqz $v0, .L802B65A4 +/* E2693C 802B622C 00031080 */ sll $v0, $v1, 2 +/* E26940 802B6230 3C01802B */ lui $at, %hi(D_802B6690) +/* E26944 802B6234 00220821 */ addu $at, $at, $v0 +/* E26948 802B6238 8C226690 */ lw $v0, %lo(D_802B6690)($at) +/* E2694C 802B623C 00400008 */ jr $v0 +/* E26950 802B6240 00000000 */ nop +/* E26954 802B6244 0C038D12 */ jal integrate_gravity +/* E26958 802B6248 00000000 */ nop +/* E2695C 802B624C 46000506 */ mov.s $f20, $f0 +/* E26960 802B6250 4600A306 */ mov.s $f12, $f20 +/* E26964 802B6254 0C038D45 */ jal func_800E3514 +/* E26968 802B6258 27A50010 */ addiu $a1, $sp, 0x10 +/* E2696C 802B625C 8FA20010 */ lw $v0, 0x10($sp) +/* E26970 802B6260 04400014 */ bltz $v0, .L802B62B4 +/* E26974 802B6264 E600002C */ swc1 $f0, 0x2c($s0) +/* E26978 802B6268 96240002 */ lhu $a0, 2($s1) +/* E2697C 802B626C 30824000 */ andi $v0, $a0, 0x4000 +/* E26980 802B6270 10400010 */ beqz $v0, .L802B62B4 +/* E26984 802B6274 00042400 */ sll $a0, $a0, 0x10 +/* E26988 802B6278 0C0441A9 */ jal get_entity_type +/* E2698C 802B627C 00042403 */ sra $a0, $a0, 0x10 +/* E26990 802B6280 2442FFF9 */ addiu $v0, $v0, -7 +/* E26994 802B6284 2C420002 */ sltiu $v0, $v0, 2 +/* E26998 802B6288 1040000A */ beqz $v0, .L802B62B4 +/* E2699C 802B628C 00000000 */ nop +/* E269A0 802B6290 0C04417A */ jal get_entity_by_index +/* E269A4 802B6294 86240002 */ lh $a0, 2($s1) +/* E269A8 802B6298 90430006 */ lbu $v1, 6($v0) +/* E269AC 802B629C 34630001 */ ori $v1, $v1, 1 +/* E269B0 802B62A0 0C03805E */ jal disable_player_input +/* E269B4 802B62A4 A0430006 */ sb $v1, 6($v0) +/* E269B8 802B62A8 2402000B */ addiu $v0, $zero, 0xb +/* E269BC 802B62AC 080AD969 */ j .L802B65A4 +/* E269C0 802B62B0 A20200B6 */ sb $v0, 0xb6($s0) +.L802B62B4: +/* E269C4 802B62B4 44800000 */ mtc1 $zero, $f0 +/* E269C8 802B62B8 00000000 */ nop +/* E269CC 802B62BC 4600A03E */ c.le.s $f20, $f0 +/* E269D0 802B62C0 00000000 */ nop +/* E269D4 802B62C4 4500000E */ bc1f .L802B6300 +/* E269D8 802B62C8 00000000 */ nop +/* E269DC 802B62CC 0C0389AC */ jal func_800E26B0 +/* E269E0 802B62D0 00000000 */ nop +/* E269E4 802B62D4 24040147 */ addiu $a0, $zero, 0x147 +/* E269E8 802B62D8 0000282D */ daddu $a1, $zero, $zero +/* E269EC 802B62DC 24020003 */ addiu $v0, $zero, 3 +/* E269F0 802B62E0 A6020008 */ sh $v0, 8($s0) +/* E269F4 802B62E4 8E020000 */ lw $v0, ($s0) +/* E269F8 802B62E8 920300B6 */ lbu $v1, 0xb6($s0) +/* E269FC 802B62EC 34420004 */ ori $v0, $v0, 4 +/* E26A00 802B62F0 24630001 */ addiu $v1, $v1, 1 +/* E26A04 802B62F4 AE020000 */ sw $v0, ($s0) +/* E26A08 802B62F8 0C052736 */ jal play_sound_at_player +/* E26A0C 802B62FC A20300B6 */ sb $v1, 0xb6($s0) +.L802B6300: +/* E26A10 802B6300 8FA20010 */ lw $v0, 0x10($sp) +/* E26A14 802B6304 044000A7 */ bltz $v0, .L802B65A4 +/* E26A18 802B6308 3C03FFFD */ lui $v1, 0xfffd +/* E26A1C 802B630C 3463FFF7 */ ori $v1, $v1, 0xfff7 +/* E26A20 802B6310 8E020000 */ lw $v0, ($s0) +/* E26A24 802B6314 2404000A */ addiu $a0, $zero, 0xa +/* E26A28 802B6318 00431024 */ and $v0, $v0, $v1 +/* E26A2C 802B631C 0C039769 */ jal set_action_state +/* E26A30 802B6320 AE020000 */ sw $v0, ($s0) +/* E26A34 802B6324 080AD969 */ j .L802B65A4 +/* E26A38 802B6328 00000000 */ nop +/* E26A3C 802B632C 96020008 */ lhu $v0, 8($s0) +/* E26A40 802B6330 2442FFFF */ addiu $v0, $v0, -1 +/* E26A44 802B6334 A6020008 */ sh $v0, 8($s0) +/* E26A48 802B6338 00021400 */ sll $v0, $v0, 0x10 +/* E26A4C 802B633C 1C400099 */ bgtz $v0, .L802B65A4 +/* E26A50 802B6340 00000000 */ nop +/* E26A54 802B6344 920200B6 */ lbu $v0, 0xb6($s0) +/* E26A58 802B6348 24420001 */ addiu $v0, $v0, 1 +/* E26A5C 802B634C 080AD969 */ j .L802B65A4 +/* E26A60 802B6350 A20200B6 */ sb $v0, 0xb6($s0) +/* E26A64 802B6354 0C038D12 */ jal integrate_gravity +/* E26A68 802B6358 00000000 */ nop +/* E26A6C 802B635C 46000506 */ mov.s $f20, $f0 +/* E26A70 802B6360 4600A306 */ mov.s $f12, $f20 +/* E26A74 802B6364 0C038D45 */ jal func_800E3514 +/* E26A78 802B6368 27A50010 */ addiu $a1, $sp, 0x10 +/* E26A7C 802B636C 3C01C2C8 */ lui $at, 0xc2c8 +/* E26A80 802B6370 44811000 */ mtc1 $at, $f2 +/* E26A84 802B6374 00000000 */ nop +/* E26A88 802B6378 4602A03C */ c.lt.s $f20, $f2 +/* E26A8C 802B637C 00000000 */ nop +/* E26A90 802B6380 45000005 */ bc1f .L802B6398 +/* E26A94 802B6384 E600002C */ swc1 $f0, 0x2c($s0) +/* E26A98 802B6388 AE00007C */ sw $zero, 0x7c($s0) +/* E26A9C 802B638C AE000078 */ sw $zero, 0x78($s0) +/* E26AA0 802B6390 AE000074 */ sw $zero, 0x74($s0) +/* E26AA4 802B6394 E6020070 */ swc1 $f2, 0x70($s0) +.L802B6398: +/* E26AA8 802B6398 8FA20010 */ lw $v0, 0x10($sp) +/* E26AAC 802B639C 04400081 */ bltz $v0, .L802B65A4 +/* E26AB0 802B63A0 00000000 */ nop +/* E26AB4 802B63A4 96240002 */ lhu $a0, 2($s1) +/* E26AB8 802B63A8 30824000 */ andi $v0, $a0, 0x4000 +/* E26ABC 802B63AC 1040002D */ beqz $v0, .L802B6464 +/* E26AC0 802B63B0 00042400 */ sll $a0, $a0, 0x10 +/* E26AC4 802B63B4 0C0441A9 */ jal get_entity_type +/* E26AC8 802B63B8 00042403 */ sra $a0, $a0, 0x10 +/* E26ACC 802B63BC 0040182D */ daddu $v1, $v0, $zero +/* E26AD0 802B63C0 2462FFD2 */ addiu $v0, $v1, -0x2e +/* E26AD4 802B63C4 2C420002 */ sltiu $v0, $v0, 2 +/* E26AD8 802B63C8 10400009 */ beqz $v0, .L802B63F0 +/* E26ADC 802B63CC 2404000A */ addiu $a0, $zero, 0xa +/* E26AE0 802B63D0 3C03FFFD */ lui $v1, 0xfffd +/* E26AE4 802B63D4 3463FFF7 */ ori $v1, $v1, 0xfff7 +/* E26AE8 802B63D8 8E020000 */ lw $v0, ($s0) +/* E26AEC 802B63DC 00431024 */ and $v0, $v0, $v1 +/* E26AF0 802B63E0 0C039769 */ jal set_action_state +/* E26AF4 802B63E4 AE020000 */ sw $v0, ($s0) +/* E26AF8 802B63E8 080AD978 */ j .L802B65E0 +/* E26AFC 802B63EC 00000000 */ nop +.L802B63F0: +/* E26B00 802B63F0 2462FFF9 */ addiu $v0, $v1, -7 +/* E26B04 802B63F4 2C420002 */ sltiu $v0, $v0, 2 +/* E26B08 802B63F8 1040001A */ beqz $v0, .L802B6464 +/* E26B0C 802B63FC 3C03FFFD */ lui $v1, 0xfffd +/* E26B10 802B6400 8E020000 */ lw $v0, ($s0) +/* E26B14 802B6404 3463FFF7 */ ori $v1, $v1, 0xfff7 +/* E26B18 802B6408 00431024 */ and $v0, $v0, $v1 +/* E26B1C 802B640C 0C038C9E */ jal phys_player_land +/* E26B20 802B6410 AE020000 */ sw $v0, ($s0) +/* E26B24 802B6414 0000202D */ daddu $a0, $zero, $zero +/* E26B28 802B6418 0080282D */ daddu $a1, $a0, $zero +/* E26B2C 802B641C 0C0B2D5B */ jal exec_ShakeCam1 +/* E26B30 802B6420 24060004 */ addiu $a2, $zero, 4 +/* E26B34 802B6424 2404014A */ addiu $a0, $zero, 0x14a +/* E26B38 802B6428 0C052736 */ jal play_sound_at_player +/* E26B3C 802B642C 0000282D */ daddu $a1, $zero, $zero +/* E26B40 802B6430 24040100 */ addiu $a0, $zero, 0x100 +/* E26B44 802B6434 0C00A3C2 */ jal start_rumble +/* E26B48 802B6438 24050032 */ addiu $a1, $zero, 0x32 +/* E26B4C 802B643C 3C048016 */ lui $a0, %hi(D_8015A578) +/* E26B50 802B6440 2484A578 */ addiu $a0, $a0, %lo(D_8015A578) +/* E26B54 802B6444 C600002C */ lwc1 $f0, 0x2c($s0) +/* E26B58 802B6448 8E030000 */ lw $v1, ($s0) +/* E26B5C 802B644C 24020001 */ addiu $v0, $zero, 1 +/* E26B60 802B6450 A0820000 */ sb $v0, ($a0) +/* E26B64 802B6454 34630400 */ ori $v1, $v1, 0x400 +/* E26B68 802B6458 E4800008 */ swc1 $f0, 8($a0) +/* E26B6C 802B645C 080AD978 */ j .L802B65E0 +/* E26B70 802B6460 AE030000 */ sw $v1, ($s0) +.L802B6464: +/* E26B74 802B6464 8FA40010 */ lw $a0, 0x10($sp) +/* E26B78 802B6468 0C016F6A */ jal get_collider_type_by_id +/* E26B7C 802B646C 00000000 */ nop +/* E26B80 802B6470 304300FF */ andi $v1, $v0, 0xff +/* E26B84 802B6474 24020003 */ addiu $v0, $zero, 3 +/* E26B88 802B6478 1462000E */ bne $v1, $v0, .L802B64B4 +/* E26B8C 802B647C 24020002 */ addiu $v0, $zero, 2 +/* E26B90 802B6480 3C05FFFD */ lui $a1, 0xfffd +/* E26B94 802B6484 34A5FFF7 */ ori $a1, $a1, 0xfff7 +/* E26B98 802B6488 24040017 */ addiu $a0, $zero, 0x17 +/* E26B9C 802B648C 8E020000 */ lw $v0, ($s0) +/* E26BA0 802B6490 24030001 */ addiu $v1, $zero, 1 +/* E26BA4 802B6494 A20300BF */ sb $v1, 0xbf($s0) +/* E26BA8 802B6498 00451024 */ and $v0, $v0, $a1 +/* E26BAC 802B649C 0C039769 */ jal set_action_state +/* E26BB0 802B64A0 AE020000 */ sw $v0, ($s0) +/* E26BB4 802B64A4 8E020000 */ lw $v0, ($s0) +/* E26BB8 802B64A8 34420800 */ ori $v0, $v0, 0x800 +/* E26BBC 802B64AC 080AD978 */ j .L802B65E0 +/* E26BC0 802B64B0 AE020000 */ sw $v0, ($s0) +.L802B64B4: +/* E26BC4 802B64B4 14620009 */ bne $v1, $v0, .L802B64DC +/* E26BC8 802B64B8 0000202D */ daddu $a0, $zero, $zero +/* E26BCC 802B64BC 0C039769 */ jal set_action_state +/* E26BD0 802B64C0 24040017 */ addiu $a0, $zero, 0x17 +/* E26BD4 802B64C4 3C03FFFD */ lui $v1, 0xfffd +/* E26BD8 802B64C8 8E020000 */ lw $v0, ($s0) +/* E26BDC 802B64CC 3463FFF7 */ ori $v1, $v1, 0xfff7 +/* E26BE0 802B64D0 00431024 */ and $v0, $v0, $v1 +/* E26BE4 802B64D4 080AD978 */ j .L802B65E0 +/* E26BE8 802B64D8 AE020000 */ sw $v0, ($s0) +.L802B64DC: +/* E26BEC 802B64DC 0080282D */ daddu $a1, $a0, $zero +/* E26BF0 802B64E0 24060004 */ addiu $a2, $zero, 4 +/* E26BF4 802B64E4 24020008 */ addiu $v0, $zero, 8 +/* E26BF8 802B64E8 A6020008 */ sh $v0, 8($s0) +/* E26BFC 802B64EC 920200B6 */ lbu $v0, 0xb6($s0) +/* E26C00 802B64F0 24030010 */ addiu $v1, $zero, 0x10 +/* E26C04 802B64F4 A60000C0 */ sh $zero, 0xc0($s0) +/* E26C08 802B64F8 A20300B4 */ sb $v1, 0xb4($s0) +/* E26C0C 802B64FC 24420001 */ addiu $v0, $v0, 1 +/* E26C10 802B6500 0C0B2D5B */ jal exec_ShakeCam1 +/* E26C14 802B6504 A20200B6 */ sb $v0, 0xb6($s0) +/* E26C18 802B6508 2404014A */ addiu $a0, $zero, 0x14a +/* E26C1C 802B650C 0C052736 */ jal play_sound_at_player +/* E26C20 802B6510 0000282D */ daddu $a1, $zero, $zero +/* E26C24 802B6514 24040100 */ addiu $a0, $zero, 0x100 +/* E26C28 802B6518 0C00A3C2 */ jal start_rumble +/* E26C2C 802B651C 24050032 */ addiu $a1, $zero, 0x32 +/* E26C30 802B6520 3C048016 */ lui $a0, %hi(D_8015A578) +/* E26C34 802B6524 2484A578 */ addiu $a0, $a0, %lo(D_8015A578) +/* E26C38 802B6528 C600002C */ lwc1 $f0, 0x2c($s0) +/* E26C3C 802B652C 8E030000 */ lw $v1, ($s0) +/* E26C40 802B6530 24020001 */ addiu $v0, $zero, 1 +/* E26C44 802B6534 A0820000 */ sb $v0, ($a0) +/* E26C48 802B6538 34630400 */ ori $v1, $v1, 0x400 +/* E26C4C 802B653C E4800008 */ swc1 $f0, 8($a0) +/* E26C50 802B6540 080AD969 */ j .L802B65A4 +/* E26C54 802B6544 AE030000 */ sw $v1, ($s0) +/* E26C58 802B6548 96020008 */ lhu $v0, 8($s0) +/* E26C5C 802B654C 2442FFFF */ addiu $v0, $v0, -1 +/* E26C60 802B6550 A6020008 */ sh $v0, 8($s0) +/* E26C64 802B6554 00021400 */ sll $v0, $v0, 0x10 +/* E26C68 802B6558 14400012 */ bnez $v0, .L802B65A4 +/* E26C6C 802B655C 3C02FFFD */ lui $v0, 0xfffd +/* E26C70 802B6560 3442FFF7 */ ori $v0, $v0, 0xfff7 +/* E26C74 802B6564 2404000A */ addiu $a0, $zero, 0xa +/* E26C78 802B6568 920300B6 */ lbu $v1, 0xb6($s0) +/* E26C7C 802B656C 8E050000 */ lw $a1, ($s0) +/* E26C80 802B6570 24630001 */ addiu $v1, $v1, 1 +/* E26C84 802B6574 00A22824 */ and $a1, $a1, $v0 +/* E26C88 802B6578 A20300B6 */ sb $v1, 0xb6($s0) +/* E26C8C 802B657C 0C039769 */ jal set_action_state +/* E26C90 802B6580 AE050000 */ sw $a1, ($s0) +/* E26C94 802B6584 080AD969 */ j .L802B65A4 +/* E26C98 802B6588 00000000 */ nop +/* E26C9C 802B658C 0C039769 */ jal set_action_state +/* E26CA0 802B6590 24040007 */ addiu $a0, $zero, 7 +/* E26CA4 802B6594 920200B6 */ lbu $v0, 0xb6($s0) +/* E26CA8 802B6598 24420001 */ addiu $v0, $v0, 1 +/* E26CAC 802B659C 0C038069 */ jal enable_player_input +/* E26CB0 802B65A0 A20200B6 */ sb $v0, 0xb6($s0) +.L802B65A4: +/* E26CB4 802B65A4 C6020070 */ lwc1 $f2, 0x70($s0) +/* E26CB8 802B65A8 44800000 */ mtc1 $zero, $f0 +/* E26CBC 802B65AC 00000000 */ nop +/* E26CC0 802B65B0 4600103C */ c.lt.s $f2, $f0 +/* E26CC4 802B65B4 00000000 */ nop +/* E26CC8 802B65B8 45000009 */ bc1f .L802B65E0 +/* E26CCC 802B65BC 00000000 */ nop +/* E26CD0 802B65C0 0C0AD97E */ jal func_802B65F8_E26D08 +/* E26CD4 802B65C4 00000000 */ nop +/* E26CD8 802B65C8 04400005 */ bltz $v0, .L802B65E0 +/* E26CDC 802B65CC AFA20010 */ sw $v0, 0x10($sp) +/* E26CE0 802B65D0 97A30012 */ lhu $v1, 0x12($sp) +/* E26CE4 802B65D4 2402FFFF */ addiu $v0, $zero, -1 +/* E26CE8 802B65D8 A6220004 */ sh $v0, 4($s1) +/* E26CEC 802B65DC A6230002 */ sh $v1, 2($s1) +.L802B65E0: +/* E26CF0 802B65E0 8FBF0020 */ lw $ra, 0x20($sp) +/* E26CF4 802B65E4 8FB1001C */ lw $s1, 0x1c($sp) +/* E26CF8 802B65E8 8FB00018 */ lw $s0, 0x18($sp) +/* E26CFC 802B65EC D7B40028 */ ldc1 $f20, 0x28($sp) +/* E26D00 802B65F0 03E00008 */ jr $ra +/* E26D04 802B65F4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_E26710/func_802B65F8_E26D08.s b/asm/nonmatchings/code_E26710/func_802B65F8_E26D08.s new file mode 100644 index 0000000000..8b075a98ea --- /dev/null +++ b/asm/nonmatchings/code_E26710/func_802B65F8_E26D08.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B65F8_E26D08 +/* E26D08 802B65F8 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* E26D0C 802B65FC 3C048011 */ lui $a0, %hi(gPlayerStatus) +/* E26D10 802B6600 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) +/* E26D14 802B6604 27A50028 */ addiu $a1, $sp, 0x28 +/* E26D18 802B6608 27A6002C */ addiu $a2, $sp, 0x2c +/* E26D1C 802B660C 27A70030 */ addiu $a3, $sp, 0x30 +/* E26D20 802B6610 AFBF0048 */ sw $ra, 0x48($sp) +/* E26D24 802B6614 848200B0 */ lh $v0, 0xb0($a0) +/* E26D28 802B6618 3C013F00 */ lui $at, 0x3f00 +/* E26D2C 802B661C 44811000 */ mtc1 $at, $f2 +/* E26D30 802B6620 C4800028 */ lwc1 $f0, 0x28($a0) +/* E26D34 802B6624 44823000 */ mtc1 $v0, $f6 +/* E26D38 802B6628 00000000 */ nop +/* E26D3C 802B662C 468031A0 */ cvt.s.w $f6, $f6 +/* E26D40 802B6630 46023082 */ mul.s $f2, $f6, $f2 +/* E26D44 802B6634 00000000 */ nop +/* E26D48 802B6638 27A20034 */ addiu $v0, $sp, 0x34 +/* E26D4C 802B663C E7A00028 */ swc1 $f0, 0x28($sp) +/* E26D50 802B6640 C480002C */ lwc1 $f0, 0x2c($a0) +/* E26D54 802B6644 C4840030 */ lwc1 $f4, 0x30($a0) +/* E26D58 802B6648 46020000 */ add.s $f0, $f0, $f2 +/* E26D5C 802B664C E7A60034 */ swc1 $f6, 0x34($sp) +/* E26D60 802B6650 E7A40030 */ swc1 $f4, 0x30($sp) +/* E26D64 802B6654 E7A0002C */ swc1 $f0, 0x2c($sp) +/* E26D68 802B6658 AFA20010 */ sw $v0, 0x10($sp) +/* E26D6C 802B665C 27A20038 */ addiu $v0, $sp, 0x38 +/* E26D70 802B6660 AFA20014 */ sw $v0, 0x14($sp) +/* E26D74 802B6664 27A2003C */ addiu $v0, $sp, 0x3c +/* E26D78 802B6668 AFA20018 */ sw $v0, 0x18($sp) +/* E26D7C 802B666C 27A20040 */ addiu $v0, $sp, 0x40 +/* E26D80 802B6670 AFA2001C */ sw $v0, 0x1c($sp) +/* E26D84 802B6674 27A20044 */ addiu $v0, $sp, 0x44 +/* E26D88 802B6678 0C03791B */ jal func_800DE46C +/* E26D8C 802B667C AFA20020 */ sw $v0, 0x20($sp) +/* E26D90 802B6680 8FBF0048 */ lw $ra, 0x48($sp) +/* E26D94 802B6684 03E00008 */ jr $ra +/* E26D98 802B6688 27BD0050 */ addiu $sp, $sp, 0x50 +/* E26D9C 802B668C 00000000 */ nop diff --git a/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s b/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s new file mode 100644 index 0000000000..514c4c91f3 --- /dev/null +++ b/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s @@ -0,0 +1,425 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E26DE0 +/* E26DE0 802B6000 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* E26DE4 802B6004 AFB00018 */ sw $s0, 0x18($sp) +/* E26DE8 802B6008 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E26DEC 802B600C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E26DF0 802B6010 AFBF0024 */ sw $ra, 0x24($sp) +/* E26DF4 802B6014 AFB20020 */ sw $s2, 0x20($sp) +/* E26DF8 802B6018 AFB1001C */ sw $s1, 0x1c($sp) +/* E26DFC 802B601C F7B60030 */ sdc1 $f22, 0x30($sp) +/* E26E00 802B6020 F7B40028 */ sdc1 $f20, 0x28($sp) +/* E26E04 802B6024 8E030000 */ lw $v1, ($s0) +/* E26E08 802B6028 3C118016 */ lui $s1, %hi(gCollisionStatus) +/* E26E0C 802B602C 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus) +/* E26E10 802B6030 0461001D */ bgez $v1, .L802B60A8 +/* E26E14 802B6034 3C027FFF */ lui $v0, 0x7fff +/* E26E18 802B6038 3442FFF9 */ ori $v0, $v0, 0xfff9 +/* E26E1C 802B603C 3C040001 */ lui $a0, 1 +/* E26E20 802B6040 3484000A */ ori $a0, $a0, 0xa +/* E26E24 802B6044 00621024 */ and $v0, $v1, $v0 +/* E26E28 802B6048 3C0140A6 */ lui $at, 0x40a6 +/* E26E2C 802B604C 34216666 */ ori $at, $at, 0x6666 +/* E26E30 802B6050 44810000 */ mtc1 $at, $f0 +/* E26E34 802B6054 3442000A */ ori $v0, $v0, 0xa +/* E26E38 802B6058 AE020000 */ sw $v0, ($s0) +/* E26E3C 802B605C A20000B6 */ sb $zero, 0xb6($s0) +/* E26E40 802B6060 AE000054 */ sw $zero, 0x54($s0) +/* E26E44 802B6064 3C01802B */ lui $at, %hi(D_802B6730) +/* E26E48 802B6068 AC206730 */ sw $zero, %lo(D_802B6730)($at) +/* E26E4C 802B606C 0C037FBF */ jal func_800DFEFC +/* E26E50 802B6070 E6000070 */ swc1 $f0, 0x70($s0) +/* E26E54 802B6074 0C03805E */ jal disable_player_input +/* E26E58 802B6078 00000000 */ nop +/* E26E5C 802B607C 24040146 */ addiu $a0, $zero, 0x146 +/* E26E60 802B6080 0000282D */ daddu $a1, $zero, $zero +/* E26E64 802B6084 3C06800B */ lui $a2, %hi(gCameras) +/* E26E68 802B6088 24C61D80 */ addiu $a2, $a2, %lo(gCameras) +/* E26E6C 802B608C 8E020000 */ lw $v0, ($s0) +/* E26E70 802B6090 94C30002 */ lhu $v1, 2($a2) +/* E26E74 802B6094 34420200 */ ori $v0, $v0, 0x200 +/* E26E78 802B6098 34630001 */ ori $v1, $v1, 1 +/* E26E7C 802B609C AE020000 */ sw $v0, ($s0) +/* E26E80 802B60A0 0C052736 */ jal play_sound_at_player +/* E26E84 802B60A4 A4C30002 */ sh $v1, 2($a2) +.L802B60A8: +/* E26E88 802B60A8 820300B6 */ lb $v1, 0xb6($s0) +/* E26E8C 802B60AC 2C62000D */ sltiu $v0, $v1, 0xd +/* E26E90 802B60B0 10400146 */ beqz $v0, .L802B65CC +/* E26E94 802B60B4 0000902D */ daddu $s2, $zero, $zero +/* E26E98 802B60B8 00031080 */ sll $v0, $v1, 2 +/* E26E9C 802B60BC 3C01802B */ lui $at, %hi(D_802B66E0) +/* E26EA0 802B60C0 00220821 */ addu $at, $at, $v0 +/* E26EA4 802B60C4 8C2266E0 */ lw $v0, %lo(D_802B66E0)($at) +/* E26EA8 802B60C8 00400008 */ jr $v0 +/* E26EAC 802B60CC 00000000 */ nop +/* E26EB0 802B60D0 3C014220 */ lui $at, 0x4220 +/* E26EB4 802B60D4 44811000 */ mtc1 $at, $f2 +/* E26EB8 802B60D8 C600008C */ lwc1 $f0, 0x8c($s0) +/* E26EBC 802B60DC 3C0143B4 */ lui $at, 0x43b4 +/* E26EC0 802B60E0 44812000 */ mtc1 $at, $f4 +/* E26EC4 802B60E4 46020000 */ add.s $f0, $f0, $f2 +/* E26EC8 802B60E8 3C01802B */ lui $at, %hi(D_802B6730) +/* E26ECC 802B60EC E4226730 */ swc1 $f2, %lo(D_802B6730)($at) +/* E26ED0 802B60F0 4600203E */ c.le.s $f4, $f0 +/* E26ED4 802B60F4 00000000 */ nop +/* E26ED8 802B60F8 45000002 */ bc1f .L802B6104 +/* E26EDC 802B60FC E600008C */ swc1 $f0, 0x8c($s0) +/* E26EE0 802B6100 E604008C */ swc1 $f4, 0x8c($s0) +.L802B6104: +/* E26EE4 802B6104 C6040070 */ lwc1 $f4, 0x70($s0) +/* E26EE8 802B6108 44800000 */ mtc1 $zero, $f0 +/* E26EEC 802B610C 00000000 */ nop +/* E26EF0 802B6110 4604003E */ c.le.s $f0, $f4 +/* E26EF4 802B6114 00000000 */ nop +/* E26EF8 802B6118 45000023 */ bc1f .L802B61A8 +/* E26EFC 802B611C 00000000 */ nop +/* E26F00 802B6120 3C01802B */ lui $at, %hi(D_802B6718) +/* E26F04 802B6124 D4226718 */ ldc1 $f2, %lo(D_802B6718)($at) +/* E26F08 802B6128 46002021 */ cvt.d.s $f0, $f4 +/* E26F0C 802B612C 46220001 */ sub.d $f0, $f0, $f2 +/* E26F10 802B6130 462000A0 */ cvt.s.d $f2, $f0 +/* E26F14 802B6134 E6020070 */ swc1 $f2, 0x70($s0) +/* E26F18 802B6138 86240008 */ lh $a0, 8($s1) +/* E26F1C 802B613C 96220008 */ lhu $v0, 8($s1) +/* E26F20 802B6140 04810004 */ bgez $a0, .L802B6154 +/* E26F24 802B6144 30424000 */ andi $v0, $v0, 0x4000 +/* E26F28 802B6148 C600002C */ lwc1 $f0, 0x2c($s0) +/* E26F2C 802B614C 080AD869 */ j .L802B61A4 +/* E26F30 802B6150 46020000 */ add.s $f0, $f0, $f2 +.L802B6154: +/* E26F34 802B6154 10400014 */ beqz $v0, .L802B61A8 +/* E26F38 802B6158 00000000 */ nop +/* E26F3C 802B615C 0C04417A */ jal get_entity_by_index +/* E26F40 802B6160 00000000 */ nop +/* E26F44 802B6164 0040182D */ daddu $v1, $v0, $zero +/* E26F48 802B6168 1060000F */ beqz $v1, .L802B61A8 +/* E26F4C 802B616C 00000000 */ nop +/* E26F50 802B6170 860200B0 */ lh $v0, 0xb0($s0) +/* E26F54 802B6174 3C013FE0 */ lui $at, 0x3fe0 +/* E26F58 802B6178 44810800 */ mtc1 $at, $f1 +/* E26F5C 802B617C 44800000 */ mtc1 $zero, $f0 +/* E26F60 802B6180 44821000 */ mtc1 $v0, $f2 +/* E26F64 802B6184 00000000 */ nop +/* E26F68 802B6188 468010A1 */ cvt.d.w $f2, $f2 +/* E26F6C 802B618C 46201082 */ mul.d $f2, $f2, $f0 +/* E26F70 802B6190 00000000 */ nop +/* E26F74 802B6194 C460004C */ lwc1 $f0, 0x4c($v1) +/* E26F78 802B6198 46000021 */ cvt.d.s $f0, $f0 +/* E26F7C 802B619C 46220001 */ sub.d $f0, $f0, $f2 +/* E26F80 802B61A0 46200020 */ cvt.s.d $f0, $f0 +.L802B61A4: +/* E26F84 802B61A4 E600002C */ swc1 $f0, 0x2c($s0) +.L802B61A8: +/* E26F88 802B61A8 C602008C */ lwc1 $f2, 0x8c($s0) +/* E26F8C 802B61AC 3C0143B4 */ lui $at, 0x43b4 +/* E26F90 802B61B0 44810000 */ mtc1 $at, $f0 +/* E26F94 802B61B4 00000000 */ nop +/* E26F98 802B61B8 46001032 */ c.eq.s $f2, $f0 +/* E26F9C 802B61BC 00000000 */ nop +/* E26FA0 802B61C0 4500000F */ bc1f .L802B6200 +/* E26FA4 802B61C4 2402FFFF */ addiu $v0, $zero, -1 +/* E26FA8 802B61C8 C6020070 */ lwc1 $f2, 0x70($s0) +/* E26FAC 802B61CC 44800000 */ mtc1 $zero, $f0 +/* E26FB0 802B61D0 00000000 */ nop +/* E26FB4 802B61D4 4600103E */ c.le.s $f2, $f0 +/* E26FB8 802B61D8 00000000 */ nop +/* E26FBC 802B61DC 45000007 */ bc1f .L802B61FC +/* E26FC0 802B61E0 24020005 */ addiu $v0, $zero, 5 +/* E26FC4 802B61E4 3C014000 */ lui $at, 0x4000 +/* E26FC8 802B61E8 44810000 */ mtc1 $at, $f0 +/* E26FCC 802B61EC A6020008 */ sh $v0, 8($s0) +/* E26FD0 802B61F0 24020002 */ addiu $v0, $zero, 2 +/* E26FD4 802B61F4 A20200B6 */ sb $v0, 0xb6($s0) +/* E26FD8 802B61F8 E6000070 */ swc1 $f0, 0x70($s0) +.L802B61FC: +/* E26FDC 802B61FC 2402FFFF */ addiu $v0, $zero, -1 +.L802B6200: +/* E26FE0 802B6200 080AD973 */ j .L802B65CC +/* E26FE4 802B6204 A6220008 */ sh $v0, 8($s1) +/* E26FE8 802B6208 C6020070 */ lwc1 $f2, 0x70($s0) +/* E26FEC 802B620C 44800000 */ mtc1 $zero, $f0 +/* E26FF0 802B6210 00000000 */ nop +/* E26FF4 802B6214 4602003E */ c.le.s $f0, $f2 +/* E26FF8 802B6218 00000000 */ nop +/* E26FFC 802B621C 4500000C */ bc1f .L802B6250 +/* E27000 802B6220 00000000 */ nop +/* E27004 802B6224 3C01802B */ lui $at, %hi(D_802B6720) +/* E27008 802B6228 D4206720 */ ldc1 $f0, %lo(D_802B6720)($at) +/* E2700C 802B622C 460010A1 */ cvt.d.s $f2, $f2 +/* E27010 802B6230 46201081 */ sub.d $f2, $f2, $f0 +/* E27014 802B6234 86220008 */ lh $v0, 8($s1) +/* E27018 802B6238 462010A0 */ cvt.s.d $f2, $f2 +/* E2701C 802B623C 04410004 */ bgez $v0, .L802B6250 +/* E27020 802B6240 E6020070 */ swc1 $f2, 0x70($s0) +/* E27024 802B6244 C600002C */ lwc1 $f0, 0x2c($s0) +/* E27028 802B6248 46020000 */ add.s $f0, $f0, $f2 +/* E2702C 802B624C E600002C */ swc1 $f0, 0x2c($s0) +.L802B6250: +/* E27030 802B6250 96020008 */ lhu $v0, 8($s0) +/* E27034 802B6254 2442FFFF */ addiu $v0, $v0, -1 +/* E27038 802B6258 A6020008 */ sh $v0, 8($s0) +/* E2703C 802B625C 00021400 */ sll $v0, $v0, 0x10 +/* E27040 802B6260 1C4000DA */ bgtz $v0, .L802B65CC +/* E27044 802B6264 00000000 */ nop +/* E27048 802B6268 920200B6 */ lbu $v0, 0xb6($s0) +/* E2704C 802B626C 24420001 */ addiu $v0, $v0, 1 +/* E27050 802B6270 080AD973 */ j .L802B65CC +/* E27054 802B6274 A20200B6 */ sb $v0, 0xb6($s0) +/* E27058 802B6278 4480A000 */ mtc1 $zero, $f20 +/* E2705C 802B627C 27A50010 */ addiu $a1, $sp, 0x10 +/* E27060 802B6280 0C038D45 */ jal func_800E3514 +/* E27064 802B6284 4600A306 */ mov.s $f12, $f20 +/* E27068 802B6288 3C014234 */ lui $at, 0x4234 +/* E2706C 802B628C 44811000 */ mtc1 $at, $f2 +/* E27070 802B6290 C604008C */ lwc1 $f4, 0x8c($s0) +/* E27074 802B6294 E600002C */ swc1 $f0, 0x2c($s0) +/* E27078 802B6298 46022100 */ add.s $f4, $f4, $f2 +/* E2707C 802B629C 3C01802B */ lui $at, %hi(D_802B6730) +/* E27080 802B62A0 E4226730 */ swc1 $f2, %lo(D_802B6730)($at) +/* E27084 802B62A4 3C01802B */ lui $at, %hi(D_802B6728) +/* E27088 802B62A8 D4226728 */ ldc1 $f2, %lo(D_802B6728)($at) +/* E2708C 802B62AC 46002021 */ cvt.d.s $f0, $f4 +/* E27090 802B62B0 4620103E */ c.le.d $f2, $f0 +/* E27094 802B62B4 00000000 */ nop +/* E27098 802B62B8 450000C4 */ bc1f .L802B65CC +/* E2709C 802B62BC E604008C */ swc1 $f4, 0x8c($s0) +/* E270A0 802B62C0 3C040001 */ lui $a0, 1 +/* E270A4 802B62C4 3C01C05E */ lui $at, 0xc05e +/* E270A8 802B62C8 34215C92 */ ori $at, $at, 0x5c92 +/* E270AC 802B62CC 44810000 */ mtc1 $at, $f0 +/* E270B0 802B62D0 920200B6 */ lbu $v0, 0xb6($s0) +/* E270B4 802B62D4 3C01BF98 */ lui $at, 0xbf98 +/* E270B8 802B62D8 34215F07 */ ori $at, $at, 0x5f07 +/* E270BC 802B62DC 44811000 */ mtc1 $at, $f2 +/* E270C0 802B62E0 3484000B */ ori $a0, $a0, 0xb +/* E270C4 802B62E4 E614008C */ swc1 $f20, 0x8c($s0) +/* E270C8 802B62E8 E6000074 */ swc1 $f0, 0x74($s0) +/* E270CC 802B62EC 3C013EF0 */ lui $at, 0x3ef0 +/* E270D0 802B62F0 3421D845 */ ori $at, $at, 0xd845 +/* E270D4 802B62F4 44810000 */ mtc1 $at, $f0 +/* E270D8 802B62F8 C6040074 */ lwc1 $f4, 0x74($s0) +/* E270DC 802B62FC 24420001 */ addiu $v0, $v0, 1 +/* E270E0 802B6300 A20200B6 */ sb $v0, 0xb6($s0) +/* E270E4 802B6304 E602007C */ swc1 $f2, 0x7c($s0) +/* E270E8 802B6308 E6000078 */ swc1 $f0, 0x78($s0) +/* E270EC 802B630C 0C037FBF */ jal func_800DFEFC +/* E270F0 802B6310 E6040070 */ swc1 $f4, 0x70($s0) +/* E270F4 802B6314 080AD973 */ j .L802B65CC +/* E270F8 802B6318 00000000 */ nop +/* E270FC 802B631C 0C038D36 */ jal func_800E34D8 +/* E27100 802B6320 00000000 */ nop +/* E27104 802B6324 46000506 */ mov.s $f20, $f0 +/* E27108 802B6328 4600A306 */ mov.s $f12, $f20 +/* E2710C 802B632C 0C038D45 */ jal func_800E3514 +/* E27110 802B6330 27A50010 */ addiu $a1, $sp, 0x10 +/* E27114 802B6334 3C01C2C8 */ lui $at, 0xc2c8 +/* E27118 802B6338 44811000 */ mtc1 $at, $f2 +/* E2711C 802B633C 00000000 */ nop +/* E27120 802B6340 4602A03C */ c.lt.s $f20, $f2 +/* E27124 802B6344 00000000 */ nop +/* E27128 802B6348 45000005 */ bc1f .L802B6360 +/* E2712C 802B634C E600002C */ swc1 $f0, 0x2c($s0) +/* E27130 802B6350 AE00007C */ sw $zero, 0x7c($s0) +/* E27134 802B6354 AE000078 */ sw $zero, 0x78($s0) +/* E27138 802B6358 AE000074 */ sw $zero, 0x74($s0) +/* E2713C 802B635C E6020070 */ swc1 $f2, 0x70($s0) +.L802B6360: +/* E27140 802B6360 8FA20010 */ lw $v0, 0x10($sp) +/* E27144 802B6364 04400099 */ bltz $v0, .L802B65CC +/* E27148 802B6368 00000000 */ nop +/* E2714C 802B636C 96240002 */ lhu $a0, 2($s1) +/* E27150 802B6370 30824000 */ andi $v0, $a0, 0x4000 +/* E27154 802B6374 10400013 */ beqz $v0, .L802B63C4 +/* E27158 802B6378 00042400 */ sll $a0, $a0, 0x10 +/* E2715C 802B637C 0C0441A9 */ jal get_entity_type +/* E27160 802B6380 00042403 */ sra $a0, $a0, 0x10 +/* E27164 802B6384 2442FFF9 */ addiu $v0, $v0, -7 +/* E27168 802B6388 2C420002 */ sltiu $v0, $v0, 2 +/* E2716C 802B638C 1040000D */ beqz $v0, .L802B63C4 +/* E27170 802B6390 00000000 */ nop +/* E27174 802B6394 0C04417A */ jal get_entity_by_index +/* E27178 802B6398 86240002 */ lh $a0, 2($s1) +/* E2717C 802B639C 90430006 */ lbu $v1, 6($v0) +/* E27180 802B63A0 34630001 */ ori $v1, $v1, 1 +/* E27184 802B63A4 A0430006 */ sb $v1, 6($v0) +/* E27188 802B63A8 2402000B */ addiu $v0, $zero, 0xb +/* E2718C 802B63AC A20200B6 */ sb $v0, 0xb6($s0) +/* E27190 802B63B0 8E020000 */ lw $v0, ($s0) +/* E27194 802B63B4 2403FFF7 */ addiu $v1, $zero, -9 +/* E27198 802B63B8 00431024 */ and $v0, $v0, $v1 +/* E2719C 802B63BC 080AD973 */ j .L802B65CC +/* E271A0 802B63C0 AE020000 */ sw $v0, ($s0) +.L802B63C4: +/* E271A4 802B63C4 8FA40010 */ lw $a0, 0x10($sp) +/* E271A8 802B63C8 0C016F6A */ jal get_collider_type_by_id +/* E271AC 802B63CC 00000000 */ nop +/* E271B0 802B63D0 304300FF */ andi $v1, $v0, 0xff +/* E271B4 802B63D4 24020003 */ addiu $v0, $zero, 3 +/* E271B8 802B63D8 54620009 */ bnel $v1, $v0, .L802B6400 +/* E271BC 802B63DC 24020002 */ addiu $v0, $zero, 2 +/* E271C0 802B63E0 24040017 */ addiu $a0, $zero, 0x17 +/* E271C4 802B63E4 24020001 */ addiu $v0, $zero, 1 +/* E271C8 802B63E8 0C039769 */ jal set_action_state +/* E271CC 802B63EC A20200BF */ sb $v0, 0xbf($s0) +/* E271D0 802B63F0 8E020000 */ lw $v0, ($s0) +/* E271D4 802B63F4 2403FFF7 */ addiu $v1, $zero, -9 +/* E271D8 802B63F8 080AD906 */ j .L802B6418 +/* E271DC 802B63FC 34420800 */ ori $v0, $v0, 0x800 +.L802B6400: +/* E271E0 802B6400 14620008 */ bne $v1, $v0, .L802B6424 +/* E271E4 802B6404 3C040001 */ lui $a0, 1 +/* E271E8 802B6408 0C039769 */ jal set_action_state +/* E271EC 802B640C 24040017 */ addiu $a0, $zero, 0x17 +/* E271F0 802B6410 8E020000 */ lw $v0, ($s0) +/* E271F4 802B6414 2403FFF7 */ addiu $v1, $zero, -9 +.L802B6418: +/* E271F8 802B6418 00431024 */ and $v0, $v0, $v1 +/* E271FC 802B641C 080AD98A */ j .L802B6628 +/* E27200 802B6420 AE020000 */ sw $v0, ($s0) +.L802B6424: +/* E27204 802B6424 3C01C05E */ lui $at, 0xc05e +/* E27208 802B6428 34215C92 */ ori $at, $at, 0x5c92 +/* E2720C 802B642C 44810000 */ mtc1 $at, $f0 +/* E27210 802B6430 3C013EF0 */ lui $at, 0x3ef0 +/* E27214 802B6434 3421D845 */ ori $at, $at, 0xd845 +/* E27218 802B6438 44811000 */ mtc1 $at, $f2 +/* E2721C 802B643C 3C01BF98 */ lui $at, 0xbf98 +/* E27220 802B6440 34215F07 */ ori $at, $at, 0x5f07 +/* E27224 802B6444 44812000 */ mtc1 $at, $f4 +/* E27228 802B6448 3C014120 */ lui $at, 0x4120 +/* E2722C 802B644C 44813000 */ mtc1 $at, $f6 +/* E27230 802B6450 3484000B */ ori $a0, $a0, 0xb +/* E27234 802B6454 E6000074 */ swc1 $f0, 0x74($s0) +/* E27238 802B6458 E6020078 */ swc1 $f2, 0x78($s0) +/* E2723C 802B645C E604007C */ swc1 $f4, 0x7c($s0) +/* E27240 802B6460 0C037FBF */ jal func_800DFEFC +/* E27244 802B6464 E6060070 */ swc1 $f6, 0x70($s0) +/* E27248 802B6468 0000202D */ daddu $a0, $zero, $zero +/* E2724C 802B646C 0080282D */ daddu $a1, $a0, $zero +/* E27250 802B6470 2402000E */ addiu $v0, $zero, 0xe +/* E27254 802B6474 A20200B4 */ sb $v0, 0xb4($s0) +/* E27258 802B6478 2402000C */ addiu $v0, $zero, 0xc +/* E2725C 802B647C 920300B6 */ lbu $v1, 0xb6($s0) +/* E27260 802B6480 24060004 */ addiu $a2, $zero, 4 +/* E27264 802B6484 A60000C0 */ sh $zero, 0xc0($s0) +/* E27268 802B6488 A2020280 */ sb $v0, 0x280($s0) +/* E2726C 802B648C AE00008C */ sw $zero, 0x8c($s0) +/* E27270 802B6490 24630001 */ addiu $v1, $v1, 1 +/* E27274 802B6494 0C0B2D5B */ jal exec_ShakeCam1 +/* E27278 802B6498 A20300B6 */ sb $v1, 0xb6($s0) +/* E2727C 802B649C 24040149 */ addiu $a0, $zero, 0x149 +/* E27280 802B64A0 0C052736 */ jal play_sound_at_player +/* E27284 802B64A4 0000282D */ daddu $a1, $zero, $zero +/* E27288 802B64A8 24040080 */ addiu $a0, $zero, 0x80 +/* E2728C 802B64AC 0C00A3C2 */ jal start_rumble +/* E27290 802B64B0 24050019 */ addiu $a1, $zero, 0x19 +/* E27294 802B64B4 3C048016 */ lui $a0, %hi(D_8015A578) +/* E27298 802B64B8 2484A578 */ addiu $a0, $a0, %lo(D_8015A578) +/* E2729C 802B64BC C600002C */ lwc1 $f0, 0x2c($s0) +/* E272A0 802B64C0 8E030000 */ lw $v1, ($s0) +/* E272A4 802B64C4 24020001 */ addiu $v0, $zero, 1 +/* E272A8 802B64C8 A0820000 */ sb $v0, ($a0) +/* E272AC 802B64CC 34630400 */ ori $v1, $v1, 0x400 +/* E272B0 802B64D0 E4800008 */ swc1 $f0, 8($a0) +/* E272B4 802B64D4 080AD973 */ j .L802B65CC +/* E272B8 802B64D8 AE030000 */ sw $v1, ($s0) +/* E272BC 802B64DC 0C038D12 */ jal integrate_gravity +/* E272C0 802B64E0 00000000 */ nop +/* E272C4 802B64E4 4480B000 */ mtc1 $zero, $f22 +/* E272C8 802B64E8 46000506 */ mov.s $f20, $f0 +/* E272CC 802B64EC 4616A032 */ c.eq.s $f20, $f22 +/* E272D0 802B64F0 00000000 */ nop +/* E272D4 802B64F4 45030035 */ bc1tl .L802B65CC +/* E272D8 802B64F8 24120001 */ addiu $s2, $zero, 1 +/* E272DC 802B64FC C6000070 */ lwc1 $f0, 0x70($s0) +/* E272E0 802B6500 4600B03C */ c.lt.s $f22, $f0 +/* E272E4 802B6504 00000000 */ nop +/* E272E8 802B6508 45000005 */ bc1f .L802B6520 +/* E272EC 802B650C 4600A306 */ mov.s $f12, $f20 +/* E272F0 802B6510 C600002C */ lwc1 $f0, 0x2c($s0) +/* E272F4 802B6514 46140000 */ add.s $f0, $f0, $f20 +/* E272F8 802B6518 080AD955 */ j .L802B6554 +/* E272FC 802B651C E600002C */ swc1 $f0, 0x2c($s0) +.L802B6520: +/* E27300 802B6520 0C038D45 */ jal func_800E3514 +/* E27304 802B6524 27A50010 */ addiu $a1, $sp, 0x10 +/* E27308 802B6528 C6020070 */ lwc1 $f2, 0x70($s0) +/* E2730C 802B652C 4616103C */ c.lt.s $f2, $f22 +/* E27310 802B6530 00000000 */ nop +/* E27314 802B6534 45000007 */ bc1f .L802B6554 +/* E27318 802B6538 E600002C */ swc1 $f0, 0x2c($s0) +/* E2731C 802B653C 8FA20010 */ lw $v0, 0x10($sp) +/* E27320 802B6540 04400004 */ bltz $v0, .L802B6554 +/* E27324 802B6544 00000000 */ nop +/* E27328 802B6548 920200B6 */ lbu $v0, 0xb6($s0) +/* E2732C 802B654C 24420001 */ addiu $v0, $v0, 1 +/* E27330 802B6550 A20200B6 */ sb $v0, 0xb6($s0) +.L802B6554: +/* E27334 802B6554 44806000 */ mtc1 $zero, $f12 +/* E27338 802B6558 0C038D45 */ jal func_800E3514 +/* E2733C 802B655C 27A50010 */ addiu $a1, $sp, 0x10 +/* E27340 802B6560 080AD973 */ j .L802B65CC +/* E27344 802B6564 E600002C */ swc1 $f0, 0x2c($s0) +/* E27348 802B6568 4480A000 */ mtc1 $zero, $f20 +/* E2734C 802B656C 27A50010 */ addiu $a1, $sp, 0x10 +/* E27350 802B6570 0C038D45 */ jal func_800E3514 +/* E27354 802B6574 4600A306 */ mov.s $f12, $f20 +/* E27358 802B6578 8FA20010 */ lw $v0, 0x10($sp) +/* E2735C 802B657C 04400005 */ bltz $v0, .L802B6594 +/* E27360 802B6580 E600002C */ swc1 $f0, 0x2c($s0) +/* E27364 802B6584 E6140070 */ swc1 $f20, 0x70($s0) +/* E27368 802B6588 E6140074 */ swc1 $f20, 0x74($s0) +/* E2736C 802B658C E6140078 */ swc1 $f20, 0x78($s0) +/* E27370 802B6590 E614007C */ swc1 $f20, 0x7c($s0) +.L802B6594: +/* E27374 802B6594 92020280 */ lbu $v0, 0x280($s0) +/* E27378 802B6598 2442FFFF */ addiu $v0, $v0, -1 +/* E2737C 802B659C A2020280 */ sb $v0, 0x280($s0) +/* E27380 802B65A0 00021600 */ sll $v0, $v0, 0x18 +/* E27384 802B65A4 1C400009 */ bgtz $v0, .L802B65CC +/* E27388 802B65A8 00000000 */ nop +/* E2738C 802B65AC 080AD973 */ j .L802B65CC +/* E27390 802B65B0 24120001 */ addiu $s2, $zero, 1 +/* E27394 802B65B4 0C039769 */ jal set_action_state +/* E27398 802B65B8 24040007 */ addiu $a0, $zero, 7 +/* E2739C 802B65BC 920200B6 */ lbu $v0, 0xb6($s0) +/* E273A0 802B65C0 24420001 */ addiu $v0, $v0, 1 +/* E273A4 802B65C4 0C038069 */ jal enable_player_input +/* E273A8 802B65C8 A20200B6 */ sb $v0, 0xb6($s0) +.L802B65CC: +/* E273AC 802B65CC 12400007 */ beqz $s2, .L802B65EC +/* E273B0 802B65D0 00000000 */ nop +/* E273B4 802B65D4 0C039769 */ jal set_action_state +/* E273B8 802B65D8 2404000A */ addiu $a0, $zero, 0xa +/* E273BC 802B65DC 8E020000 */ lw $v0, ($s0) +/* E273C0 802B65E0 2403FFF7 */ addiu $v1, $zero, -9 +/* E273C4 802B65E4 00431024 */ and $v0, $v0, $v1 +/* E273C8 802B65E8 AE020000 */ sw $v0, ($s0) +.L802B65EC: +/* E273CC 802B65EC C6020070 */ lwc1 $f2, 0x70($s0) +/* E273D0 802B65F0 44800000 */ mtc1 $zero, $f0 +/* E273D4 802B65F4 00000000 */ nop +/* E273D8 802B65F8 4600103C */ c.lt.s $f2, $f0 +/* E273DC 802B65FC 00000000 */ nop +/* E273E0 802B6600 45000009 */ bc1f .L802B6628 +/* E273E4 802B6604 00000000 */ nop +/* E273E8 802B6608 0C0AD992 */ jal func_802B6648_E27428 +/* E273EC 802B660C 00000000 */ nop +/* E273F0 802B6610 04400005 */ bltz $v0, .L802B6628 +/* E273F4 802B6614 AFA20010 */ sw $v0, 0x10($sp) +/* E273F8 802B6618 97A30012 */ lhu $v1, 0x12($sp) +/* E273FC 802B661C 2402FFFF */ addiu $v0, $zero, -1 +/* E27400 802B6620 A6220004 */ sh $v0, 4($s1) +/* E27404 802B6624 A6230002 */ sh $v1, 2($s1) +.L802B6628: +/* E27408 802B6628 8FBF0024 */ lw $ra, 0x24($sp) +/* E2740C 802B662C 8FB20020 */ lw $s2, 0x20($sp) +/* E27410 802B6630 8FB1001C */ lw $s1, 0x1c($sp) +/* E27414 802B6634 8FB00018 */ lw $s0, 0x18($sp) +/* E27418 802B6638 D7B60030 */ ldc1 $f22, 0x30($sp) +/* E2741C 802B663C D7B40028 */ ldc1 $f20, 0x28($sp) +/* E27420 802B6640 03E00008 */ jr $ra +/* E27424 802B6644 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_E26DE0/func_802B6648_E27428.s b/asm/nonmatchings/code_E26DE0/func_802B6648_E27428.s new file mode 100644 index 0000000000..4692282817 --- /dev/null +++ b/asm/nonmatchings/code_E26DE0/func_802B6648_E27428.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6648_E27428 +/* E27428 802B6648 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* E2742C 802B664C 3C048011 */ lui $a0, %hi(gPlayerStatus) +/* E27430 802B6650 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) +/* E27434 802B6654 27A50028 */ addiu $a1, $sp, 0x28 +/* E27438 802B6658 27A6002C */ addiu $a2, $sp, 0x2c +/* E2743C 802B665C 27A70030 */ addiu $a3, $sp, 0x30 +/* E27440 802B6660 AFBF0048 */ sw $ra, 0x48($sp) +/* E27444 802B6664 848200B0 */ lh $v0, 0xb0($a0) +/* E27448 802B6668 3C013F00 */ lui $at, 0x3f00 +/* E2744C 802B666C 44811000 */ mtc1 $at, $f2 +/* E27450 802B6670 C4800028 */ lwc1 $f0, 0x28($a0) +/* E27454 802B6674 44823000 */ mtc1 $v0, $f6 +/* E27458 802B6678 00000000 */ nop +/* E2745C 802B667C 468031A0 */ cvt.s.w $f6, $f6 +/* E27460 802B6680 46023082 */ mul.s $f2, $f6, $f2 +/* E27464 802B6684 00000000 */ nop +/* E27468 802B6688 27A20034 */ addiu $v0, $sp, 0x34 +/* E2746C 802B668C E7A00028 */ swc1 $f0, 0x28($sp) +/* E27470 802B6690 C480002C */ lwc1 $f0, 0x2c($a0) +/* E27474 802B6694 C4840030 */ lwc1 $f4, 0x30($a0) +/* E27478 802B6698 46020000 */ add.s $f0, $f0, $f2 +/* E2747C 802B669C E7A60034 */ swc1 $f6, 0x34($sp) +/* E27480 802B66A0 E7A40030 */ swc1 $f4, 0x30($sp) +/* E27484 802B66A4 E7A0002C */ swc1 $f0, 0x2c($sp) +/* E27488 802B66A8 AFA20010 */ sw $v0, 0x10($sp) +/* E2748C 802B66AC 27A20038 */ addiu $v0, $sp, 0x38 +/* E27490 802B66B0 AFA20014 */ sw $v0, 0x14($sp) +/* E27494 802B66B4 27A2003C */ addiu $v0, $sp, 0x3c +/* E27498 802B66B8 AFA20018 */ sw $v0, 0x18($sp) +/* E2749C 802B66BC 27A20040 */ addiu $v0, $sp, 0x40 +/* E274A0 802B66C0 AFA2001C */ sw $v0, 0x1c($sp) +/* E274A4 802B66C4 27A20044 */ addiu $v0, $sp, 0x44 +/* E274A8 802B66C8 0C03791B */ jal func_800DE46C +/* E274AC 802B66CC AFA20020 */ sw $v0, 0x20($sp) +/* E274B0 802B66D0 8FBF0048 */ lw $ra, 0x48($sp) +/* E274B4 802B66D4 03E00008 */ jr $ra +/* E274B8 802B66D8 27BD0050 */ addiu $sp, $sp, 0x50 +/* E274BC 802B66DC 00000000 */ nop diff --git a/asm/nonmatchings/code_E27510/func_802B6000_E27510.s b/asm/nonmatchings/code_E27510/func_802B6000_E27510.s new file mode 100644 index 0000000000..5e8355d0fa --- /dev/null +++ b/asm/nonmatchings/code_E27510/func_802B6000_E27510.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E27510 +/* E27510 802B6000 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* E27514 802B6004 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* E27518 802B6008 8C6200D0 */ lw $v0, 0xd0($v1) +/* E2751C 802B600C C4400010 */ lwc1 $f0, 0x10($v0) +/* E27520 802B6010 E4600070 */ swc1 $f0, 0x70($v1) +/* E27524 802B6014 C4400014 */ lwc1 $f0, 0x14($v0) +/* E27528 802B6018 E4600074 */ swc1 $f0, 0x74($v1) +/* E2752C 802B601C C4400018 */ lwc1 $f0, 0x18($v0) +/* E27530 802B6020 E4600078 */ swc1 $f0, 0x78($v1) +/* E27534 802B6024 C440001C */ lwc1 $f0, 0x1c($v0) +/* E27538 802B6028 E460007C */ swc1 $f0, 0x7c($v1) +/* E2753C 802B602C C4400000 */ lwc1 $f0, ($v0) +/* E27540 802B6030 E46000A0 */ swc1 $f0, 0xa0($v1) +/* E27544 802B6034 C4400004 */ lwc1 $f0, 4($v0) +/* E27548 802B6038 C4420008 */ lwc1 $f2, 8($v0) +/* E2754C 802B603C C444000C */ lwc1 $f4, 0xc($v0) +/* E27550 802B6040 3C01802B */ lui $at, %hi(D_802B6784) +/* E27554 802B6044 E4206784 */ swc1 $f0, %lo(D_802B6784)($at) +/* E27558 802B6048 3C01802B */ lui $at, %hi(D_802B678C) +/* E2755C 802B604C E422678C */ swc1 $f2, %lo(D_802B678C)($at) +/* E27560 802B6050 3C01802B */ lui $at, %hi(D_802B6788) +/* E27564 802B6054 E4246788 */ swc1 $f4, %lo(D_802B6788)($at) +/* E27568 802B6058 03E00008 */ jr $ra +/* E2756C 802B605C 00000000 */ nop diff --git a/asm/nonmatchings/code_E27510/func_802B6060_E27570.s b/asm/nonmatchings/code_E27510/func_802B6060_E27570.s new file mode 100644 index 0000000000..bc4334ebb3 --- /dev/null +++ b/asm/nonmatchings/code_E27510/func_802B6060_E27570.s @@ -0,0 +1,461 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6060_E27570 +/* E27570 802B6060 27BDFF90 */ addiu $sp, $sp, -0x70 +/* E27574 802B6064 AFB00058 */ sw $s0, 0x58($sp) +/* E27578 802B6068 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E2757C 802B606C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E27580 802B6070 AFBF0064 */ sw $ra, 0x64($sp) +/* E27584 802B6074 AFB20060 */ sw $s2, 0x60($sp) +/* E27588 802B6078 AFB1005C */ sw $s1, 0x5c($sp) +/* E2758C 802B607C F7B40068 */ sdc1 $f20, 0x68($sp) +/* E27590 802B6080 8E040000 */ lw $a0, ($s0) +/* E27594 802B6084 04830021 */ bgezl $a0, .L802B610C +/* E27598 802B6088 0200202D */ daddu $a0, $s0, $zero +/* E2759C 802B608C 3C027FFF */ lui $v0, 0x7fff +/* E275A0 802B6090 3442FFFF */ ori $v0, $v0, 0xffff +/* E275A4 802B6094 8E030004 */ lw $v1, 4($s0) +/* E275A8 802B6098 00821024 */ and $v0, $a0, $v0 +/* E275AC 802B609C AE020000 */ sw $v0, ($s0) +/* E275B0 802B60A0 A20000B6 */ sb $zero, 0xb6($s0) +/* E275B4 802B60A4 AE000054 */ sw $zero, 0x54($s0) +/* E275B8 802B60A8 34630004 */ ori $v1, $v1, 4 +/* E275BC 802B60AC 0C0AD800 */ jal func_802B6000_E27510 +/* E275C0 802B60B0 AE030004 */ sw $v1, 4($s0) +/* E275C4 802B60B4 3C040001 */ lui $a0, 1 +/* E275C8 802B60B8 3C01802B */ lui $at, %hi(D_802B6780) +/* E275CC 802B60BC AC206780 */ sw $zero, %lo(D_802B6780)($at) +/* E275D0 802B60C0 3C01802B */ lui $at, %hi(D_802B6790) +/* E275D4 802B60C4 AC206790 */ sw $zero, %lo(D_802B6790)($at) +/* E275D8 802B60C8 3C01802B */ lui $at, %hi(D_802B6794) +/* E275DC 802B60CC AC206794 */ sw $zero, %lo(D_802B6794)($at) +/* E275E0 802B60D0 3C01802B */ lui $at, %hi(D_802B6798) +/* E275E4 802B60D4 AC206798 */ sw $zero, %lo(D_802B6798)($at) +/* E275E8 802B60D8 3C01802B */ lui $at, %hi(D_802B679C) +/* E275EC 802B60DC AC20679C */ sw $zero, %lo(D_802B679C)($at) +/* E275F0 802B60E0 0C037FBF */ jal func_800DFEFC +/* E275F4 802B60E4 3484000A */ ori $a0, $a0, 0xa +/* E275F8 802B60E8 24040167 */ addiu $a0, $zero, 0x167 +/* E275FC 802B60EC 0C052736 */ jal play_sound_at_player +/* E27600 802B60F0 0000282D */ daddu $a1, $zero, $zero +/* E27604 802B60F4 3C03800B */ lui $v1, %hi(gCameras) +/* E27608 802B60F8 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* E2760C 802B60FC 94620002 */ lhu $v0, 2($v1) +/* E27610 802B6100 34420001 */ ori $v0, $v0, 1 +/* E27614 802B6104 A4620002 */ sh $v0, 2($v1) +/* E27618 802B6108 0200202D */ daddu $a0, $s0, $zero +.L802B610C: +/* E2761C 802B610C 27A50028 */ addiu $a1, $sp, 0x28 +/* E27620 802B6110 27A6002C */ addiu $a2, $sp, 0x2c +/* E27624 802B6114 C6080054 */ lwc1 $f8, 0x54($s0) +/* E27628 802B6118 C6000028 */ lwc1 $f0, 0x28($s0) +/* E2762C 802B611C C602002C */ lwc1 $f2, 0x2c($s0) +/* E27630 802B6120 C6040030 */ lwc1 $f4, 0x30($s0) +/* E27634 802B6124 C60600A0 */ lwc1 $f6, 0xa0($s0) +/* E27638 802B6128 27A70030 */ addiu $a3, $sp, 0x30 +/* E2763C 802B612C E7A00028 */ swc1 $f0, 0x28($sp) +/* E27640 802B6130 E7A2002C */ swc1 $f2, 0x2c($sp) +/* E27644 802B6134 E7A40030 */ swc1 $f4, 0x30($sp) +/* E27648 802B6138 E7A80010 */ swc1 $f8, 0x10($sp) +/* E2764C 802B613C 0C037D18 */ jal test_player_lateral +/* E27650 802B6140 E7A60014 */ swc1 $f6, 0x14($sp) +/* E27654 802B6144 C7A00028 */ lwc1 $f0, 0x28($sp) +/* E27658 802B6148 C7A20030 */ lwc1 $f2, 0x30($sp) +/* E2765C 802B614C C7A4002C */ lwc1 $f4, 0x2c($sp) +/* E27660 802B6150 820300B6 */ lb $v1, 0xb6($s0) +/* E27664 802B6154 AFA20048 */ sw $v0, 0x48($sp) +/* E27668 802B6158 2C620008 */ sltiu $v0, $v1, 8 +/* E2766C 802B615C E6000028 */ swc1 $f0, 0x28($s0) +/* E27670 802B6160 E6020030 */ swc1 $f2, 0x30($s0) +/* E27674 802B6164 1040016D */ beqz $v0, .L802B671C +/* E27678 802B6168 E604002C */ swc1 $f4, 0x2c($s0) +/* E2767C 802B616C 00031080 */ sll $v0, $v1, 2 +/* E27680 802B6170 3C01802B */ lui $at, %hi(D_802B6740) +/* E27684 802B6174 00220821 */ addu $at, $at, $v0 +/* E27688 802B6178 8C226740 */ lw $v0, %lo(D_802B6740)($at) +/* E2768C 802B617C 00400008 */ jr $v0 +/* E27690 802B6180 00000000 */ nop +/* E27694 802B6184 3C02802B */ lui $v0, %hi(D_802B6780) +/* E27698 802B6188 24426780 */ addiu $v0, $v0, %lo(D_802B6780) +/* E2769C 802B618C C4400000 */ lwc1 $f0, ($v0) +/* E276A0 802B6190 3C01802B */ lui $at, %hi(D_802B6760) +/* E276A4 802B6194 D4226760 */ ldc1 $f2, %lo(D_802B6760)($at) +/* E276A8 802B6198 46000021 */ cvt.d.s $f0, $f0 +/* E276AC 802B619C 46220000 */ add.d $f0, $f0, $f2 +/* E276B0 802B61A0 3C01802B */ lui $at, %hi(D_802B6784) +/* E276B4 802B61A4 C4226784 */ lwc1 $f2, %lo(D_802B6784)($at) +/* E276B8 802B61A8 46200020 */ cvt.s.d $f0, $f0 +/* E276BC 802B61AC 4600103E */ c.le.s $f2, $f0 +/* E276C0 802B61B0 00000000 */ nop +/* E276C4 802B61B4 45000002 */ bc1f .L802B61C0 +/* E276C8 802B61B8 E4400000 */ swc1 $f0, ($v0) +/* E276CC 802B61BC E4420000 */ swc1 $f2, ($v0) +.L802B61C0: +/* E276D0 802B61C0 C6000054 */ lwc1 $f0, 0x54($s0) +/* E276D4 802B61C4 C4420000 */ lwc1 $f2, ($v0) +/* E276D8 802B61C8 46020000 */ add.s $f0, $f0, $f2 +/* E276DC 802B61CC 3C01802B */ lui $at, %hi(D_802B6788) +/* E276E0 802B61D0 C4226788 */ lwc1 $f2, %lo(D_802B6788)($at) +/* E276E4 802B61D4 4600103E */ c.le.s $f2, $f0 +/* E276E8 802B61D8 00000000 */ nop +/* E276EC 802B61DC 45000002 */ bc1f .L802B61E8 +/* E276F0 802B61E0 E6000054 */ swc1 $f0, 0x54($s0) +/* E276F4 802B61E4 E6020054 */ swc1 $f2, 0x54($s0) +.L802B61E8: +/* E276F8 802B61E8 0200202D */ daddu $a0, $s0, $zero +/* E276FC 802B61EC 27A50028 */ addiu $a1, $sp, 0x28 +/* E27700 802B61F0 27A6002C */ addiu $a2, $sp, 0x2c +/* E27704 802B61F4 27A70030 */ addiu $a3, $sp, 0x30 +/* E27708 802B61F8 3C11802B */ lui $s1, %hi(D_802B6798) +/* E2770C 802B61FC 26316798 */ addiu $s1, $s1, %lo(D_802B6798) +/* E27710 802B6200 C6000028 */ lwc1 $f0, 0x28($s0) +/* E27714 802B6204 860200B0 */ lh $v0, 0xb0($s0) +/* E27718 802B6208 3C0142C8 */ lui $at, 0x42c8 +/* E2771C 802B620C 44813000 */ mtc1 $at, $f6 +/* E27720 802B6210 44821000 */ mtc1 $v0, $f2 +/* E27724 802B6214 00000000 */ nop +/* E27728 802B6218 468010A0 */ cvt.s.w $f2, $f2 +/* E2772C 802B621C E7A00028 */ swc1 $f0, 0x28($sp) +/* E27730 802B6220 3C013F00 */ lui $at, 0x3f00 +/* E27734 802B6224 44810000 */ mtc1 $at, $f0 +/* E27738 802B6228 C6040030 */ lwc1 $f4, 0x30($s0) +/* E2773C 802B622C 46001082 */ mul.s $f2, $f2, $f0 +/* E27740 802B6230 00000000 */ nop +/* E27744 802B6234 E7A60034 */ swc1 $f6, 0x34($sp) +/* E27748 802B6238 E7A40030 */ swc1 $f4, 0x30($sp) +/* E2774C 802B623C C600002C */ lwc1 $f0, 0x2c($s0) +/* E27750 802B6240 3C12802B */ lui $s2, %hi(D_802B6794) +/* E27754 802B6244 26526794 */ addiu $s2, $s2, %lo(D_802B6794) +/* E27758 802B6248 46020000 */ add.s $f0, $f0, $f2 +/* E2775C 802B624C C6220000 */ lwc1 $f2, ($s1) +/* E27760 802B6250 27A20034 */ addiu $v0, $sp, 0x34 +/* E27764 802B6254 E6420000 */ swc1 $f2, ($s2) +/* E27768 802B6258 E7A0002C */ swc1 $f0, 0x2c($sp) +/* E2776C 802B625C AFA20010 */ sw $v0, 0x10($sp) +/* E27770 802B6260 27A20038 */ addiu $v0, $sp, 0x38 +/* E27774 802B6264 AFA20014 */ sw $v0, 0x14($sp) +/* E27778 802B6268 27A2003C */ addiu $v0, $sp, 0x3c +/* E2777C 802B626C AFA20018 */ sw $v0, 0x18($sp) +/* E27780 802B6270 27A20040 */ addiu $v0, $sp, 0x40 +/* E27784 802B6274 AFA2001C */ sw $v0, 0x1c($sp) +/* E27788 802B6278 27A20044 */ addiu $v0, $sp, 0x44 +/* E2778C 802B627C 0C03791B */ jal func_800DE46C +/* E27790 802B6280 AFA20020 */ sw $v0, 0x20($sp) +/* E27794 802B6284 C7A0003C */ lwc1 $f0, 0x3c($sp) +/* E27798 802B6288 AFA20048 */ sw $v0, 0x48($sp) +/* E2779C 802B628C 04400023 */ bltz $v0, .L802B631C +/* E277A0 802B6290 E6200000 */ swc1 $f0, ($s1) +/* E277A4 802B6294 0C016F6A */ jal get_collider_type_by_id +/* E277A8 802B6298 0040202D */ daddu $a0, $v0, $zero +/* E277AC 802B629C 304200FF */ andi $v0, $v0, 0xff +/* E277B0 802B62A0 24030005 */ addiu $v1, $zero, 5 +/* E277B4 802B62A4 1443000F */ bne $v0, $v1, .L802B62E4 +/* E277B8 802B62A8 00000000 */ nop +/* E277BC 802B62AC 3C028016 */ lui $v0, %hi(gCollisionStatus) +/* E277C0 802B62B0 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus) +/* E277C4 802B62B4 97A3004A */ lhu $v1, 0x4a($sp) +/* E277C8 802B62B8 C7A0003C */ lwc1 $f0, 0x3c($sp) +/* E277CC 802B62BC 3C014334 */ lui $at, 0x4334 +/* E277D0 802B62C0 44811000 */ mtc1 $at, $f2 +/* E277D4 802B62C4 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* E277D8 802B62C8 46020000 */ add.s $f0, $f0, $f2 +/* E277DC 802B62CC A4430002 */ sh $v1, 2($v0) +/* E277E0 802B62D0 E604002C */ swc1 $f4, 0x2c($s0) +/* E277E4 802B62D4 3C01802B */ lui $at, %hi(D_802B6790) +/* E277E8 802B62D8 E4206790 */ swc1 $f0, %lo(D_802B6790)($at) +/* E277EC 802B62DC 080AD9C7 */ j .L802B671C +/* E277F0 802B62E0 00000000 */ nop +.L802B62E4: +/* E277F4 802B62E4 C6400000 */ lwc1 $f0, ($s2) +/* E277F8 802B62E8 C6220000 */ lwc1 $f2, ($s1) +/* E277FC 802B62EC 46020001 */ sub.s $f0, $f0, $f2 +/* E27800 802B62F0 3C014049 */ lui $at, 0x4049 +/* E27804 802B62F4 44811800 */ mtc1 $at, $f3 +/* E27808 802B62F8 44801000 */ mtc1 $zero, $f2 +/* E2780C 802B62FC 46000021 */ cvt.d.s $f0, $f0 +/* E27810 802B6300 46200005 */ abs.d $f0, $f0 +/* E27814 802B6304 4620103E */ c.le.d $f2, $f0 +/* E27818 802B6308 00000000 */ nop +/* E2781C 802B630C 45010004 */ bc1t .L802B6320 +/* E27820 802B6310 24020002 */ addiu $v0, $zero, 2 +/* E27824 802B6314 080AD8C8 */ j .L802B6320 +/* E27828 802B6318 24020001 */ addiu $v0, $zero, 1 +.L802B631C: +/* E2782C 802B631C 24020002 */ addiu $v0, $zero, 2 +.L802B6320: +/* E27830 802B6320 A20200B6 */ sb $v0, 0xb6($s0) +/* E27834 802B6324 3C01802B */ lui $at, %hi(D_802B6790) +/* E27838 802B6328 C42C6790 */ lwc1 $f12, %lo(D_802B6790)($at) +/* E2783C 802B632C 3C0140C9 */ lui $at, 0x40c9 +/* E27840 802B6330 34210FD0 */ ori $at, $at, 0xfd0 +/* E27844 802B6334 44810000 */ mtc1 $at, $f0 +/* E27848 802B6338 00000000 */ nop +/* E2784C 802B633C 46006302 */ mul.s $f12, $f12, $f0 +/* E27850 802B6340 00000000 */ nop +/* E27854 802B6344 27A5004C */ addiu $a1, $sp, 0x4c +/* E27858 802B6348 3C0143B4 */ lui $at, 0x43b4 +/* E2785C 802B634C 44810000 */ mtc1 $at, $f0 +/* E27860 802B6350 27A60050 */ addiu $a2, $sp, 0x50 +/* E27864 802B6354 0C00A82D */ jal sin_cos_rad +/* E27868 802B6358 46006303 */ div.s $f12, $f12, $f0 +/* E2786C 802B635C C7A0004C */ lwc1 $f0, 0x4c($sp) +/* E27870 802B6360 C7A20050 */ lwc1 $f2, 0x50($sp) +/* E27874 802B6364 C6040054 */ lwc1 $f4, 0x54($s0) +/* E27878 802B6368 46020003 */ div.s $f0, $f0, $f2 +/* E2787C 802B636C 46040002 */ mul.s $f0, $f0, $f4 +/* E27880 802B6370 00000000 */ nop +/* E27884 802B6374 C602002C */ lwc1 $f2, 0x2c($s0) +/* E27888 802B6378 46000005 */ abs.s $f0, $f0 +/* E2788C 802B637C 46001080 */ add.s $f2, $f2, $f0 +/* E27890 802B6380 24040167 */ addiu $a0, $zero, 0x167 +/* E27894 802B6384 0C0154F0 */ jal func_800553C0 +/* E27898 802B6388 E602002C */ swc1 $f2, 0x2c($s0) +/* E2789C 802B638C 080AD9C7 */ j .L802B671C +/* E278A0 802B6390 00000000 */ nop +/* E278A4 802B6394 0200202D */ daddu $a0, $s0, $zero +/* E278A8 802B6398 27A50028 */ addiu $a1, $sp, 0x28 +/* E278AC 802B639C 27A6002C */ addiu $a2, $sp, 0x2c +/* E278B0 802B63A0 27A70030 */ addiu $a3, $sp, 0x30 +/* E278B4 802B63A4 860200B0 */ lh $v0, 0xb0($s0) +/* E278B8 802B63A8 3C013F00 */ lui $at, 0x3f00 +/* E278BC 802B63AC 44810000 */ mtc1 $at, $f0 +/* E278C0 802B63B0 C6040028 */ lwc1 $f4, 0x28($s0) +/* E278C4 802B63B4 3C014248 */ lui $at, 0x4248 +/* E278C8 802B63B8 44813000 */ mtc1 $at, $f6 +/* E278CC 802B63BC 44821000 */ mtc1 $v0, $f2 +/* E278D0 802B63C0 00000000 */ nop +/* E278D4 802B63C4 468010A0 */ cvt.s.w $f2, $f2 +/* E278D8 802B63C8 46001082 */ mul.s $f2, $f2, $f0 +/* E278DC 802B63CC 00000000 */ nop +/* E278E0 802B63D0 27A20034 */ addiu $v0, $sp, 0x34 +/* E278E4 802B63D4 E7A40028 */ swc1 $f4, 0x28($sp) +/* E278E8 802B63D8 C600002C */ lwc1 $f0, 0x2c($s0) +/* E278EC 802B63DC C6040030 */ lwc1 $f4, 0x30($s0) +/* E278F0 802B63E0 46020000 */ add.s $f0, $f0, $f2 +/* E278F4 802B63E4 E7A60034 */ swc1 $f6, 0x34($sp) +/* E278F8 802B63E8 E7A40030 */ swc1 $f4, 0x30($sp) +/* E278FC 802B63EC E7A0002C */ swc1 $f0, 0x2c($sp) +/* E27900 802B63F0 AFA20010 */ sw $v0, 0x10($sp) +/* E27904 802B63F4 27A20038 */ addiu $v0, $sp, 0x38 +/* E27908 802B63F8 AFA20014 */ sw $v0, 0x14($sp) +/* E2790C 802B63FC 27A2003C */ addiu $v0, $sp, 0x3c +/* E27910 802B6400 AFA20018 */ sw $v0, 0x18($sp) +/* E27914 802B6404 27A20040 */ addiu $v0, $sp, 0x40 +/* E27918 802B6408 AFA2001C */ sw $v0, 0x1c($sp) +/* E2791C 802B640C 27A20044 */ addiu $v0, $sp, 0x44 +/* E27920 802B6410 0C03791B */ jal func_800DE46C +/* E27924 802B6414 AFA20020 */ sw $v0, 0x20($sp) +/* E27928 802B6418 04400023 */ bltz $v0, .L802B64A8 +/* E2792C 802B641C AFA20048 */ sw $v0, 0x48($sp) +/* E27930 802B6420 C6020054 */ lwc1 $f2, 0x54($s0) +/* E27934 802B6424 3C014040 */ lui $at, 0x4040 +/* E27938 802B6428 44810000 */ mtc1 $at, $f0 +/* E2793C 802B642C 00000000 */ nop +/* E27940 802B6430 46001203 */ div.s $f8, $f2, $f0 +/* E27944 802B6434 3C01802B */ lui $at, %hi(D_802B6768) +/* E27948 802B6438 D4226768 */ ldc1 $f2, %lo(D_802B6768)($at) +/* E2794C 802B643C 46004021 */ cvt.d.s $f0, $f8 +/* E27950 802B6440 4622003C */ c.lt.d $f0, $f2 +/* E27954 802B6444 00000000 */ nop +/* E27958 802B6448 45030001 */ bc1tl .L802B6450 +/* E2795C 802B644C AE000054 */ sw $zero, 0x54($s0) +.L802B6450: +/* E27960 802B6450 C6000054 */ lwc1 $f0, 0x54($s0) +/* E27964 802B6454 46080001 */ sub.s $f0, $f0, $f8 +/* E27968 802B6458 4480A000 */ mtc1 $zero, $f20 +/* E2796C 802B645C 00000000 */ nop +/* E27970 802B6460 4614003E */ c.le.s $f0, $f20 +/* E27974 802B6464 00000000 */ nop +/* E27978 802B6468 450000AC */ bc1f .L802B671C +/* E2797C 802B646C E6000054 */ swc1 $f0, 0x54($s0) +/* E27980 802B6470 24040172 */ addiu $a0, $zero, 0x172 +/* E27984 802B6474 0C052736 */ jal play_sound_at_player +/* E27988 802B6478 0000282D */ daddu $a1, $zero, $zero +/* E2798C 802B647C 3C040001 */ lui $a0, 1 +/* E27990 802B6480 0C037FDE */ jal func_800DFF78 +/* E27994 802B6484 34840031 */ ori $a0, $a0, 0x31 +/* E27998 802B6488 24020006 */ addiu $v0, $zero, 6 +/* E2799C 802B648C A20200B6 */ sb $v0, 0xb6($s0) +/* E279A0 802B6490 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* E279A4 802B6494 2402000F */ addiu $v0, $zero, 0xf +/* E279A8 802B6498 A6020008 */ sh $v0, 8($s0) +/* E279AC 802B649C E6140054 */ swc1 $f20, 0x54($s0) +/* E279B0 802B64A0 080AD9C7 */ j .L802B671C +/* E279B4 802B64A4 E600002C */ swc1 $f0, 0x2c($s0) +.L802B64A8: +/* E279B8 802B64A8 C6000054 */ lwc1 $f0, 0x54($s0) +/* E279BC 802B64AC 3C01802B */ lui $at, %hi(D_802B678C) +/* E279C0 802B64B0 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) +/* E279C4 802B64B4 46020000 */ add.s $f0, $f0, $f2 +/* E279C8 802B64B8 44802000 */ mtc1 $zero, $f4 +/* E279CC 802B64BC 00000000 */ nop +/* E279D0 802B64C0 4604003E */ c.le.s $f0, $f4 +/* E279D4 802B64C4 00000000 */ nop +/* E279D8 802B64C8 45000002 */ bc1f .L802B64D4 +/* E279DC 802B64CC E6000054 */ swc1 $f0, 0x54($s0) +/* E279E0 802B64D0 E6040054 */ swc1 $f4, 0x54($s0) +.L802B64D4: +/* E279E4 802B64D4 C6000070 */ lwc1 $f0, 0x70($s0) +/* E279E8 802B64D8 C6020074 */ lwc1 $f2, 0x74($s0) +/* E279EC 802B64DC 46020000 */ add.s $f0, $f0, $f2 +/* E279F0 802B64E0 C602002C */ lwc1 $f2, 0x2c($s0) +/* E279F4 802B64E4 46001080 */ add.s $f2, $f2, $f0 +/* E279F8 802B64E8 4604003E */ c.le.s $f0, $f4 +/* E279FC 802B64EC E6000070 */ swc1 $f0, 0x70($s0) +/* E27A00 802B64F0 4500008A */ bc1f .L802B671C +/* E27A04 802B64F4 E602002C */ swc1 $f2, 0x2c($s0) +/* E27A08 802B64F8 3C013DEA */ lui $at, 0x3dea +/* E27A0C 802B64FC 3421161E */ ori $at, $at, 0x161e +/* E27A10 802B6500 44810000 */ mtc1 $at, $f0 +/* E27A14 802B6504 3C01BE92 */ lui $at, 0xbe92 +/* E27A18 802B6508 3421FEC5 */ ori $at, $at, 0xfec5 +/* E27A1C 802B650C 44811000 */ mtc1 $at, $f2 +/* E27A20 802B6510 3C01BE3A */ lui $at, 0xbe3a +/* E27A24 802B6514 3421ACDA */ ori $at, $at, 0xacda +/* E27A28 802B6518 44812000 */ mtc1 $at, $f4 +/* E27A2C 802B651C 3C013C3C */ lui $at, 0x3c3c +/* E27A30 802B6520 3421BE62 */ ori $at, $at, 0xbe62 +/* E27A34 802B6524 44813000 */ mtc1 $at, $f6 +/* E27A38 802B6528 24020003 */ addiu $v0, $zero, 3 +/* E27A3C 802B652C A20200B6 */ sb $v0, 0xb6($s0) +/* E27A40 802B6530 E6000070 */ swc1 $f0, 0x70($s0) +/* E27A44 802B6534 E6020074 */ swc1 $f2, 0x74($s0) +/* E27A48 802B6538 E6040078 */ swc1 $f4, 0x78($s0) +/* E27A4C 802B653C 080AD9C7 */ j .L802B671C +/* E27A50 802B6540 E606007C */ swc1 $f6, 0x7c($s0) +/* E27A54 802B6544 3C11802B */ lui $s1, %hi(D_802B678C) +/* E27A58 802B6548 2631678C */ addiu $s1, $s1, %lo(D_802B678C) +/* E27A5C 802B654C C6000054 */ lwc1 $f0, 0x54($s0) +/* E27A60 802B6550 C6220000 */ lwc1 $f2, ($s1) +/* E27A64 802B6554 46020000 */ add.s $f0, $f0, $f2 +/* E27A68 802B6558 44801000 */ mtc1 $zero, $f2 +/* E27A6C 802B655C 00000000 */ nop +/* E27A70 802B6560 4602003E */ c.le.s $f0, $f2 +/* E27A74 802B6564 00000000 */ nop +/* E27A78 802B6568 45000002 */ bc1f .L802B6574 +/* E27A7C 802B656C E6000054 */ swc1 $f0, 0x54($s0) +/* E27A80 802B6570 E6020054 */ swc1 $f2, 0x54($s0) +.L802B6574: +/* E27A84 802B6574 0C038D36 */ jal func_800E34D8 +/* E27A88 802B6578 00000000 */ nop +/* E27A8C 802B657C 46000306 */ mov.s $f12, $f0 +/* E27A90 802B6580 0C038D45 */ jal func_800E3514 +/* E27A94 802B6584 27A50048 */ addiu $a1, $sp, 0x48 +/* E27A98 802B6588 8FA20048 */ lw $v0, 0x48($sp) +/* E27A9C 802B658C 04400063 */ bltz $v0, .L802B671C +/* E27AA0 802B6590 E600002C */ swc1 $f0, 0x2c($s0) +/* E27AA4 802B6594 3C040008 */ lui $a0, 8 +/* E27AA8 802B6598 3C01BF80 */ lui $at, 0xbf80 +/* E27AAC 802B659C 44810000 */ mtc1 $at, $f0 +/* E27AB0 802B65A0 34840003 */ ori $a0, $a0, 3 +/* E27AB4 802B65A4 0C037FDE */ jal func_800DFF78 +/* E27AB8 802B65A8 E6200000 */ swc1 $f0, ($s1) +/* E27ABC 802B65AC 24040162 */ addiu $a0, $zero, 0x162 +/* E27AC0 802B65B0 0C052736 */ jal play_sound_at_player +/* E27AC4 802B65B4 0000282D */ daddu $a1, $zero, $zero +/* E27AC8 802B65B8 080AD9AC */ j .L802B66B0 +/* E27ACC 802B65BC 00000000 */ nop +/* E27AD0 802B65C0 C6000054 */ lwc1 $f0, 0x54($s0) +/* E27AD4 802B65C4 3C01802B */ lui $at, %hi(D_802B678C) +/* E27AD8 802B65C8 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) +/* E27ADC 802B65CC 46020000 */ add.s $f0, $f0, $f2 +/* E27AE0 802B65D0 44801000 */ mtc1 $zero, $f2 +/* E27AE4 802B65D4 00000000 */ nop +/* E27AE8 802B65D8 4602003E */ c.le.s $f0, $f2 +/* E27AEC 802B65DC 00000000 */ nop +/* E27AF0 802B65E0 45000002 */ bc1f .L802B65EC +/* E27AF4 802B65E4 E6000054 */ swc1 $f0, 0x54($s0) +/* E27AF8 802B65E8 E6020054 */ swc1 $f2, 0x54($s0) +.L802B65EC: +/* E27AFC 802B65EC 960200BC */ lhu $v0, 0xbc($s0) +/* E27B00 802B65F0 1040004A */ beqz $v0, .L802B671C +/* E27B04 802B65F4 00000000 */ nop +/* E27B08 802B65F8 3C040001 */ lui $a0, 1 +/* E27B0C 802B65FC 0C037FDE */ jal func_800DFF78 +/* E27B10 802B6600 34840030 */ ori $a0, $a0, 0x30 +/* E27B14 802B6604 080AD9AC */ j .L802B66B0 +/* E27B18 802B6608 00000000 */ nop +/* E27B1C 802B660C C6000054 */ lwc1 $f0, 0x54($s0) +/* E27B20 802B6610 3C01802B */ lui $at, %hi(D_802B678C) +/* E27B24 802B6614 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) +/* E27B28 802B6618 46020000 */ add.s $f0, $f0, $f2 +/* E27B2C 802B661C 44801000 */ mtc1 $zero, $f2 +/* E27B30 802B6620 00000000 */ nop +/* E27B34 802B6624 4602003E */ c.le.s $f0, $f2 +/* E27B38 802B6628 00000000 */ nop +/* E27B3C 802B662C 45000002 */ bc1f .L802B6638 +/* E27B40 802B6630 E6000054 */ swc1 $f0, 0x54($s0) +/* E27B44 802B6634 E6020054 */ swc1 $f2, 0x54($s0) +.L802B6638: +/* E27B48 802B6638 960200BC */ lhu $v0, 0xbc($s0) +/* E27B4C 802B663C 10400037 */ beqz $v0, .L802B671C +/* E27B50 802B6640 00000000 */ nop +/* E27B54 802B6644 3C040001 */ lui $a0, 1 +/* E27B58 802B6648 0C037FDE */ jal func_800DFF78 +/* E27B5C 802B664C 34840031 */ ori $a0, $a0, 0x31 +/* E27B60 802B6650 24040172 */ addiu $a0, $zero, 0x172 +/* E27B64 802B6654 0C052736 */ jal play_sound_at_player +/* E27B68 802B6658 0000282D */ daddu $a1, $zero, $zero +/* E27B6C 802B665C 920200B6 */ lbu $v0, 0xb6($s0) +/* E27B70 802B6660 2403000F */ addiu $v1, $zero, 0xf +/* E27B74 802B6664 080AD9AD */ j .L802B66B4 +/* E27B78 802B6668 A6030008 */ sh $v1, 8($s0) +/* E27B7C 802B666C C6000054 */ lwc1 $f0, 0x54($s0) +/* E27B80 802B6670 3C01802B */ lui $at, %hi(D_802B678C) +/* E27B84 802B6674 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) +/* E27B88 802B6678 46020000 */ add.s $f0, $f0, $f2 +/* E27B8C 802B667C 44801000 */ mtc1 $zero, $f2 +/* E27B90 802B6680 00000000 */ nop +/* E27B94 802B6684 4602003E */ c.le.s $f0, $f2 +/* E27B98 802B6688 00000000 */ nop +/* E27B9C 802B668C 45000002 */ bc1f .L802B6698 +/* E27BA0 802B6690 E6000054 */ swc1 $f0, 0x54($s0) +/* E27BA4 802B6694 E6020054 */ swc1 $f2, 0x54($s0) +.L802B6698: +/* E27BA8 802B6698 96020008 */ lhu $v0, 8($s0) +/* E27BAC 802B669C 2442FFFF */ addiu $v0, $v0, -1 +/* E27BB0 802B66A0 A6020008 */ sh $v0, 8($s0) +/* E27BB4 802B66A4 00021400 */ sll $v0, $v0, 0x10 +/* E27BB8 802B66A8 1440001C */ bnez $v0, .L802B671C +/* E27BBC 802B66AC 00000000 */ nop +.L802B66B0: +/* E27BC0 802B66B0 920200B6 */ lbu $v0, 0xb6($s0) +.L802B66B4: +/* E27BC4 802B66B4 24420001 */ addiu $v0, $v0, 1 +/* E27BC8 802B66B8 080AD9C7 */ j .L802B671C +/* E27BCC 802B66BC A20200B6 */ sb $v0, 0xb6($s0) +/* E27BD0 802B66C0 C6020054 */ lwc1 $f2, 0x54($s0) +/* E27BD4 802B66C4 3C014040 */ lui $at, 0x4040 +/* E27BD8 802B66C8 44810000 */ mtc1 $at, $f0 +/* E27BDC 802B66CC 00000000 */ nop +/* E27BE0 802B66D0 46001203 */ div.s $f8, $f2, $f0 +/* E27BE4 802B66D4 3C01802B */ lui $at, %hi(D_802B6770) +/* E27BE8 802B66D8 D4226770 */ ldc1 $f2, %lo(D_802B6770)($at) +/* E27BEC 802B66DC 46004021 */ cvt.d.s $f0, $f8 +/* E27BF0 802B66E0 4622003C */ c.lt.d $f0, $f2 +/* E27BF4 802B66E4 00000000 */ nop +/* E27BF8 802B66E8 45030001 */ bc1tl .L802B66F0 +/* E27BFC 802B66EC AE000054 */ sw $zero, 0x54($s0) +.L802B66F0: +/* E27C00 802B66F0 C6000054 */ lwc1 $f0, 0x54($s0) +/* E27C04 802B66F4 46080001 */ sub.s $f0, $f0, $f8 +/* E27C08 802B66F8 44801000 */ mtc1 $zero, $f2 +/* E27C0C 802B66FC 00000000 */ nop +/* E27C10 802B6700 4602003E */ c.le.s $f0, $f2 +/* E27C14 802B6704 00000000 */ nop +/* E27C18 802B6708 45000004 */ bc1f .L802B671C +/* E27C1C 802B670C E6000054 */ swc1 $f0, 0x54($s0) +/* E27C20 802B6710 E6020054 */ swc1 $f2, 0x54($s0) +/* E27C24 802B6714 0C039769 */ jal set_action_state +/* E27C28 802B6718 0000202D */ daddu $a0, $zero, $zero +.L802B671C: +/* E27C2C 802B671C 8FBF0064 */ lw $ra, 0x64($sp) +/* E27C30 802B6720 8FB20060 */ lw $s2, 0x60($sp) +/* E27C34 802B6724 8FB1005C */ lw $s1, 0x5c($sp) +/* E27C38 802B6728 8FB00058 */ lw $s0, 0x58($sp) +/* E27C3C 802B672C D7B40068 */ ldc1 $f20, 0x68($sp) +/* E27C40 802B6730 03E00008 */ jr $ra +/* E27C44 802B6734 27BD0070 */ addiu $sp, $sp, 0x70 +/* E27C48 802B6738 00000000 */ nop +/* E27C4C 802B673C 00000000 */ nop diff --git a/asm/nonmatchings/code_E27C90/func_802B6000_E27C90.s b/asm/nonmatchings/code_E27C90/func_802B6000_E27C90.s new file mode 100644 index 0000000000..1cfbc678d8 --- /dev/null +++ b/asm/nonmatchings/code_E27C90/func_802B6000_E27C90.s @@ -0,0 +1,180 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E27C90 +/* E27C90 802B6000 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E27C94 802B6004 AFB00020 */ sw $s0, 0x20($sp) +/* E27C98 802B6008 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E27C9C 802B600C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E27CA0 802B6010 AFBF0028 */ sw $ra, 0x28($sp) +/* E27CA4 802B6014 AFB10024 */ sw $s1, 0x24($sp) +/* E27CA8 802B6018 8E020000 */ lw $v0, ($s0) +/* E27CAC 802B601C 04410048 */ bgez $v0, .L802B6140 +/* E27CB0 802B6020 0200882D */ daddu $s1, $s0, $zero +/* E27CB4 802B6024 3C037FFF */ lui $v1, 0x7fff +/* E27CB8 802B6028 3463FFFF */ ori $v1, $v1, 0xffff +/* E27CBC 802B602C 3C040001 */ lui $a0, 1 +/* E27CC0 802B6030 00431824 */ and $v1, $v0, $v1 +/* E27CC4 802B6034 8E020004 */ lw $v0, 4($s0) +/* E27CC8 802B6038 34840019 */ ori $a0, $a0, 0x19 +/* E27CCC 802B603C AE030000 */ sw $v1, ($s0) +/* E27CD0 802B6040 34630808 */ ori $v1, $v1, 0x808 +/* E27CD4 802B6044 AE030000 */ sw $v1, ($s0) +/* E27CD8 802B6048 34420004 */ ori $v0, $v0, 4 +/* E27CDC 802B604C 0C037FDE */ jal func_800DFF78 +/* E27CE0 802B6050 AE020004 */ sw $v0, 4($s0) +/* E27CE4 802B6054 C60C0028 */ lwc1 $f12, 0x28($s0) +/* E27CE8 802B6058 C60E0030 */ lwc1 $f14, 0x30($s0) +/* E27CEC 802B605C 3C014192 */ lui $at, 0x4192 +/* E27CF0 802B6060 3421C745 */ ori $at, $at, 0xc745 +/* E27CF4 802B6064 44811000 */ mtc1 $at, $f2 +/* E27CF8 802B6068 3C01C06F */ lui $at, 0xc06f +/* E27CFC 802B606C 34213B64 */ ori $at, $at, 0x3b64 +/* E27D00 802B6070 44812000 */ mtc1 $at, $f4 +/* E27D04 802B6074 3C013F4E */ lui $at, 0x3f4e +/* E27D08 802B6078 34214F76 */ ori $at, $at, 0x4f76 +/* E27D0C 802B607C 44813000 */ mtc1 $at, $f6 +/* E27D10 802B6080 86020016 */ lh $v0, 0x16($s0) +/* E27D14 802B6084 3C01BDCA */ lui $at, 0xbdca +/* E27D18 802B6088 3421233A */ ori $at, $at, 0x233a +/* E27D1C 802B608C 44810000 */ mtc1 $at, $f0 +/* E27D20 802B6090 8604001A */ lh $a0, 0x1a($s0) +/* E27D24 802B6094 3C03800B */ lui $v1, %hi(gCameras) +/* E27D28 802B6098 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* E27D2C 802B609C A20000B6 */ sb $zero, 0xb6($s0) +/* E27D30 802B60A0 44824000 */ mtc1 $v0, $f8 +/* E27D34 802B60A4 00000000 */ nop +/* E27D38 802B60A8 46804220 */ cvt.s.w $f8, $f8 +/* E27D3C 802B60AC 44064000 */ mfc1 $a2, $f8 +/* E27D40 802B60B0 44844000 */ mtc1 $a0, $f8 +/* E27D44 802B60B4 00000000 */ nop +/* E27D48 802B60B8 46804220 */ cvt.s.w $f8, $f8 +/* E27D4C 802B60BC E6020070 */ swc1 $f2, 0x70($s0) +/* E27D50 802B60C0 E6040074 */ swc1 $f4, 0x74($s0) +/* E27D54 802B60C4 E6060078 */ swc1 $f6, 0x78($s0) +/* E27D58 802B60C8 E600007C */ swc1 $f0, 0x7c($s0) +/* E27D5C 802B60CC 94620002 */ lhu $v0, 2($v1) +/* E27D60 802B60D0 44074000 */ mfc1 $a3, $f8 +/* E27D64 802B60D4 34420001 */ ori $v0, $v0, 1 +/* E27D68 802B60D8 0C00A720 */ jal atan2 +/* E27D6C 802B60DC A4620002 */ sh $v0, 2($v1) +/* E27D70 802B60E0 86020016 */ lh $v0, 0x16($s0) +/* E27D74 802B60E4 8603001A */ lh $v1, 0x1a($s0) +/* E27D78 802B60E8 3C01802B */ lui $at, %hi(D_802B62B0) +/* E27D7C 802B60EC E42062B0 */ swc1 $f0, %lo(D_802B62B0)($at) +/* E27D80 802B60F0 44826000 */ mtc1 $v0, $f12 +/* E27D84 802B60F4 00000000 */ nop +/* E27D88 802B60F8 46806320 */ cvt.s.w $f12, $f12 +/* E27D8C 802B60FC 44837000 */ mtc1 $v1, $f14 +/* E27D90 802B6100 00000000 */ nop +/* E27D94 802B6104 0C038022 */ jal func_800E0088 +/* E27D98 802B6108 468073A0 */ cvt.s.w $f14, $f14 +/* E27D9C 802B610C 3C014190 */ lui $at, 0x4190 +/* E27DA0 802B6110 44811000 */ mtc1 $at, $f2 +/* E27DA4 802B6114 24040001 */ addiu $a0, $zero, 1 +/* E27DA8 802B6118 46020003 */ div.s $f0, $f0, $f2 +/* E27DAC 802B611C 0C03A8CD */ jal subtract_hp +/* E27DB0 802B6120 E6000054 */ swc1 $f0, 0x54($s0) +/* E27DB4 802B6124 0C03A5D8 */ jal open_status_menu_long +/* E27DB8 802B6128 00000000 */ nop +/* E27DBC 802B612C 3C03800A */ lui $v1, %hi(D_8009A650) +/* E27DC0 802B6130 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) +/* E27DC4 802B6134 8C620000 */ lw $v0, ($v1) +/* E27DC8 802B6138 34420040 */ ori $v0, $v0, 0x40 +/* E27DCC 802B613C AC620000 */ sw $v0, ($v1) +.L802B6140: +/* E27DD0 802B6140 3C01802B */ lui $at, %hi(D_802B62B0) +/* E27DD4 802B6144 C42C62B0 */ lwc1 $f12, %lo(D_802B62B0)($at) +/* E27DD8 802B6148 3C0140C9 */ lui $at, 0x40c9 +/* E27DDC 802B614C 34210FD0 */ ori $at, $at, 0xfd0 +/* E27DE0 802B6150 44810000 */ mtc1 $at, $f0 +/* E27DE4 802B6154 00000000 */ nop +/* E27DE8 802B6158 46006302 */ mul.s $f12, $f12, $f0 +/* E27DEC 802B615C 00000000 */ nop +/* E27DF0 802B6160 27A50010 */ addiu $a1, $sp, 0x10 +/* E27DF4 802B6164 3C0143B4 */ lui $at, 0x43b4 +/* E27DF8 802B6168 44810000 */ mtc1 $at, $f0 +/* E27DFC 802B616C 27A60014 */ addiu $a2, $sp, 0x14 +/* E27E00 802B6170 0C00A82D */ jal sin_cos_rad +/* E27E04 802B6174 46006303 */ div.s $f12, $f12, $f0 +/* E27E08 802B6178 3C030004 */ lui $v1, 4 +/* E27E0C 802B617C 8E020000 */ lw $v0, ($s0) +/* E27E10 802B6180 C6060054 */ lwc1 $f6, 0x54($s0) +/* E27E14 802B6184 00431024 */ and $v0, $v0, $v1 +/* E27E18 802B6188 10400008 */ beqz $v0, .L802B61AC +/* E27E1C 802B618C 00000000 */ nop +/* E27E20 802B6190 3C013FE0 */ lui $at, 0x3fe0 +/* E27E24 802B6194 44811800 */ mtc1 $at, $f3 +/* E27E28 802B6198 44801000 */ mtc1 $zero, $f2 +/* E27E2C 802B619C 46003021 */ cvt.d.s $f0, $f6 +/* E27E30 802B61A0 46220002 */ mul.d $f0, $f0, $f2 +/* E27E34 802B61A4 00000000 */ nop +/* E27E38 802B61A8 462001A0 */ cvt.s.d $f6, $f0 +.L802B61AC: +/* E27E3C 802B61AC C7A00010 */ lwc1 $f0, 0x10($sp) +/* E27E40 802B61B0 46003002 */ mul.s $f0, $f6, $f0 +/* E27E44 802B61B4 00000000 */ nop +/* E27E48 802B61B8 C7A40014 */ lwc1 $f4, 0x14($sp) +/* E27E4C 802B61BC 46043102 */ mul.s $f4, $f6, $f4 +/* E27E50 802B61C0 00000000 */ nop +/* E27E54 802B61C4 C6020028 */ lwc1 $f2, 0x28($s0) +/* E27E58 802B61C8 46001080 */ add.s $f2, $f2, $f0 +/* E27E5C 802B61CC C6000030 */ lwc1 $f0, 0x30($s0) +/* E27E60 802B61D0 820200B6 */ lb $v0, 0xb6($s0) +/* E27E64 802B61D4 46040001 */ sub.s $f0, $f0, $f4 +/* E27E68 802B61D8 E6020028 */ swc1 $f2, 0x28($s0) +/* E27E6C 802B61DC 14400012 */ bnez $v0, .L802B6228 +/* E27E70 802B61E0 E6000030 */ swc1 $f0, 0x30($s0) +/* E27E74 802B61E4 0C038D12 */ jal integrate_gravity +/* E27E78 802B61E8 00000000 */ nop +/* E27E7C 802B61EC C600002C */ lwc1 $f0, 0x2c($s0) +/* E27E80 802B61F0 C6040070 */ lwc1 $f4, 0x70($s0) +/* E27E84 802B61F4 46040000 */ add.s $f0, $f0, $f4 +/* E27E88 802B61F8 44801000 */ mtc1 $zero, $f2 +/* E27E8C 802B61FC 00000000 */ nop +/* E27E90 802B6200 4602203C */ c.lt.s $f4, $f2 +/* E27E94 802B6204 00000000 */ nop +/* E27E98 802B6208 45000021 */ bc1f .L802B6290 +/* E27E9C 802B620C E600002C */ swc1 $f0, 0x2c($s0) +/* E27EA0 802B6210 8E020000 */ lw $v0, ($s0) +/* E27EA4 802B6214 24030001 */ addiu $v1, $zero, 1 +/* E27EA8 802B6218 A20300B6 */ sb $v1, 0xb6($s0) +/* E27EAC 802B621C 34420004 */ ori $v0, $v0, 4 +/* E27EB0 802B6220 080AD8A4 */ j .L802B6290 +/* E27EB4 802B6224 AE020000 */ sw $v0, ($s0) +.L802B6228: +/* E27EB8 802B6228 0C038D36 */ jal func_800E34D8 +/* E27EBC 802B622C 00000000 */ nop +/* E27EC0 802B6230 46000306 */ mov.s $f12, $f0 +/* E27EC4 802B6234 0C038D45 */ jal func_800E3514 +/* E27EC8 802B6238 27A50018 */ addiu $a1, $sp, 0x18 +/* E27ECC 802B623C 8FA40018 */ lw $a0, 0x18($sp) +/* E27ED0 802B6240 04800013 */ bltz $a0, .L802B6290 +/* E27ED4 802B6244 E620002C */ swc1 $f0, 0x2c($s1) +/* E27ED8 802B6248 0C016F6A */ jal get_collider_type_by_id +/* E27EDC 802B624C 00000000 */ nop +/* E27EE0 802B6250 2404000A */ addiu $a0, $zero, 0xa +/* E27EE4 802B6254 0C039769 */ jal set_action_state +/* E27EE8 802B6258 AFA20018 */ sw $v0, 0x18($sp) +/* E27EEC 802B625C 2402003C */ addiu $v0, $zero, 0x3c +/* E27EF0 802B6260 2403F7FF */ addiu $v1, $zero, -0x801 +/* E27EF4 802B6264 A6220010 */ sh $v0, 0x10($s1) +/* E27EF8 802B6268 8E220000 */ lw $v0, ($s1) +/* E27EFC 802B626C 3C04800A */ lui $a0, %hi(D_8009A650) +/* E27F00 802B6270 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) +/* E27F04 802B6274 A22000BF */ sb $zero, 0xbf($s1) +/* E27F08 802B6278 00431024 */ and $v0, $v0, $v1 +/* E27F0C 802B627C AE220000 */ sw $v0, ($s1) +/* E27F10 802B6280 8C820000 */ lw $v0, ($a0) +/* E27F14 802B6284 2403FFBF */ addiu $v1, $zero, -0x41 +/* E27F18 802B6288 00431024 */ and $v0, $v0, $v1 +/* E27F1C 802B628C AC820000 */ sw $v0, ($a0) +.L802B6290: +/* E27F20 802B6290 8FBF0028 */ lw $ra, 0x28($sp) +/* E27F24 802B6294 8FB10024 */ lw $s1, 0x24($sp) +/* E27F28 802B6298 8FB00020 */ lw $s0, 0x20($sp) +/* E27F2C 802B629C 03E00008 */ jr $ra +/* E27F30 802B62A0 27BD0030 */ addiu $sp, $sp, 0x30 +/* E27F34 802B62A4 00000000 */ nop +/* E27F38 802B62A8 00000000 */ nop +/* E27F3C 802B62AC 00000000 */ nop diff --git a/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s b/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s new file mode 100644 index 0000000000..7930dc59c5 --- /dev/null +++ b/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s @@ -0,0 +1,557 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E27F40 +/* E27F40 802B6000 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* E27F44 802B6004 AFB00030 */ sw $s0, 0x30($sp) +/* E27F48 802B6008 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E27F4C 802B600C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E27F50 802B6010 AFBF003C */ sw $ra, 0x3c($sp) +/* E27F54 802B6014 AFB20038 */ sw $s2, 0x38($sp) +/* E27F58 802B6018 AFB10034 */ sw $s1, 0x34($sp) +/* E27F5C 802B601C F7B60048 */ sdc1 $f22, 0x48($sp) +/* E27F60 802B6020 F7B40040 */ sdc1 $f20, 0x40($sp) +/* E27F64 802B6024 8E040000 */ lw $a0, ($s0) +/* E27F68 802B6028 0481002F */ bgez $a0, .L802B60E8 +/* E27F6C 802B602C 3C027FFF */ lui $v0, 0x7fff +/* E27F70 802B6030 3442FFFF */ ori $v0, $v0, 0xffff +/* E27F74 802B6034 3C030080 */ lui $v1, 0x80 +/* E27F78 802B6038 34630008 */ ori $v1, $v1, 8 +/* E27F7C 802B603C 00821024 */ and $v0, $a0, $v0 +/* E27F80 802B6040 00431025 */ or $v0, $v0, $v1 +/* E27F84 802B6044 8E030004 */ lw $v1, 4($s0) +/* E27F88 802B6048 AE020000 */ sw $v0, ($s0) +/* E27F8C 802B604C 34420800 */ ori $v0, $v0, 0x800 +/* E27F90 802B6050 AE020000 */ sw $v0, ($s0) +/* E27F94 802B6054 34630004 */ ori $v1, $v1, 4 +/* E27F98 802B6058 AE030004 */ sw $v1, 4($s0) +/* E27F9C 802B605C 820300BF */ lb $v1, 0xbf($s0) +/* E27FA0 802B6060 24020001 */ addiu $v0, $zero, 1 +/* E27FA4 802B6064 54620005 */ bnel $v1, $v0, .L802B607C +/* E27FA8 802B6068 A20000B6 */ sb $zero, 0xb6($s0) +/* E27FAC 802B606C 24020014 */ addiu $v0, $zero, 0x14 +/* E27FB0 802B6070 A20200B6 */ sb $v0, 0xb6($s0) +/* E27FB4 802B6074 24020002 */ addiu $v0, $zero, 2 +/* E27FB8 802B6078 A6020008 */ sh $v0, 8($s0) +.L802B607C: +/* E27FBC 802B607C C600002C */ lwc1 $f0, 0x2c($s0) +/* E27FC0 802B6080 3C03800B */ lui $v1, %hi(gCameras) +/* E27FC4 802B6084 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* E27FC8 802B6088 AE000054 */ sw $zero, 0x54($s0) +/* E27FCC 802B608C 94620002 */ lhu $v0, 2($v1) +/* E27FD0 802B6090 3C01802B */ lui $at, %hi(D_802B68B0) +/* E27FD4 802B6094 AC2068B0 */ sw $zero, %lo(D_802B68B0)($at) +/* E27FD8 802B6098 3C01802B */ lui $at, %hi(D_802B68BC) +/* E27FDC 802B609C E42068BC */ swc1 $f0, %lo(D_802B68BC)($at) +/* E27FE0 802B60A0 3C0142B4 */ lui $at, 0x42b4 +/* E27FE4 802B60A4 44810000 */ mtc1 $at, $f0 +/* E27FE8 802B60A8 34420003 */ ori $v0, $v0, 3 +/* E27FEC 802B60AC A4620002 */ sh $v0, 2($v1) +/* E27FF0 802B60B0 3C01802B */ lui $at, %hi(D_802B68B4) +/* E27FF4 802B60B4 E42068B4 */ swc1 $f0, %lo(D_802B68B4)($at) +/* E27FF8 802B60B8 0C03A8CD */ jal subtract_hp +/* E27FFC 802B60BC 24040001 */ addiu $a0, $zero, 1 +/* E28000 802B60C0 0C03A5D8 */ jal open_status_menu_long +/* E28004 802B60C4 00000000 */ nop +/* E28008 802B60C8 240400E8 */ addiu $a0, $zero, 0xe8 +/* E2800C 802B60CC 3C03800A */ lui $v1, %hi(D_8009A650) +/* E28010 802B60D0 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) +/* E28014 802B60D4 8C620000 */ lw $v0, ($v1) +/* E28018 802B60D8 0000282D */ daddu $a1, $zero, $zero +/* E2801C 802B60DC 34420040 */ ori $v0, $v0, 0x40 +/* E28020 802B60E0 0C052736 */ jal play_sound_at_player +/* E28024 802B60E4 AC620000 */ sw $v0, ($v1) +.L802B60E8: +/* E28028 802B60E8 820300B6 */ lb $v1, 0xb6($s0) +/* E2802C 802B60EC 2C620016 */ sltiu $v0, $v1, 0x16 +/* E28030 802B60F0 104001C5 */ beqz $v0, .L802B6808 +/* E28034 802B60F4 00031080 */ sll $v0, $v1, 2 +/* E28038 802B60F8 3C01802B */ lui $at, %hi(D_802B6850) +/* E2803C 802B60FC 00220821 */ addu $at, $at, $v0 +/* E28040 802B6100 8C226850 */ lw $v0, %lo(D_802B6850)($at) +/* E28044 802B6104 00400008 */ jr $v0 +/* E28048 802B6108 00000000 */ nop +/* E2804C 802B610C 96020008 */ lhu $v0, 8($s0) +/* E28050 802B6110 2403FFFF */ addiu $v1, $zero, -1 +/* E28054 802B6114 2442FFFF */ addiu $v0, $v0, -1 +/* E28058 802B6118 A6020008 */ sh $v0, 8($s0) +/* E2805C 802B611C 00021400 */ sll $v0, $v0, 0x10 +/* E28060 802B6120 00021403 */ sra $v0, $v0, 0x10 +/* E28064 802B6124 504301B8 */ beql $v0, $v1, .L802B6808 +/* E28068 802B6128 A20000B6 */ sb $zero, 0xb6($s0) +/* E2806C 802B612C 080ADA02 */ j .L802B6808 +/* E28070 802B6130 00000000 */ nop +/* E28074 802B6134 96020008 */ lhu $v0, 8($s0) +/* E28078 802B6138 2403FFFF */ addiu $v1, $zero, -1 +/* E2807C 802B613C 2442FFFF */ addiu $v0, $v0, -1 +/* E28080 802B6140 A6020008 */ sh $v0, 8($s0) +/* E28084 802B6144 00021400 */ sll $v0, $v0, 0x10 +/* E28088 802B6148 00021403 */ sra $v0, $v0, 0x10 +/* E2808C 802B614C 50430001 */ beql $v0, $v1, .L802B6154 +/* E28090 802B6150 A20000B6 */ sb $zero, 0xb6($s0) +.L802B6154: +/* E28094 802B6154 C600002C */ lwc1 $f0, 0x2c($s0) +/* E28098 802B6158 3C014080 */ lui $at, 0x4080 +/* E2809C 802B615C 44811000 */ mtc1 $at, $f2 +/* E280A0 802B6160 00000000 */ nop +/* E280A4 802B6164 46020001 */ sub.s $f0, $f0, $f2 +/* E280A8 802B6168 080ADA02 */ j .L802B6808 +/* E280AC 802B616C E600002C */ swc1 $f0, 0x2c($s0) +/* E280B0 802B6170 820200BF */ lb $v0, 0xbf($s0) +/* E280B4 802B6174 24110001 */ addiu $s1, $zero, 1 +/* E280B8 802B6178 1451000C */ bne $v0, $s1, .L802B61AC +/* E280BC 802B617C 3C040008 */ lui $a0, 8 +/* E280C0 802B6180 0000202D */ daddu $a0, $zero, $zero +/* E280C4 802B6184 8E050028 */ lw $a1, 0x28($s0) +/* E280C8 802B6188 8E06002C */ lw $a2, 0x2c($s0) +/* E280CC 802B618C 8E070030 */ lw $a3, 0x30($s0) +/* E280D0 802B6190 3C013F80 */ lui $at, 0x3f80 +/* E280D4 802B6194 44810000 */ mtc1 $at, $f0 +/* E280D8 802B6198 24020028 */ addiu $v0, $zero, 0x28 +/* E280DC 802B619C AFA20014 */ sw $v0, 0x14($sp) +/* E280E0 802B61A0 0C01C1CC */ jal func_80070730 +/* E280E4 802B61A4 E7A00010 */ swc1 $f0, 0x10($sp) +/* E280E8 802B61A8 3C040008 */ lui $a0, 8 +.L802B61AC: +/* E280EC 802B61AC 0C037FDE */ jal func_800DFF78 +/* E280F0 802B61B0 34840002 */ ori $a0, $a0, 2 +/* E280F4 802B61B4 3C0141A0 */ lui $at, 0x41a0 +/* E280F8 802B61B8 44810000 */ mtc1 $at, $f0 +/* E280FC 802B61BC 3C01437A */ lui $at, 0x437a +/* E28100 802B61C0 44811000 */ mtc1 $at, $f2 +/* E28104 802B61C4 3C01802B */ lui $at, %hi(D_802B68BC) +/* E28108 802B61C8 C42468BC */ lwc1 $f4, %lo(D_802B68BC)($at) +/* E2810C 802B61CC C6060028 */ lwc1 $f6, 0x28($s0) +/* E28110 802B61D0 C6080030 */ lwc1 $f8, 0x30($s0) +/* E28114 802B61D4 C60A002C */ lwc1 $f10, 0x2c($s0) +/* E28118 802B61D8 8E030000 */ lw $v1, ($s0) +/* E2811C 802B61DC 24020002 */ addiu $v0, $zero, 2 +/* E28120 802B61E0 AE000074 */ sw $zero, 0x74($s0) +/* E28124 802B61E4 A60000C0 */ sh $zero, 0xc0($s0) +/* E28128 802B61E8 A60000C2 */ sh $zero, 0xc2($s0) +/* E2812C 802B61EC A20200B6 */ sb $v0, 0xb6($s0) +/* E28130 802B61F0 A6110008 */ sh $s1, 8($s0) +/* E28134 802B61F4 34630002 */ ori $v1, $v1, 2 +/* E28138 802B61F8 E6000070 */ swc1 $f0, 0x70($s0) +/* E2813C 802B61FC E6020078 */ swc1 $f2, 0x78($s0) +/* E28140 802B6200 E604007C */ swc1 $f4, 0x7c($s0) +/* E28144 802B6204 E606003C */ swc1 $f6, 0x3c($s0) +/* E28148 802B6208 E6080040 */ swc1 $f8, 0x40($s0) +/* E2814C 802B620C E60A004C */ swc1 $f10, 0x4c($s0) +/* E28150 802B6210 080ADA02 */ j .L802B6808 +/* E28154 802B6214 AE030000 */ sw $v1, ($s0) +/* E28158 802B6218 96020008 */ lhu $v0, 8($s0) +/* E2815C 802B621C 2442FFFF */ addiu $v0, $v0, -1 +/* E28160 802B6220 A6020008 */ sh $v0, 8($s0) +/* E28164 802B6224 00021400 */ sll $v0, $v0, 0x10 +/* E28168 802B6228 1C400177 */ bgtz $v0, .L802B6808 +/* E2816C 802B622C 00000000 */ nop +/* E28170 802B6230 920200B6 */ lbu $v0, 0xb6($s0) +/* E28174 802B6234 080AD9ED */ j .L802B67B4 +/* E28178 802B6238 24420001 */ addiu $v0, $v0, 1 +/* E2817C 802B623C 820300BF */ lb $v1, 0xbf($s0) +/* E28180 802B6240 24020001 */ addiu $v0, $zero, 1 +/* E28184 802B6244 1462000F */ bne $v1, $v0, .L802B6284 +/* E28188 802B6248 00000000 */ nop +/* E2818C 802B624C 960200C0 */ lhu $v0, 0xc0($s0) +/* E28190 802B6250 30420001 */ andi $v0, $v0, 1 +/* E28194 802B6254 1440000B */ bnez $v0, .L802B6284 +/* E28198 802B6258 0000202D */ daddu $a0, $zero, $zero +/* E2819C 802B625C 8E050028 */ lw $a1, 0x28($s0) +/* E281A0 802B6260 8E06002C */ lw $a2, 0x2c($s0) +/* E281A4 802B6264 8E070030 */ lw $a3, 0x30($s0) +/* E281A8 802B6268 3C013F33 */ lui $at, 0x3f33 +/* E281AC 802B626C 34213333 */ ori $at, $at, 0x3333 +/* E281B0 802B6270 44810000 */ mtc1 $at, $f0 +/* E281B4 802B6274 24020012 */ addiu $v0, $zero, 0x12 +/* E281B8 802B6278 AFA20014 */ sw $v0, 0x14($sp) +/* E281BC 802B627C 0C01C1CC */ jal func_80070730 +/* E281C0 802B6280 E7A00010 */ swc1 $f0, 0x10($sp) +.L802B6284: +/* E281C4 802B6284 C600007C */ lwc1 $f0, 0x7c($s0) +/* E281C8 802B6288 C6020078 */ lwc1 $f2, 0x78($s0) +/* E281CC 802B628C 46020080 */ add.s $f2, $f0, $f2 +/* E281D0 802B6290 C600002C */ lwc1 $f0, 0x2c($s0) +/* E281D4 802B6294 4602003C */ c.lt.s $f0, $f2 +/* E281D8 802B6298 00000000 */ nop +/* E281DC 802B629C 45000034 */ bc1f .L802B6370 +/* E281E0 802B62A0 27A50018 */ addiu $a1, $sp, 0x18 +/* E281E4 802B62A4 3C12802B */ lui $s2, %hi(D_802B68B4) +/* E281E8 802B62A8 265268B4 */ addiu $s2, $s2, %lo(D_802B68B4) +/* E281EC 802B62AC C64C0000 */ lwc1 $f12, ($s2) +/* E281F0 802B62B0 3C0140C9 */ lui $at, 0x40c9 +/* E281F4 802B62B4 34210FD0 */ ori $at, $at, 0xfd0 +/* E281F8 802B62B8 4481B000 */ mtc1 $at, $f22 +/* E281FC 802B62BC 00000000 */ nop +/* E28200 802B62C0 46166302 */ mul.s $f12, $f12, $f22 +/* E28204 802B62C4 00000000 */ nop +/* E28208 802B62C8 3C0143B4 */ lui $at, 0x43b4 +/* E2820C 802B62CC 4481A000 */ mtc1 $at, $f20 +/* E28210 802B62D0 27A6001C */ addiu $a2, $sp, 0x1c +/* E28214 802B62D4 0C00A82D */ jal sin_cos_rad +/* E28218 802B62D8 46146303 */ div.s $f12, $f12, $f20 +/* E2821C 802B62DC C64C0000 */ lwc1 $f12, ($s2) +/* E28220 802B62E0 46166302 */ mul.s $f12, $f12, $f22 +/* E28224 802B62E4 00000000 */ nop +/* E28228 802B62E8 0C00A85B */ jal sin_rad +/* E2822C 802B62EC 46146303 */ div.s $f12, $f12, $f20 +/* E28230 802B62F0 3C014180 */ lui $at, 0x4180 +/* E28234 802B62F4 44811000 */ mtc1 $at, $f2 +/* E28238 802B62F8 00000000 */ nop +/* E2823C 802B62FC 46020002 */ mul.s $f0, $f0, $f2 +/* E28240 802B6300 00000000 */ nop +/* E28244 802B6304 3C01BF80 */ lui $at, 0xbf80 +/* E28248 802B6308 44811000 */ mtc1 $at, $f2 +/* E2824C 802B630C 3C11802B */ lui $s1, %hi(D_802B68B0) +/* E28250 802B6310 263168B0 */ addiu $s1, $s1, %lo(D_802B68B0) +/* E28254 802B6314 4602003C */ c.lt.s $f0, $f2 +/* E28258 802B6318 00000000 */ nop +/* E2825C 802B631C 45000002 */ bc1f .L802B6328 +/* E28260 802B6320 E6200000 */ swc1 $f0, ($s1) +/* E28264 802B6324 E6220000 */ swc1 $f2, ($s1) +.L802B6328: +/* E28268 802B6328 C604002C */ lwc1 $f4, 0x2c($s0) +/* E2826C 802B632C C6200000 */ lwc1 $f0, ($s1) +/* E28270 802B6330 C6420000 */ lwc1 $f2, ($s2) +/* E28274 802B6334 46002100 */ add.s $f4, $f4, $f0 +/* E28278 802B6338 3C014040 */ lui $at, 0x4040 +/* E2827C 802B633C 44810000 */ mtc1 $at, $f0 +/* E28280 802B6340 00000000 */ nop +/* E28284 802B6344 46001080 */ add.s $f2, $f2, $f0 +/* E28288 802B6348 3C014334 */ lui $at, 0x4334 +/* E2828C 802B634C 44810000 */ mtc1 $at, $f0 +/* E28290 802B6350 E604002C */ swc1 $f4, 0x2c($s0) +/* E28294 802B6354 4602003C */ c.lt.s $f0, $f2 +/* E28298 802B6358 00000000 */ nop +/* E2829C 802B635C 4500012A */ bc1f .L802B6808 +/* E282A0 802B6360 E6420000 */ swc1 $f2, ($s2) +/* E282A4 802B6364 920200B6 */ lbu $v0, 0xb6($s0) +/* E282A8 802B6368 080AD9EC */ j .L802B67B0 +/* E282AC 802B636C E6400000 */ swc1 $f0, ($s2) +.L802B6370: +/* E282B0 802B6370 920200B6 */ lbu $v0, 0xb6($s0) +/* E282B4 802B6374 080AD9EC */ j .L802B67B0 +/* E282B8 802B6378 E602002C */ swc1 $f2, 0x2c($s0) +/* E282BC 802B637C 820300BF */ lb $v1, 0xbf($s0) +/* E282C0 802B6380 24020001 */ addiu $v0, $zero, 1 +/* E282C4 802B6384 14620011 */ bne $v1, $v0, .L802B63CC +/* E282C8 802B6388 27A40020 */ addiu $a0, $sp, 0x20 +/* E282CC 802B638C 960200C0 */ lhu $v0, 0xc0($s0) +/* E282D0 802B6390 30420001 */ andi $v0, $v0, 1 +/* E282D4 802B6394 1440000E */ bnez $v0, .L802B63D0 +/* E282D8 802B6398 27A50024 */ addiu $a1, $sp, 0x24 +/* E282DC 802B639C 0000202D */ daddu $a0, $zero, $zero +/* E282E0 802B63A0 8E050028 */ lw $a1, 0x28($s0) +/* E282E4 802B63A4 8E06002C */ lw $a2, 0x2c($s0) +/* E282E8 802B63A8 8E070030 */ lw $a3, 0x30($s0) +/* E282EC 802B63AC 3C013F33 */ lui $at, 0x3f33 +/* E282F0 802B63B0 34213333 */ ori $at, $at, 0x3333 +/* E282F4 802B63B4 44810000 */ mtc1 $at, $f0 +/* E282F8 802B63B8 24020012 */ addiu $v0, $zero, 0x12 +/* E282FC 802B63BC AFA20014 */ sw $v0, 0x14($sp) +/* E28300 802B63C0 0C01C1CC */ jal func_80070730 +/* E28304 802B63C4 E7A00010 */ swc1 $f0, 0x10($sp) +/* E28308 802B63C8 27A40020 */ addiu $a0, $sp, 0x20 +.L802B63CC: +/* E2830C 802B63CC 27A50024 */ addiu $a1, $sp, 0x24 +.L802B63D0: +/* E28310 802B63D0 0C0B27F5 */ jal func_802C9FD4 +/* E28314 802B63D4 27A60028 */ addiu $a2, $sp, 0x28 +/* E28318 802B63D8 14400005 */ bnez $v0, .L802B63F0 +/* E2831C 802B63DC 00000000 */ nop +/* E28320 802B63E0 C6000028 */ lwc1 $f0, 0x28($s0) +/* E28324 802B63E4 C6020030 */ lwc1 $f2, 0x30($s0) +/* E28328 802B63E8 E7A00020 */ swc1 $f0, 0x20($sp) +/* E2832C 802B63EC E7A20028 */ swc1 $f2, 0x28($sp) +.L802B63F0: +/* E28330 802B63F0 C7A00020 */ lwc1 $f0, 0x20($sp) +/* E28334 802B63F4 C602002C */ lwc1 $f2, 0x2c($s0) +/* E28338 802B63F8 3C013DEA */ lui $at, 0x3dea +/* E2833C 802B63FC 3421161E */ ori $at, $at, 0x161e +/* E28340 802B6400 44812000 */ mtc1 $at, $f4 +/* E28344 802B6404 3C01BE92 */ lui $at, 0xbe92 +/* E28348 802B6408 3421FEC5 */ ori $at, $at, 0xfec5 +/* E2834C 802B640C 44813000 */ mtc1 $at, $f6 +/* E28350 802B6410 3C01BE3A */ lui $at, 0xbe3a +/* E28354 802B6414 3421ACDA */ ori $at, $at, 0xacda +/* E28358 802B6418 44814000 */ mtc1 $at, $f8 +/* E2835C 802B641C 3C013C3C */ lui $at, 0x3c3c +/* E28360 802B6420 3421BE62 */ ori $at, $at, 0xbe62 +/* E28364 802B6424 44815000 */ mtc1 $at, $f10 +/* E28368 802B6428 920300B6 */ lbu $v1, 0xb6($s0) +/* E2836C 802B642C 4600040D */ trunc.w.s $f16, $f0 +/* E28370 802B6430 44028000 */ mfc1 $v0, $f16 +/* E28374 802B6434 00000000 */ nop +/* E28378 802B6438 A6020016 */ sh $v0, 0x16($s0) +/* E2837C 802B643C C7A00028 */ lwc1 $f0, 0x28($sp) +/* E28380 802B6440 24630001 */ addiu $v1, $v1, 1 +/* E28384 802B6444 E6020050 */ swc1 $f2, 0x50($s0) +/* E28388 802B6448 E6040070 */ swc1 $f4, 0x70($s0) +/* E2838C 802B644C E6060074 */ swc1 $f6, 0x74($s0) +/* E28390 802B6450 E6080078 */ swc1 $f8, 0x78($s0) +/* E28394 802B6454 E60A007C */ swc1 $f10, 0x7c($s0) +/* E28398 802B6458 A20300B6 */ sb $v1, 0xb6($s0) +/* E2839C 802B645C 4600040D */ trunc.w.s $f16, $f0 +/* E283A0 802B6460 44028000 */ mfc1 $v0, $f16 +/* E283A4 802B6464 080ADA02 */ j .L802B6808 +/* E283A8 802B6468 A602001A */ sh $v0, 0x1a($s0) +/* E283AC 802B646C C60C0028 */ lwc1 $f12, 0x28($s0) +/* E283B0 802B6470 C60E0030 */ lwc1 $f14, 0x30($s0) +/* E283B4 802B6474 86020016 */ lh $v0, 0x16($s0) +/* E283B8 802B6478 8603001A */ lh $v1, 0x1a($s0) +/* E283BC 802B647C 44828000 */ mtc1 $v0, $f16 +/* E283C0 802B6480 00000000 */ nop +/* E283C4 802B6484 46808420 */ cvt.s.w $f16, $f16 +/* E283C8 802B6488 44068000 */ mfc1 $a2, $f16 +/* E283CC 802B648C 44838000 */ mtc1 $v1, $f16 +/* E283D0 802B6490 00000000 */ nop +/* E283D4 802B6494 46808420 */ cvt.s.w $f16, $f16 +/* E283D8 802B6498 44078000 */ mfc1 $a3, $f16 +/* E283DC 802B649C 0C00A720 */ jal atan2 +/* E283E0 802B64A0 00000000 */ nop +/* E283E4 802B64A4 86020016 */ lh $v0, 0x16($s0) +/* E283E8 802B64A8 8603001A */ lh $v1, 0x1a($s0) +/* E283EC 802B64AC 3C01802B */ lui $at, %hi(D_802B68B8) +/* E283F0 802B64B0 E42068B8 */ swc1 $f0, %lo(D_802B68B8)($at) +/* E283F4 802B64B4 44826000 */ mtc1 $v0, $f12 +/* E283F8 802B64B8 00000000 */ nop +/* E283FC 802B64BC 46806320 */ cvt.s.w $f12, $f12 +/* E28400 802B64C0 44837000 */ mtc1 $v1, $f14 +/* E28404 802B64C4 00000000 */ nop +/* E28408 802B64C8 0C038022 */ jal func_800E0088 +/* E2840C 802B64CC 468073A0 */ cvt.s.w $f14, $f14 +/* E28410 802B64D0 3C014190 */ lui $at, 0x4190 +/* E28414 802B64D4 44811000 */ mtc1 $at, $f2 +/* E28418 802B64D8 920200B6 */ lbu $v0, 0xb6($s0) +/* E2841C 802B64DC 46020003 */ div.s $f0, $f0, $f2 +/* E28420 802B64E0 24420001 */ addiu $v0, $v0, 1 +/* E28424 802B64E4 E6000054 */ swc1 $f0, 0x54($s0) +/* E28428 802B64E8 080ADA02 */ j .L802B6808 +/* E2842C 802B64EC A20200B6 */ sb $v0, 0xb6($s0) +/* E28430 802B64F0 C60C0028 */ lwc1 $f12, 0x28($s0) +/* E28434 802B64F4 C60E0030 */ lwc1 $f14, 0x30($s0) +/* E28438 802B64F8 86020016 */ lh $v0, 0x16($s0) +/* E2843C 802B64FC 8603001A */ lh $v1, 0x1a($s0) +/* E28440 802B6500 44828000 */ mtc1 $v0, $f16 +/* E28444 802B6504 00000000 */ nop +/* E28448 802B6508 46808420 */ cvt.s.w $f16, $f16 +/* E2844C 802B650C 44068000 */ mfc1 $a2, $f16 +/* E28450 802B6510 44838000 */ mtc1 $v1, $f16 +/* E28454 802B6514 00000000 */ nop +/* E28458 802B6518 46808420 */ cvt.s.w $f16, $f16 +/* E2845C 802B651C 44078000 */ mfc1 $a3, $f16 +/* E28460 802B6520 0C00A720 */ jal atan2 +/* E28464 802B6524 00000000 */ nop +/* E28468 802B6528 3C0140C9 */ lui $at, 0x40c9 +/* E2846C 802B652C 34210FD0 */ ori $at, $at, 0xfd0 +/* E28470 802B6530 44811000 */ mtc1 $at, $f2 +/* E28474 802B6534 00000000 */ nop +/* E28478 802B6538 46020082 */ mul.s $f2, $f0, $f2 +/* E2847C 802B653C 00000000 */ nop +/* E28480 802B6540 3C0143B4 */ lui $at, 0x43b4 +/* E28484 802B6544 44812000 */ mtc1 $at, $f4 +/* E28488 802B6548 3C01802B */ lui $at, %hi(D_802B68B8) +/* E2848C 802B654C E42068B8 */ swc1 $f0, %lo(D_802B68B8)($at) +/* E28490 802B6550 46041503 */ div.s $f20, $f2, $f4 +/* E28494 802B6554 0C00A85B */ jal sin_rad +/* E28498 802B6558 4600A306 */ mov.s $f12, $f20 +/* E2849C 802B655C C6020054 */ lwc1 $f2, 0x54($s0) +/* E284A0 802B6560 46001102 */ mul.s $f4, $f2, $f0 +/* E284A4 802B6564 00000000 */ nop +/* E284A8 802B6568 C6000028 */ lwc1 $f0, 0x28($s0) +/* E284AC 802B656C 44801000 */ mtc1 $zero, $f2 +/* E284B0 802B6570 46040000 */ add.s $f0, $f0, $f4 +/* E284B4 802B6574 AFA0002C */ sw $zero, 0x2c($sp) +/* E284B8 802B6578 4604103E */ c.le.s $f2, $f4 +/* E284BC 802B657C 00000000 */ nop +/* E284C0 802B6580 45000008 */ bc1f .L802B65A4 +/* E284C4 802B6584 E6000028 */ swc1 $f0, 0x28($s0) +/* E284C8 802B6588 86020016 */ lh $v0, 0x16($s0) +/* E284CC 802B658C 44821000 */ mtc1 $v0, $f2 +/* E284D0 802B6590 00000000 */ nop +/* E284D4 802B6594 468010A0 */ cvt.s.w $f2, $f2 +/* E284D8 802B6598 4600103E */ c.le.s $f2, $f0 +/* E284DC 802B659C 080AD970 */ j .L802B65C0 +/* E284E0 802B65A0 00000000 */ nop +.L802B65A4: +/* E284E4 802B65A4 86020016 */ lh $v0, 0x16($s0) +/* E284E8 802B65A8 C6000028 */ lwc1 $f0, 0x28($s0) +/* E284EC 802B65AC 44821000 */ mtc1 $v0, $f2 +/* E284F0 802B65B0 00000000 */ nop +/* E284F4 802B65B4 468010A0 */ cvt.s.w $f2, $f2 +/* E284F8 802B65B8 4602003E */ c.le.s $f0, $f2 +/* E284FC 802B65BC 00000000 */ nop +.L802B65C0: +/* E28500 802B65C0 45000003 */ bc1f .L802B65D0 +/* E28504 802B65C4 24020001 */ addiu $v0, $zero, 1 +/* E28508 802B65C8 E6020028 */ swc1 $f2, 0x28($s0) +/* E2850C 802B65CC AFA2002C */ sw $v0, 0x2c($sp) +.L802B65D0: +/* E28510 802B65D0 0C00A874 */ jal cos_rad +/* E28514 802B65D4 4600A306 */ mov.s $f12, $f20 +/* E28518 802B65D8 C6020054 */ lwc1 $f2, 0x54($s0) +/* E2851C 802B65DC 46001102 */ mul.s $f4, $f2, $f0 +/* E28520 802B65E0 00000000 */ nop +/* E28524 802B65E4 C6000030 */ lwc1 $f0, 0x30($s0) +/* E28528 802B65E8 46040081 */ sub.s $f2, $f0, $f4 +/* E2852C 802B65EC 44800000 */ mtc1 $zero, $f0 +/* E28530 802B65F0 00000000 */ nop +/* E28534 802B65F4 4604003E */ c.le.s $f0, $f4 +/* E28538 802B65F8 00000000 */ nop +/* E2853C 802B65FC 45000008 */ bc1f .L802B6620 +/* E28540 802B6600 E6020030 */ swc1 $f2, 0x30($s0) +/* E28544 802B6604 8602001A */ lh $v0, 0x1a($s0) +/* E28548 802B6608 44820000 */ mtc1 $v0, $f0 +/* E2854C 802B660C 00000000 */ nop +/* E28550 802B6610 46800020 */ cvt.s.w $f0, $f0 +/* E28554 802B6614 4600103E */ c.le.s $f2, $f0 +/* E28558 802B6618 080AD98E */ j .L802B6638 +/* E2855C 802B661C 00000000 */ nop +.L802B6620: +/* E28560 802B6620 8602001A */ lh $v0, 0x1a($s0) +/* E28564 802B6624 44820000 */ mtc1 $v0, $f0 +/* E28568 802B6628 00000000 */ nop +/* E2856C 802B662C 46800020 */ cvt.s.w $f0, $f0 +/* E28570 802B6630 4602003E */ c.le.s $f0, $f2 +/* E28574 802B6634 00000000 */ nop +.L802B6638: +/* E28578 802B6638 45000005 */ bc1f .L802B6650 +/* E2857C 802B663C 00000000 */ nop +/* E28580 802B6640 8FA2002C */ lw $v0, 0x2c($sp) +/* E28584 802B6644 E6000030 */ swc1 $f0, 0x30($s0) +/* E28588 802B6648 24420001 */ addiu $v0, $v0, 1 +/* E2858C 802B664C AFA2002C */ sw $v0, 0x2c($sp) +.L802B6650: +/* E28590 802B6650 8FA3002C */ lw $v1, 0x2c($sp) +/* E28594 802B6654 24020002 */ addiu $v0, $zero, 2 +/* E28598 802B6658 1462006B */ bne $v1, $v0, .L802B6808 +/* E2859C 802B665C 00000000 */ nop +/* E285A0 802B6660 920200B6 */ lbu $v0, 0xb6($s0) +/* E285A4 802B6664 080AD9ED */ j .L802B67B4 +/* E285A8 802B6668 24420001 */ addiu $v0, $v0, 1 +/* E285AC 802B666C 820300BF */ lb $v1, 0xbf($s0) +/* E285B0 802B6670 24020001 */ addiu $v0, $zero, 1 +/* E285B4 802B6674 1462000F */ bne $v1, $v0, .L802B66B4 +/* E285B8 802B6678 00000000 */ nop +/* E285BC 802B667C 960200C0 */ lhu $v0, 0xc0($s0) +/* E285C0 802B6680 30420001 */ andi $v0, $v0, 1 +/* E285C4 802B6684 1440000B */ bnez $v0, .L802B66B4 +/* E285C8 802B6688 0000202D */ daddu $a0, $zero, $zero +/* E285CC 802B668C 8E050028 */ lw $a1, 0x28($s0) +/* E285D0 802B6690 8E06002C */ lw $a2, 0x2c($s0) +/* E285D4 802B6694 8E070030 */ lw $a3, 0x30($s0) +/* E285D8 802B6698 3C013F33 */ lui $at, 0x3f33 +/* E285DC 802B669C 34213333 */ ori $at, $at, 0x3333 +/* E285E0 802B66A0 44810000 */ mtc1 $at, $f0 +/* E285E4 802B66A4 24020012 */ addiu $v0, $zero, 0x12 +/* E285E8 802B66A8 AFA20014 */ sw $v0, 0x14($sp) +/* E285EC 802B66AC 0C01C1CC */ jal func_80070730 +/* E285F0 802B66B0 E7A00010 */ swc1 $f0, 0x10($sp) +.L802B66B4: +/* E285F4 802B66B4 0C038D36 */ jal func_800E34D8 +/* E285F8 802B66B8 00000000 */ nop +/* E285FC 802B66BC 46000306 */ mov.s $f12, $f0 +/* E28600 802B66C0 0C038D45 */ jal func_800E3514 +/* E28604 802B66C4 27A5002C */ addiu $a1, $sp, 0x2c +/* E28608 802B66C8 8FA2002C */ lw $v0, 0x2c($sp) +/* E2860C 802B66CC 0440004E */ bltz $v0, .L802B6808 +/* E28610 802B66D0 E600002C */ swc1 $f0, 0x2c($s0) +/* E28614 802B66D4 0000202D */ daddu $a0, $zero, $zero +/* E28618 802B66D8 24050002 */ addiu $a1, $zero, 2 +/* E2861C 802B66DC 3C073F4C */ lui $a3, 0x3f4c +/* E28620 802B66E0 34E7CCCD */ ori $a3, $a3, 0xcccd +/* E28624 802B66E4 0C0B2D72 */ jal exec_ShakeCamX +/* E28628 802B66E8 24060001 */ addiu $a2, $zero, 1 +/* E2862C 802B66EC 24040100 */ addiu $a0, $zero, 0x100 +/* E28630 802B66F0 0C00A3C2 */ jal start_rumble +/* E28634 802B66F4 24050032 */ addiu $a1, $zero, 0x32 +/* E28638 802B66F8 0C03954C */ jal func_800E5530 +/* E2863C 802B66FC 00000000 */ nop +/* E28640 802B6700 240403FB */ addiu $a0, $zero, 0x3fb +/* E28644 802B6704 3C03800B */ lui $v1, %hi(gCameras) +/* E28648 802B6708 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* E2864C 802B670C 94620002 */ lhu $v0, 2($v1) +/* E28650 802B6710 0000282D */ daddu $a1, $zero, $zero +/* E28654 802B6714 3042FFFD */ andi $v0, $v0, 0xfffd +/* E28658 802B6718 0C052736 */ jal play_sound_at_player +/* E2865C 802B671C A4620002 */ sh $v0, 2($v1) +/* E28660 802B6720 3C040008 */ lui $a0, 8 +/* E28664 802B6724 0C037FDE */ jal func_800DFF78 +/* E28668 802B6728 3484001A */ ori $a0, $a0, 0x1a +/* E2866C 802B672C 8E020000 */ lw $v0, ($s0) +/* E28670 802B6730 3C0140C0 */ lui $at, 0x40c0 +/* E28674 802B6734 44811000 */ mtc1 $at, $f2 +/* E28678 802B6738 C600002C */ lwc1 $f0, 0x2c($s0) +/* E2867C 802B673C 2403F7FF */ addiu $v1, $zero, -0x801 +/* E28680 802B6740 A20000BF */ sb $zero, 0xbf($s0) +/* E28684 802B6744 00431024 */ and $v0, $v0, $v1 +/* E28688 802B6748 2403FFF7 */ addiu $v1, $zero, -9 +/* E2868C 802B674C 00431024 */ and $v0, $v0, $v1 +/* E28690 802B6750 AE020000 */ sw $v0, ($s0) +/* E28694 802B6754 920200B6 */ lbu $v0, 0xb6($s0) +/* E28698 802B6758 46020000 */ add.s $f0, $f0, $f2 +/* E2869C 802B675C E6020070 */ swc1 $f2, 0x70($s0) +/* E286A0 802B6760 24420001 */ addiu $v0, $v0, 1 +/* E286A4 802B6764 A20200B6 */ sb $v0, 0xb6($s0) +/* E286A8 802B6768 080ADA02 */ j .L802B6808 +/* E286AC 802B676C E600002C */ swc1 $f0, 0x2c($s0) +/* E286B0 802B6770 C60C0070 */ lwc1 $f12, 0x70($s0) +/* E286B4 802B6774 3C013FF0 */ lui $at, 0x3ff0 +/* E286B8 802B6778 44810800 */ mtc1 $at, $f1 +/* E286BC 802B677C 44800000 */ mtc1 $zero, $f0 +/* E286C0 802B6780 46006321 */ cvt.d.s $f12, $f12 +/* E286C4 802B6784 46206301 */ sub.d $f12, $f12, $f0 +/* E286C8 802B6788 27A5002C */ addiu $a1, $sp, 0x2c +/* E286CC 802B678C 46206320 */ cvt.s.d $f12, $f12 +/* E286D0 802B6790 0C038D45 */ jal func_800E3514 +/* E286D4 802B6794 E60C0070 */ swc1 $f12, 0x70($s0) +/* E286D8 802B6798 8FA2002C */ lw $v0, 0x2c($sp) +/* E286DC 802B679C 0440001A */ bltz $v0, .L802B6808 +/* E286E0 802B67A0 E600002C */ swc1 $f0, 0x2c($s0) +/* E286E4 802B67A4 920200B6 */ lbu $v0, 0xb6($s0) +/* E286E8 802B67A8 2403000A */ addiu $v1, $zero, 0xa +/* E286EC 802B67AC A6030008 */ sh $v1, 8($s0) +.L802B67B0: +/* E286F0 802B67B0 24420001 */ addiu $v0, $v0, 1 +.L802B67B4: +/* E286F4 802B67B4 080ADA02 */ j .L802B6808 +/* E286F8 802B67B8 A20200B6 */ sb $v0, 0xb6($s0) +/* E286FC 802B67BC 96020008 */ lhu $v0, 8($s0) +/* E28700 802B67C0 2442FFFF */ addiu $v0, $v0, -1 +/* E28704 802B67C4 A6020008 */ sh $v0, 8($s0) +/* E28708 802B67C8 00021400 */ sll $v0, $v0, 0x10 +/* E2870C 802B67CC 1C40000E */ bgtz $v0, .L802B6808 +/* E28710 802B67D0 00000000 */ nop +/* E28714 802B67D4 0C039769 */ jal set_action_state +/* E28718 802B67D8 2404000A */ addiu $a0, $zero, 0xa +/* E2871C 802B67DC 3C03FF7F */ lui $v1, 0xff7f +/* E28720 802B67E0 3463FFFF */ ori $v1, $v1, 0xffff +/* E28724 802B67E4 8E020000 */ lw $v0, ($s0) +/* E28728 802B67E8 3C04800A */ lui $a0, %hi(D_8009A650) +/* E2872C 802B67EC 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) +/* E28730 802B67F0 00431024 */ and $v0, $v0, $v1 +/* E28734 802B67F4 AE020000 */ sw $v0, ($s0) +/* E28738 802B67F8 8C820000 */ lw $v0, ($a0) +/* E2873C 802B67FC 2403FFBF */ addiu $v1, $zero, -0x41 +/* E28740 802B6800 00431024 */ and $v0, $v0, $v1 +/* E28744 802B6804 AC820000 */ sw $v0, ($a0) +.L802B6808: +/* E28748 802B6808 820200B6 */ lb $v0, 0xb6($s0) +/* E2874C 802B680C 28420007 */ slti $v0, $v0, 7 +/* E28750 802B6810 10400004 */ beqz $v0, .L802B6824 +/* E28754 802B6814 00000000 */ nop +/* E28758 802B6818 960200C0 */ lhu $v0, 0xc0($s0) +/* E2875C 802B681C 24420001 */ addiu $v0, $v0, 1 +/* E28760 802B6820 A60200C0 */ sh $v0, 0xc0($s0) +.L802B6824: +/* E28764 802B6824 8FBF003C */ lw $ra, 0x3c($sp) +/* E28768 802B6828 8FB20038 */ lw $s2, 0x38($sp) +/* E2876C 802B682C 8FB10034 */ lw $s1, 0x34($sp) +/* E28770 802B6830 8FB00030 */ lw $s0, 0x30($sp) +/* E28774 802B6834 D7B60048 */ ldc1 $f22, 0x48($sp) +/* E28778 802B6838 D7B40040 */ ldc1 $f20, 0x40($sp) +/* E2877C 802B683C 03E00008 */ jr $ra +/* E28780 802B6840 27BD0050 */ addiu $sp, $sp, 0x50 +/* E28784 802B6844 00000000 */ nop +/* E28788 802B6848 00000000 */ nop +/* E2878C 802B684C 00000000 */ nop diff --git a/asm/nonmatchings/code_E287F0/func_802B6000_E287F0.s b/asm/nonmatchings/code_E287F0/func_802B6000_E287F0.s new file mode 100644 index 0000000000..3d264212ac --- /dev/null +++ b/asm/nonmatchings/code_E287F0/func_802B6000_E287F0.s @@ -0,0 +1,152 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E287F0 +/* E287F0 802B6000 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E287F4 802B6004 AFB00020 */ sw $s0, 0x20($sp) +/* E287F8 802B6008 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E287FC 802B600C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E28800 802B6010 AFBF0028 */ sw $ra, 0x28($sp) +/* E28804 802B6014 AFB10024 */ sw $s1, 0x24($sp) +/* E28808 802B6018 8E030000 */ lw $v1, ($s0) +/* E2880C 802B601C 0461003E */ bgez $v1, .L802B6118 +/* E28810 802B6020 0200882D */ daddu $s1, $s0, $zero +/* E28814 802B6024 3C027FFF */ lui $v0, 0x7fff +/* E28818 802B6028 3442FFFF */ ori $v0, $v0, 0xffff +/* E2881C 802B602C 3C040001 */ lui $a0, 1 +/* E28820 802B6030 34840017 */ ori $a0, $a0, 0x17 +/* E28824 802B6034 00621024 */ and $v0, $v1, $v0 +/* E28828 802B6038 0C037FDE */ jal func_800DFF78 +/* E2882C 802B603C AE020000 */ sw $v0, ($s0) +/* E28830 802B6040 C60C0028 */ lwc1 $f12, 0x28($s0) +/* E28834 802B6044 C60E0030 */ lwc1 $f14, 0x30($s0) +/* E28838 802B6048 86020016 */ lh $v0, 0x16($s0) +/* E2883C 802B604C 3C014192 */ lui $at, 0x4192 +/* E28840 802B6050 3421C745 */ ori $at, $at, 0xc745 +/* E28844 802B6054 44810000 */ mtc1 $at, $f0 +/* E28848 802B6058 3C01C06F */ lui $at, 0xc06f +/* E2884C 802B605C 34213B64 */ ori $at, $at, 0x3b64 +/* E28850 802B6060 44811000 */ mtc1 $at, $f2 +/* E28854 802B6064 3C013F4E */ lui $at, 0x3f4e +/* E28858 802B6068 34214F76 */ ori $at, $at, 0x4f76 +/* E2885C 802B606C 44812000 */ mtc1 $at, $f4 +/* E28860 802B6070 3C01BDCA */ lui $at, 0xbdca +/* E28864 802B6074 3421233A */ ori $at, $at, 0x233a +/* E28868 802B6078 44813000 */ mtc1 $at, $f6 +/* E2886C 802B607C 8604001A */ lh $a0, 0x1a($s0) +/* E28870 802B6080 3C03800B */ lui $v1, %hi(gCameras) +/* E28874 802B6084 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* E28878 802B6088 A20000B6 */ sb $zero, 0xb6($s0) +/* E2887C 802B608C 44824000 */ mtc1 $v0, $f8 +/* E28880 802B6090 00000000 */ nop +/* E28884 802B6094 46804220 */ cvt.s.w $f8, $f8 +/* E28888 802B6098 44064000 */ mfc1 $a2, $f8 +/* E2888C 802B609C 8E020000 */ lw $v0, ($s0) +/* E28890 802B60A0 44844000 */ mtc1 $a0, $f8 +/* E28894 802B60A4 00000000 */ nop +/* E28898 802B60A8 46804220 */ cvt.s.w $f8, $f8 +/* E2889C 802B60AC E6000070 */ swc1 $f0, 0x70($s0) +/* E288A0 802B60B0 E6020074 */ swc1 $f2, 0x74($s0) +/* E288A4 802B60B4 E6040078 */ swc1 $f4, 0x78($s0) +/* E288A8 802B60B8 E606007C */ swc1 $f6, 0x7c($s0) +/* E288AC 802B60BC 34420008 */ ori $v0, $v0, 8 +/* E288B0 802B60C0 AE020000 */ sw $v0, ($s0) +/* E288B4 802B60C4 94620002 */ lhu $v0, 2($v1) +/* E288B8 802B60C8 44074000 */ mfc1 $a3, $f8 +/* E288BC 802B60CC 34420001 */ ori $v0, $v0, 1 +/* E288C0 802B60D0 0C00A720 */ jal atan2 +/* E288C4 802B60D4 A4620002 */ sh $v0, 2($v1) +/* E288C8 802B60D8 86020016 */ lh $v0, 0x16($s0) +/* E288CC 802B60DC 8603001A */ lh $v1, 0x1a($s0) +/* E288D0 802B60E0 3C01802B */ lui $at, %hi(D_802B6240) +/* E288D4 802B60E4 E4206240 */ swc1 $f0, %lo(D_802B6240)($at) +/* E288D8 802B60E8 44826000 */ mtc1 $v0, $f12 +/* E288DC 802B60EC 00000000 */ nop +/* E288E0 802B60F0 46806320 */ cvt.s.w $f12, $f12 +/* E288E4 802B60F4 44837000 */ mtc1 $v1, $f14 +/* E288E8 802B60F8 00000000 */ nop +/* E288EC 802B60FC 0C038022 */ jal func_800E0088 +/* E288F0 802B6100 468073A0 */ cvt.s.w $f14, $f14 +/* E288F4 802B6104 3C014190 */ lui $at, 0x4190 +/* E288F8 802B6108 44811000 */ mtc1 $at, $f2 +/* E288FC 802B610C 00000000 */ nop +/* E28900 802B6110 46020003 */ div.s $f0, $f0, $f2 +/* E28904 802B6114 E6000054 */ swc1 $f0, 0x54($s0) +.L802B6118: +/* E28908 802B6118 3C01802B */ lui $at, %hi(D_802B6240) +/* E2890C 802B611C C42C6240 */ lwc1 $f12, %lo(D_802B6240)($at) +/* E28910 802B6120 3C0140C9 */ lui $at, 0x40c9 +/* E28914 802B6124 34210FD0 */ ori $at, $at, 0xfd0 +/* E28918 802B6128 44810000 */ mtc1 $at, $f0 +/* E2891C 802B612C 00000000 */ nop +/* E28920 802B6130 46006302 */ mul.s $f12, $f12, $f0 +/* E28924 802B6134 00000000 */ nop +/* E28928 802B6138 27A50010 */ addiu $a1, $sp, 0x10 +/* E2892C 802B613C 3C0143B4 */ lui $at, 0x43b4 +/* E28930 802B6140 44810000 */ mtc1 $at, $f0 +/* E28934 802B6144 27A60014 */ addiu $a2, $sp, 0x14 +/* E28938 802B6148 0C00A82D */ jal sin_cos_rad +/* E2893C 802B614C 46006303 */ div.s $f12, $f12, $f0 +/* E28940 802B6150 3C030004 */ lui $v1, 4 +/* E28944 802B6154 8E020000 */ lw $v0, ($s0) +/* E28948 802B6158 C6020054 */ lwc1 $f2, 0x54($s0) +/* E2894C 802B615C 00431024 */ and $v0, $v0, $v1 +/* E28950 802B6160 10400006 */ beqz $v0, .L802B617C +/* E28954 802B6164 00000000 */ nop +/* E28958 802B6168 3C013F00 */ lui $at, 0x3f00 +/* E2895C 802B616C 44810000 */ mtc1 $at, $f0 +/* E28960 802B6170 00000000 */ nop +/* E28964 802B6174 46001082 */ mul.s $f2, $f2, $f0 +/* E28968 802B6178 00000000 */ nop +.L802B617C: +/* E2896C 802B617C C7A00010 */ lwc1 $f0, 0x10($sp) +/* E28970 802B6180 46001002 */ mul.s $f0, $f2, $f0 +/* E28974 802B6184 00000000 */ nop +/* E28978 802B6188 C7A40014 */ lwc1 $f4, 0x14($sp) +/* E2897C 802B618C 46041102 */ mul.s $f4, $f2, $f4 +/* E28980 802B6190 00000000 */ nop +/* E28984 802B6194 C6020028 */ lwc1 $f2, 0x28($s0) +/* E28988 802B6198 46001080 */ add.s $f2, $f2, $f0 +/* E2898C 802B619C C6000030 */ lwc1 $f0, 0x30($s0) +/* E28990 802B61A0 820200B6 */ lb $v0, 0xb6($s0) +/* E28994 802B61A4 46040001 */ sub.s $f0, $f0, $f4 +/* E28998 802B61A8 E6020028 */ swc1 $f2, 0x28($s0) +/* E2899C 802B61AC 14400012 */ bnez $v0, .L802B61F8 +/* E289A0 802B61B0 E6000030 */ swc1 $f0, 0x30($s0) +/* E289A4 802B61B4 0C038D12 */ jal integrate_gravity +/* E289A8 802B61B8 00000000 */ nop +/* E289AC 802B61BC C600002C */ lwc1 $f0, 0x2c($s0) +/* E289B0 802B61C0 C6040070 */ lwc1 $f4, 0x70($s0) +/* E289B4 802B61C4 46040000 */ add.s $f0, $f0, $f4 +/* E289B8 802B61C8 44801000 */ mtc1 $zero, $f2 +/* E289BC 802B61CC 00000000 */ nop +/* E289C0 802B61D0 4602203C */ c.lt.s $f4, $f2 +/* E289C4 802B61D4 00000000 */ nop +/* E289C8 802B61D8 45000014 */ bc1f .L802B622C +/* E289CC 802B61DC E600002C */ swc1 $f0, 0x2c($s0) +/* E289D0 802B61E0 8E020000 */ lw $v0, ($s0) +/* E289D4 802B61E4 24030001 */ addiu $v1, $zero, 1 +/* E289D8 802B61E8 A20300B6 */ sb $v1, 0xb6($s0) +/* E289DC 802B61EC 34420004 */ ori $v0, $v0, 4 +/* E289E0 802B61F0 080AD88B */ j .L802B622C +/* E289E4 802B61F4 AE020000 */ sw $v0, ($s0) +.L802B61F8: +/* E289E8 802B61F8 0C038D36 */ jal func_800E34D8 +/* E289EC 802B61FC 00000000 */ nop +/* E289F0 802B6200 46000306 */ mov.s $f12, $f0 +/* E289F4 802B6204 0C038D45 */ jal func_800E3514 +/* E289F8 802B6208 27A50018 */ addiu $a1, $sp, 0x18 +/* E289FC 802B620C 8FA40018 */ lw $a0, 0x18($sp) +/* E28A00 802B6210 04800006 */ bltz $a0, .L802B622C +/* E28A04 802B6214 E620002C */ swc1 $f0, 0x2c($s1) +/* E28A08 802B6218 0C016F6A */ jal get_collider_type_by_id +/* E28A0C 802B621C 00000000 */ nop +/* E28A10 802B6220 AFA20018 */ sw $v0, 0x18($sp) +/* E28A14 802B6224 0C039769 */ jal set_action_state +/* E28A18 802B6228 2404000A */ addiu $a0, $zero, 0xa +.L802B622C: +/* E28A1C 802B622C 8FBF0028 */ lw $ra, 0x28($sp) +/* E28A20 802B6230 8FB10024 */ lw $s1, 0x24($sp) +/* E28A24 802B6234 8FB00020 */ lw $s0, 0x20($sp) +/* E28A28 802B6238 03E00008 */ jr $ra +/* E28A2C 802B623C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_E28A30/func_802B6000_E28A30.s b/asm/nonmatchings/code_E28A30/func_802B6000_E28A30.s new file mode 100644 index 0000000000..3adb9c060f --- /dev/null +++ b/asm/nonmatchings/code_E28A30/func_802B6000_E28A30.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E28A30 +/* E28A30 802B6000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E28A34 802B6004 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* E28A38 802B6008 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* E28A3C 802B600C AFBF0010 */ sw $ra, 0x10($sp) +/* E28A40 802B6010 8C640000 */ lw $a0, ($v1) +/* E28A44 802B6014 0481000B */ bgez $a0, .L802B6044 +/* E28A48 802B6018 0060282D */ daddu $a1, $v1, $zero +/* E28A4C 802B601C 3C027FF7 */ lui $v0, 0x7ff7 +/* E28A50 802B6020 3442FFF1 */ ori $v0, $v0, 0xfff1 +/* E28A54 802B6024 00821024 */ and $v0, $a0, $v0 +/* E28A58 802B6028 AC620000 */ sw $v0, ($v1) +/* E28A5C 802B602C A06000B6 */ sb $zero, 0xb6($v1) +/* E28A60 802B6030 A4600008 */ sh $zero, 8($v1) +/* E28A64 802B6034 A46000C0 */ sh $zero, 0xc0($v1) +/* E28A68 802B6038 A46000C2 */ sh $zero, 0xc2($v1) +/* E28A6C 802B603C AC600054 */ sw $zero, 0x54($v1) +/* E28A70 802B6040 AC60008C */ sw $zero, 0x8c($v1) +.L802B6044: +/* E28A74 802B6044 8CA20004 */ lw $v0, 4($a1) +/* E28A78 802B6048 3C030040 */ lui $v1, 0x40 +/* E28A7C 802B604C 00431024 */ and $v0, $v0, $v1 +/* E28A80 802B6050 1040000F */ beqz $v0, .L802B6090 +/* E28A84 802B6054 00000000 */ nop +/* E28A88 802B6058 3C028011 */ lui $v0, %hi(D_8010EBB0) +/* E28A8C 802B605C 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) +/* E28A90 802B6060 80430003 */ lb $v1, 3($v0) +/* E28A94 802B6064 24020008 */ addiu $v0, $zero, 8 +/* E28A98 802B6068 14620005 */ bne $v1, $v0, .L802B6080 +/* E28A9C 802B606C 24020007 */ addiu $v0, $zero, 7 +/* E28AA0 802B6070 0C0AF440 */ jal func_802BD100 +/* E28AA4 802B6074 00000000 */ nop +/* E28AA8 802B6078 080AD824 */ j .L802B6090 +/* E28AAC 802B607C 00000000 */ nop +.L802B6080: +/* E28AB0 802B6080 14620003 */ bne $v1, $v0, .L802B6090 +/* E28AB4 802B6084 00000000 */ nop +/* E28AB8 802B6088 0C0AF440 */ jal func_802BD100 +/* E28ABC 802B608C 00000000 */ nop +.L802B6090: +/* E28AC0 802B6090 8FBF0010 */ lw $ra, 0x10($sp) +/* E28AC4 802B6094 03E00008 */ jr $ra +/* E28AC8 802B6098 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E28A30/func_802B609C_E28ACC.s b/asm/nonmatchings/code_E28A30/func_802B609C_E28ACC.s new file mode 100644 index 0000000000..e15b4c2330 --- /dev/null +++ b/asm/nonmatchings/code_E28A30/func_802B609C_E28ACC.s @@ -0,0 +1,186 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B609C_E28ACC +/* E28ACC 802B609C 27BDFF90 */ addiu $sp, $sp, -0x70 +/* E28AD0 802B60A0 AFB20058 */ sw $s2, 0x58($sp) +/* E28AD4 802B60A4 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* E28AD8 802B60A8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* E28ADC 802B60AC AFBF005C */ sw $ra, 0x5c($sp) +/* E28AE0 802B60B0 AFB10054 */ sw $s1, 0x54($sp) +/* E28AE4 802B60B4 AFB00050 */ sw $s0, 0x50($sp) +/* E28AE8 802B60B8 F7B60068 */ sdc1 $f22, 0x68($sp) +/* E28AEC 802B60BC F7B40060 */ sdc1 $f20, 0x60($sp) +/* E28AF0 802B60C0 8E430000 */ lw $v1, ($s2) +/* E28AF4 802B60C4 0461000E */ bgez $v1, .L802B6100 +/* E28AF8 802B60C8 3C027FF7 */ lui $v0, 0x7ff7 +/* E28AFC 802B60CC 3442FFF1 */ ori $v0, $v0, 0xfff1 +/* E28B00 802B60D0 3C018011 */ lui $at, %hi(D_8010C938) +/* E28B04 802B60D4 C420C938 */ lwc1 $f0, %lo(D_8010C938)($at) +/* E28B08 802B60D8 00621024 */ and $v0, $v1, $v0 +/* E28B0C 802B60DC AE420000 */ sw $v0, ($s2) +/* E28B10 802B60E0 A24000B6 */ sb $zero, 0xb6($s2) +/* E28B14 802B60E4 A6400008 */ sh $zero, 8($s2) +/* E28B18 802B60E8 A64000C0 */ sh $zero, 0xc0($s2) +/* E28B1C 802B60EC A64000C2 */ sh $zero, 0xc2($s2) +/* E28B20 802B60F0 AE400054 */ sw $zero, 0x54($s2) +/* E28B24 802B60F4 AE40008C */ sw $zero, 0x8c($s2) +/* E28B28 802B60F8 3C01802B */ lui $at, %hi(D_802B6770) +/* E28B2C 802B60FC E4206770 */ swc1 $f0, %lo(D_802B6770)($at) +.L802B6100: +/* E28B30 802B6100 824300B6 */ lb $v1, 0xb6($s2) +/* E28B34 802B6104 924200B6 */ lbu $v0, 0xb6($s2) +/* E28B38 802B6108 10600006 */ beqz $v1, .L802B6124 +/* E28B3C 802B610C 24420001 */ addiu $v0, $v0, 1 +/* E28B40 802B6110 24020001 */ addiu $v0, $zero, 1 +/* E28B44 802B6114 10620004 */ beq $v1, $v0, .L802B6128 +/* E28B48 802B6118 00000000 */ nop +/* E28B4C 802B611C 080AD8CC */ j .L802B6330 +/* E28B50 802B6120 00000000 */ nop +.L802B6124: +/* E28B54 802B6124 A24200B6 */ sb $v0, 0xb6($s2) +.L802B6128: +/* E28B58 802B6128 3C018011 */ lui $at, %hi(D_8010C990) +/* E28B5C 802B612C C42CC990 */ lwc1 $f12, %lo(D_8010C990)($at) +/* E28B60 802B6130 3C0140C9 */ lui $at, 0x40c9 +/* E28B64 802B6134 34210FD0 */ ori $at, $at, 0xfd0 +/* E28B68 802B6138 4481A000 */ mtc1 $at, $f20 +/* E28B6C 802B613C 27B10028 */ addiu $s1, $sp, 0x28 +/* E28B70 802B6140 46146302 */ mul.s $f12, $f12, $f20 +/* E28B74 802B6144 00000000 */ nop +/* E28B78 802B6148 0220282D */ daddu $a1, $s1, $zero +/* E28B7C 802B614C 27B0002C */ addiu $s0, $sp, 0x2c +/* E28B80 802B6150 3C0143B4 */ lui $at, 0x43b4 +/* E28B84 802B6154 4481B000 */ mtc1 $at, $f22 +/* E28B88 802B6158 0200302D */ daddu $a2, $s0, $zero +/* E28B8C 802B615C 0C00A82D */ jal sin_cos_rad +/* E28B90 802B6160 46166303 */ div.s $f12, $f12, $f22 +/* E28B94 802B6164 3C01802B */ lui $at, %hi(D_802B6770) +/* E28B98 802B6168 C42C6770 */ lwc1 $f12, %lo(D_802B6770)($at) +/* E28B9C 802B616C 46146302 */ mul.s $f12, $f12, $f20 +/* E28BA0 802B6170 00000000 */ nop +/* E28BA4 802B6174 0220282D */ daddu $a1, $s1, $zero +/* E28BA8 802B6178 C7A00028 */ lwc1 $f0, 0x28($sp) +/* E28BAC 802B617C 3C014040 */ lui $at, 0x4040 +/* E28BB0 802B6180 4481A000 */ mtc1 $at, $f20 +/* E28BB4 802B6184 0200302D */ daddu $a2, $s0, $zero +/* E28BB8 802B6188 46140502 */ mul.s $f20, $f0, $f20 +/* E28BBC 802B618C 00000000 */ nop +/* E28BC0 802B6190 0C00A82D */ jal sin_cos_rad +/* E28BC4 802B6194 46166303 */ div.s $f12, $f12, $f22 +/* E28BC8 802B6198 C7A00028 */ lwc1 $f0, 0x28($sp) +/* E28BCC 802B619C 46140102 */ mul.s $f4, $f0, $f20 +/* E28BD0 802B61A0 00000000 */ nop +/* E28BD4 802B61A4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* E28BD8 802B61A8 46140182 */ mul.s $f6, $f0, $f20 +/* E28BDC 802B61AC 00000000 */ nop +/* E28BE0 802B61B0 3C01802B */ lui $at, %hi(D_802B6760) +/* E28BE4 802B61B4 D4226760 */ ldc1 $f2, %lo(D_802B6760)($at) +/* E28BE8 802B61B8 46002021 */ cvt.d.s $f0, $f4 +/* E28BEC 802B61BC 46200005 */ abs.d $f0, $f0 +/* E28BF0 802B61C0 4622003C */ c.lt.d $f0, $f2 +/* E28BF4 802B61C4 00000000 */ nop +/* E28BF8 802B61C8 45020011 */ bc1fl .L802B6210 +/* E28BFC 802B61CC 46003021 */ cvt.d.s $f0, $f6 +/* E28C00 802B61D0 44800000 */ mtc1 $zero, $f0 +/* E28C04 802B61D4 3C013DCC */ lui $at, 0x3dcc +/* E28C08 802B61D8 3421CCCD */ ori $at, $at, 0xcccd +/* E28C0C 802B61DC 44811000 */ mtc1 $at, $f2 +/* E28C10 802B61E0 4600203C */ c.lt.s $f4, $f0 +/* E28C14 802B61E4 00000000 */ nop +/* E28C18 802B61E8 45000006 */ bc1f .L802B6204 +/* E28C1C 802B61EC 46001106 */ mov.s $f4, $f2 +/* E28C20 802B61F0 3C01BDCC */ lui $at, 0xbdcc +/* E28C24 802B61F4 3421CCCD */ ori $at, $at, 0xcccd +/* E28C28 802B61F8 44811000 */ mtc1 $at, $f2 +/* E28C2C 802B61FC 00000000 */ nop +/* E28C30 802B6200 46001106 */ mov.s $f4, $f2 +.L802B6204: +/* E28C34 802B6204 46003021 */ cvt.d.s $f0, $f6 +/* E28C38 802B6208 3C01802B */ lui $at, %hi(D_802B6768) +/* E28C3C 802B620C D4226768 */ ldc1 $f2, %lo(D_802B6768)($at) +.L802B6210: +/* E28C40 802B6210 46200005 */ abs.d $f0, $f0 +/* E28C44 802B6214 4622003C */ c.lt.d $f0, $f2 +/* E28C48 802B6218 00000000 */ nop +/* E28C4C 802B621C 4500000F */ bc1f .L802B625C +/* E28C50 802B6220 0240202D */ daddu $a0, $s2, $zero +/* E28C54 802B6224 44800000 */ mtc1 $zero, $f0 +/* E28C58 802B6228 3C013DCC */ lui $at, 0x3dcc +/* E28C5C 802B622C 3421CCCD */ ori $at, $at, 0xcccd +/* E28C60 802B6230 44811000 */ mtc1 $at, $f2 +/* E28C64 802B6234 4600303C */ c.lt.s $f6, $f0 +/* E28C68 802B6238 00000000 */ nop +/* E28C6C 802B623C 45000007 */ bc1f .L802B625C +/* E28C70 802B6240 46001186 */ mov.s $f6, $f2 +/* E28C74 802B6244 3C01BDCC */ lui $at, 0xbdcc +/* E28C78 802B6248 3421CCCD */ ori $at, $at, 0xcccd +/* E28C7C 802B624C 44811000 */ mtc1 $at, $f2 +/* E28C80 802B6250 00000000 */ nop +/* E28C84 802B6254 46001186 */ mov.s $f6, $f2 +/* E28C88 802B6258 0240202D */ daddu $a0, $s2, $zero +.L802B625C: +/* E28C8C 802B625C 27A50030 */ addiu $a1, $sp, 0x30 +/* E28C90 802B6260 C6420028 */ lwc1 $f2, 0x28($s2) +/* E28C94 802B6264 27A60034 */ addiu $a2, $sp, 0x34 +/* E28C98 802B6268 46041080 */ add.s $f2, $f2, $f4 +/* E28C9C 802B626C C6400030 */ lwc1 $f0, 0x30($s2) +/* E28CA0 802B6270 27A2003C */ addiu $v0, $sp, 0x3c +/* E28CA4 802B6274 46060001 */ sub.s $f0, $f0, $f6 +/* E28CA8 802B6278 E6420028 */ swc1 $f2, 0x28($s2) +/* E28CAC 802B627C 46001186 */ mov.s $f6, $f2 +/* E28CB0 802B6280 E6400030 */ swc1 $f0, 0x30($s2) +/* E28CB4 802B6284 46000106 */ mov.s $f4, $f0 +/* E28CB8 802B6288 C642002C */ lwc1 $f2, 0x2c($s2) +/* E28CBC 802B628C 3C0140A0 */ lui $at, 0x40a0 +/* E28CC0 802B6290 44810000 */ mtc1 $at, $f0 +/* E28CC4 802B6294 27A70038 */ addiu $a3, $sp, 0x38 +/* E28CC8 802B6298 E7A60030 */ swc1 $f6, 0x30($sp) +/* E28CCC 802B629C E7A40038 */ swc1 $f4, 0x38($sp) +/* E28CD0 802B62A0 E7A20034 */ swc1 $f2, 0x34($sp) +/* E28CD4 802B62A4 E7A0003C */ swc1 $f0, 0x3c($sp) +/* E28CD8 802B62A8 AFA20010 */ sw $v0, 0x10($sp) +/* E28CDC 802B62AC 27A20040 */ addiu $v0, $sp, 0x40 +/* E28CE0 802B62B0 AFA20014 */ sw $v0, 0x14($sp) +/* E28CE4 802B62B4 27A20044 */ addiu $v0, $sp, 0x44 +/* E28CE8 802B62B8 AFA20018 */ sw $v0, 0x18($sp) +/* E28CEC 802B62BC 27A20048 */ addiu $v0, $sp, 0x48 +/* E28CF0 802B62C0 AFA2001C */ sw $v0, 0x1c($sp) +/* E28CF4 802B62C4 27A2004C */ addiu $v0, $sp, 0x4c +/* E28CF8 802B62C8 0C03791B */ jal func_800DE46C +/* E28CFC 802B62CC AFA20020 */ sw $v0, 0x20($sp) +/* E28D00 802B62D0 04400003 */ bltz $v0, .L802B62E0 +/* E28D04 802B62D4 00000000 */ nop +/* E28D08 802B62D8 C7A00034 */ lwc1 $f0, 0x34($sp) +/* E28D0C 802B62DC E640002C */ swc1 $f0, 0x2c($s2) +.L802B62E0: +/* E28D10 802B62E0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* E28D14 802B62E4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* E28D18 802B62E8 3C014270 */ lui $at, 0x4270 +/* E28D1C 802B62EC 4481A000 */ mtc1 $at, $f20 +/* E28D20 802B62F0 84430086 */ lh $v1, 0x86($v0) +/* E28D24 802B62F4 2402000A */ addiu $v0, $zero, 0xa +/* E28D28 802B62F8 14620003 */ bne $v1, $v0, .L802B6308 +/* E28D2C 802B62FC 00000000 */ nop +/* E28D30 802B6300 3C0141F0 */ lui $at, 0x41f0 +/* E28D34 802B6304 4481A000 */ mtc1 $at, $f20 +.L802B6308: +/* E28D38 802B6308 3C018011 */ lui $at, %hi(D_8010C990) +/* E28D3C 802B630C C420C990 */ lwc1 $f0, %lo(D_8010C990)($at) +/* E28D40 802B6310 4614003C */ c.lt.s $f0, $f20 +/* E28D44 802B6314 00000000 */ nop +/* E28D48 802B6318 45000005 */ bc1f .L802B6330 +/* E28D4C 802B631C 00000000 */ nop +/* E28D50 802B6320 0C039769 */ jal set_action_state +/* E28D54 802B6324 24040008 */ addiu $a0, $zero, 8 +/* E28D58 802B6328 0C038C1B */ jal gravity_use_fall_parms +/* E28D5C 802B632C 00000000 */ nop +.L802B6330: +/* E28D60 802B6330 8FBF005C */ lw $ra, 0x5c($sp) +/* E28D64 802B6334 8FB20058 */ lw $s2, 0x58($sp) +/* E28D68 802B6338 8FB10054 */ lw $s1, 0x54($sp) +/* E28D6C 802B633C 8FB00050 */ lw $s0, 0x50($sp) +/* E28D70 802B6340 D7B60068 */ ldc1 $f22, 0x68($sp) +/* E28D74 802B6344 D7B40060 */ ldc1 $f20, 0x60($sp) +/* E28D78 802B6348 03E00008 */ jr $ra +/* E28D7C 802B634C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/code_E28A30/func_802B6350_E28D80.s b/asm/nonmatchings/code_E28A30/func_802B6350_E28D80.s new file mode 100644 index 0000000000..18608c0ef4 --- /dev/null +++ b/asm/nonmatchings/code_E28A30/func_802B6350_E28D80.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6350_E28D80 +/* E28D80 802B6350 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E28D84 802B6354 3C048011 */ lui $a0, %hi(gPlayerStatus) +/* E28D88 802B6358 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) +/* E28D8C 802B635C AFBF0010 */ sw $ra, 0x10($sp) +/* E28D90 802B6360 8C850000 */ lw $a1, ($a0) +/* E28D94 802B6364 04A10010 */ bgez $a1, .L802B63A8 +/* E28D98 802B6368 0080302D */ daddu $a2, $a0, $zero +/* E28D9C 802B636C 3C027FF7 */ lui $v0, 0x7ff7 +/* E28DA0 802B6370 3442FFF1 */ ori $v0, $v0, 0xfff1 +/* E28DA4 802B6374 8C830004 */ lw $v1, 4($a0) +/* E28DA8 802B6378 00A21024 */ and $v0, $a1, $v0 +/* E28DAC 802B637C AC820000 */ sw $v0, ($a0) +/* E28DB0 802B6380 A08000B6 */ sb $zero, 0xb6($a0) +/* E28DB4 802B6384 A4800008 */ sh $zero, 8($a0) +/* E28DB8 802B6388 A48000C0 */ sh $zero, 0xc0($a0) +/* E28DBC 802B638C A48000C2 */ sh $zero, 0xc2($a0) +/* E28DC0 802B6390 AC800054 */ sw $zero, 0x54($a0) +/* E28DC4 802B6394 30631000 */ andi $v1, $v1, 0x1000 +/* E28DC8 802B6398 1460000B */ bnez $v1, .L802B63C8 +/* E28DCC 802B639C AC80008C */ sw $zero, 0x8c($a0) +/* E28DD0 802B63A0 24020005 */ addiu $v0, $zero, 5 +/* E28DD4 802B63A4 A4820008 */ sh $v0, 8($a0) +.L802B63A8: +/* E28DD8 802B63A8 94C20008 */ lhu $v0, 8($a2) +/* E28DDC 802B63AC 2442FFFF */ addiu $v0, $v0, -1 +/* E28DE0 802B63B0 A4C20008 */ sh $v0, 8($a2) +/* E28DE4 802B63B4 00021400 */ sll $v0, $v0, 0x10 +/* E28DE8 802B63B8 14400003 */ bnez $v0, .L802B63C8 +/* E28DEC 802B63BC 00000000 */ nop +/* E28DF0 802B63C0 0C039769 */ jal set_action_state +/* E28DF4 802B63C4 0000202D */ daddu $a0, $zero, $zero +.L802B63C8: +/* E28DF8 802B63C8 8FBF0010 */ lw $ra, 0x10($sp) +/* E28DFC 802B63CC 03E00008 */ jr $ra +/* E28E00 802B63D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E28A30/func_802B63D4_E28E04.s b/asm/nonmatchings/code_E28A30/func_802B63D4_E28E04.s new file mode 100644 index 0000000000..d4285a7160 --- /dev/null +++ b/asm/nonmatchings/code_E28A30/func_802B63D4_E28E04.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B63D4_E28E04 +/* E28E04 802B63D4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E28E08 802B63D8 AFB00010 */ sw $s0, 0x10($sp) +/* E28E0C 802B63DC 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E28E10 802B63E0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E28E14 802B63E4 AFBF0018 */ sw $ra, 0x18($sp) +/* E28E18 802B63E8 AFB10014 */ sw $s1, 0x14($sp) +/* E28E1C 802B63EC 8E030000 */ lw $v1, ($s0) +/* E28E20 802B63F0 0461000F */ bgez $v1, .L802B6430 +/* E28E24 802B63F4 0200882D */ daddu $s1, $s0, $zero +/* E28E28 802B63F8 3C027FFF */ lui $v0, 0x7fff +/* E28E2C 802B63FC 3442FFF1 */ ori $v0, $v0, 0xfff1 +/* E28E30 802B6400 3C040001 */ lui $a0, 1 +/* E28E34 802B6404 34840017 */ ori $a0, $a0, 0x17 +/* E28E38 802B6408 00621024 */ and $v0, $v1, $v0 +/* E28E3C 802B640C AE020000 */ sw $v0, ($s0) +/* E28E40 802B6410 A20000B6 */ sb $zero, 0xb6($s0) +/* E28E44 802B6414 A60000C0 */ sh $zero, 0xc0($s0) +/* E28E48 802B6418 A60000C2 */ sh $zero, 0xc2($s0) +/* E28E4C 802B641C AE000054 */ sw $zero, 0x54($s0) +/* E28E50 802B6420 0C037FDE */ jal func_800DFF78 +/* E28E54 802B6424 AE00008C */ sw $zero, 0x8c($s0) +/* E28E58 802B6428 2402001E */ addiu $v0, $zero, 0x1e +/* E28E5C 802B642C A6020008 */ sh $v0, 8($s0) +.L802B6430: +/* E28E60 802B6430 86220008 */ lh $v0, 8($s1) +/* E28E64 802B6434 96230008 */ lhu $v1, 8($s1) +/* E28E68 802B6438 10400003 */ beqz $v0, .L802B6448 +/* E28E6C 802B643C 2462FFFF */ addiu $v0, $v1, -1 +/* E28E70 802B6440 080AD919 */ j .L802B6464 +/* E28E74 802B6444 A6220008 */ sh $v0, 8($s1) +.L802B6448: +/* E28E78 802B6448 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* E28E7C 802B644C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* E28E80 802B6450 80420070 */ lb $v0, 0x70($v0) +/* E28E84 802B6454 14400003 */ bnez $v0, .L802B6464 +/* E28E88 802B6458 00000000 */ nop +/* E28E8C 802B645C 0C039769 */ jal set_action_state +/* E28E90 802B6460 0000202D */ daddu $a0, $zero, $zero +.L802B6464: +/* E28E94 802B6464 8FBF0018 */ lw $ra, 0x18($sp) +/* E28E98 802B6468 8FB10014 */ lw $s1, 0x14($sp) +/* E28E9C 802B646C 8FB00010 */ lw $s0, 0x10($sp) +/* E28EA0 802B6470 03E00008 */ jr $ra +/* E28EA4 802B6474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E28A30/func_802B6478_E28EA8.s b/asm/nonmatchings/code_E28A30/func_802B6478_E28EA8.s new file mode 100644 index 0000000000..5f993cbecc --- /dev/null +++ b/asm/nonmatchings/code_E28A30/func_802B6478_E28EA8.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6478_E28EA8 +/* E28EA8 802B6478 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E28EAC 802B647C 3C058011 */ lui $a1, %hi(gPlayerStatus) +/* E28EB0 802B6480 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) +/* E28EB4 802B6484 AFBF0014 */ sw $ra, 0x14($sp) +/* E28EB8 802B6488 AFB00010 */ sw $s0, 0x10($sp) +/* E28EBC 802B648C 8CA20000 */ lw $v0, ($a1) +/* E28EC0 802B6490 0441000E */ bgez $v0, .L802B64CC +/* E28EC4 802B6494 00A0802D */ daddu $s0, $a1, $zero +/* E28EC8 802B6498 3C037FFF */ lui $v1, 0x7fff +/* E28ECC 802B649C 3463FFFF */ ori $v1, $v1, 0xffff +/* E28ED0 802B64A0 3C040001 */ lui $a0, 1 +/* E28ED4 802B64A4 3484001F */ ori $a0, $a0, 0x1f +/* E28ED8 802B64A8 00431824 */ and $v1, $v0, $v1 +/* E28EDC 802B64AC 3C020008 */ lui $v0, 8 +/* E28EE0 802B64B0 00621825 */ or $v1, $v1, $v0 +/* E28EE4 802B64B4 ACA30000 */ sw $v1, ($a1) +/* E28EE8 802B64B8 A4A00008 */ sh $zero, 8($a1) +/* E28EEC 802B64BC A0A000B6 */ sb $zero, 0xb6($a1) +/* E28EF0 802B64C0 ACA00054 */ sw $zero, 0x54($a1) +/* E28EF4 802B64C4 0C037FDE */ jal func_800DFF78 +/* E28EF8 802B64C8 ACA0008C */ sw $zero, 0x8c($a1) +.L802B64CC: +/* E28EFC 802B64CC 8E020004 */ lw $v0, 4($s0) +/* E28F00 802B64D0 30420200 */ andi $v0, $v0, 0x200 +/* E28F04 802B64D4 14400008 */ bnez $v0, .L802B64F8 +/* E28F08 802B64D8 00000000 */ nop +/* E28F0C 802B64DC 0C039769 */ jal set_action_state +/* E28F10 802B64E0 0000202D */ daddu $a0, $zero, $zero +/* E28F14 802B64E4 3C03FFF7 */ lui $v1, 0xfff7 +/* E28F18 802B64E8 8E020000 */ lw $v0, ($s0) +/* E28F1C 802B64EC 3463FFFF */ ori $v1, $v1, 0xffff +/* E28F20 802B64F0 00431024 */ and $v0, $v0, $v1 +/* E28F24 802B64F4 AE020000 */ sw $v0, ($s0) +.L802B64F8: +/* E28F28 802B64F8 8FBF0014 */ lw $ra, 0x14($sp) +/* E28F2C 802B64FC 8FB00010 */ lw $s0, 0x10($sp) +/* E28F30 802B6500 03E00008 */ jr $ra +/* E28F34 802B6504 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E28A30/func_802B6508_E28F38.s b/asm/nonmatchings/code_E28A30/func_802B6508_E28F38.s new file mode 100644 index 0000000000..b5e29f48f8 --- /dev/null +++ b/asm/nonmatchings/code_E28A30/func_802B6508_E28F38.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6508_E28F38 +/* E28F38 802B6508 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E28F3C 802B650C AFB00018 */ sw $s0, 0x18($sp) +/* E28F40 802B6510 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E28F44 802B6514 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E28F48 802B6518 AFBF001C */ sw $ra, 0x1c($sp) +/* E28F4C 802B651C 8E030000 */ lw $v1, ($s0) +/* E28F50 802B6520 04610030 */ bgez $v1, .L802B65E4 +/* E28F54 802B6524 3C027FFF */ lui $v0, 0x7fff +/* E28F58 802B6528 3442FFFF */ ori $v0, $v0, 0xffff +/* E28F5C 802B652C 27A40010 */ addiu $a0, $sp, 0x10 +/* E28F60 802B6530 00621024 */ and $v0, $v1, $v0 +/* E28F64 802B6534 AE020000 */ sw $v0, ($s0) +/* E28F68 802B6538 24020005 */ addiu $v0, $zero, 5 +/* E28F6C 802B653C 27A50014 */ addiu $a1, $sp, 0x14 +/* E28F70 802B6540 AE000054 */ sw $zero, 0x54($s0) +/* E28F74 802B6544 AE000060 */ sw $zero, 0x60($s0) +/* E28F78 802B6548 0C0388C1 */ jal input_to_move_vector +/* E28F7C 802B654C A6020008 */ sh $v0, 8($s0) +/* E28F80 802B6550 C7A20010 */ lwc1 $f2, 0x10($sp) +/* E28F84 802B6554 3C014234 */ lui $at, 0x4234 +/* E28F88 802B6558 44810000 */ mtc1 $at, $f0 +/* E28F8C 802B655C 00000000 */ nop +/* E28F90 802B6560 4602003E */ c.le.s $f0, $f2 +/* E28F94 802B6564 00000000 */ nop +/* E28F98 802B6568 45000008 */ bc1f .L802B658C +/* E28F9C 802B656C 00000000 */ nop +/* E28FA0 802B6570 3C014307 */ lui $at, 0x4307 +/* E28FA4 802B6574 44810000 */ mtc1 $at, $f0 +/* E28FA8 802B6578 00000000 */ nop +/* E28FAC 802B657C 4600103E */ c.le.s $f2, $f0 +/* E28FB0 802B6580 00000000 */ nop +/* E28FB4 802B6584 45010011 */ bc1t .L802B65CC +/* E28FB8 802B6588 3C040008 */ lui $a0, 8 +.L802B658C: +/* E28FBC 802B658C 3C014361 */ lui $at, 0x4361 +/* E28FC0 802B6590 44810000 */ mtc1 $at, $f0 +/* E28FC4 802B6594 00000000 */ nop +/* E28FC8 802B6598 4602003E */ c.le.s $f0, $f2 +/* E28FCC 802B659C 00000000 */ nop +/* E28FD0 802B65A0 4500000E */ bc1f .L802B65DC +/* E28FD4 802B65A4 3C040006 */ lui $a0, 6 +/* E28FD8 802B65A8 3C01439D */ lui $at, 0x439d +/* E28FDC 802B65AC 34218000 */ ori $at, $at, 0x8000 +/* E28FE0 802B65B0 44810000 */ mtc1 $at, $f0 +/* E28FE4 802B65B4 00000000 */ nop +/* E28FE8 802B65B8 4600103E */ c.le.s $f2, $f0 +/* E28FEC 802B65BC 00000000 */ nop +/* E28FF0 802B65C0 45000006 */ bc1f .L802B65DC +/* E28FF4 802B65C4 00000000 */ nop +/* E28FF8 802B65C8 3C040008 */ lui $a0, 8 +.L802B65CC: +/* E28FFC 802B65CC 0C037FDE */ jal func_800DFF78 +/* E29000 802B65D0 34840020 */ ori $a0, $a0, 0x20 +/* E29004 802B65D4 080AD979 */ j .L802B65E4 +/* E29008 802B65D8 00000000 */ nop +.L802B65DC: +/* E2900C 802B65DC 0C037FBF */ jal func_800DFEFC +/* E29010 802B65E0 34840004 */ ori $a0, $a0, 4 +.L802B65E4: +/* E29014 802B65E4 0C039858 */ jal check_input_jump +/* E29018 802B65E8 00000000 */ nop +/* E2901C 802B65EC 8E020004 */ lw $v0, 4($s0) +/* E29020 802B65F0 3C030080 */ lui $v1, 0x80 +/* E29024 802B65F4 00431024 */ and $v0, $v0, $v1 +/* E29028 802B65F8 1040000B */ beqz $v0, .L802B6628 +/* E2902C 802B65FC 00000000 */ nop +/* E29030 802B6600 86020008 */ lh $v0, 8($s0) +/* E29034 802B6604 96030008 */ lhu $v1, 8($s0) +/* E29038 802B6608 10400007 */ beqz $v0, .L802B6628 +/* E2903C 802B660C 2462FFFF */ addiu $v0, $v1, -1 +/* E29040 802B6610 A6020008 */ sh $v0, 8($s0) +/* E29044 802B6614 00021400 */ sll $v0, $v0, 0x10 +/* E29048 802B6618 14400003 */ bnez $v0, .L802B6628 +/* E2904C 802B661C 00000000 */ nop +/* E29050 802B6620 0C039769 */ jal set_action_state +/* E29054 802B6624 0000202D */ daddu $a0, $zero, $zero +.L802B6628: +/* E29058 802B6628 8FBF001C */ lw $ra, 0x1c($sp) +/* E2905C 802B662C 8FB00018 */ lw $s0, 0x18($sp) +/* E29060 802B6630 03E00008 */ jr $ra +/* E29064 802B6634 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E28A30/func_802B6638_E29068.s b/asm/nonmatchings/code_E28A30/func_802B6638_E29068.s new file mode 100644 index 0000000000..f2f9bdb274 --- /dev/null +++ b/asm/nonmatchings/code_E28A30/func_802B6638_E29068.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6638_E29068 +/* E29068 802B6638 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2906C 802B663C AFB00010 */ sw $s0, 0x10($sp) +/* E29070 802B6640 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E29074 802B6644 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E29078 802B6648 AFBF0014 */ sw $ra, 0x14($sp) +/* E2907C 802B664C 8E030000 */ lw $v1, ($s0) +/* E29080 802B6650 04610023 */ bgez $v1, .L802B66E0 +/* E29084 802B6654 3C027FFF */ lui $v0, 0x7fff +/* E29088 802B6658 3442FFFF */ ori $v0, $v0, 0xffff +/* E2908C 802B665C 8E040004 */ lw $a0, 4($s0) +/* E29090 802B6660 00621024 */ and $v0, $v1, $v0 +/* E29094 802B6664 AE020000 */ sw $v0, ($s0) +/* E29098 802B6668 AE000054 */ sw $zero, 0x54($s0) +/* E2909C 802B666C 30821000 */ andi $v0, $a0, 0x1000 +/* E290A0 802B6670 14400006 */ bnez $v0, .L802B668C +/* E290A4 802B6674 AE000060 */ sw $zero, 0x60($s0) +/* E290A8 802B6678 3C040008 */ lui $a0, 8 +/* E290AC 802B667C 0C037FDE */ jal func_800DFF78 +/* E290B0 802B6680 34840007 */ ori $a0, $a0, 7 +/* E290B4 802B6684 080AD9B7 */ j .L802B66DC +/* E290B8 802B6688 2402001E */ addiu $v0, $zero, 0x1e +.L802B668C: +/* E290BC 802B668C 820200C4 */ lb $v0, 0xc4($s0) +/* E290C0 802B6690 14400012 */ bnez $v0, .L802B66DC +/* E290C4 802B6694 2402001E */ addiu $v0, $zero, 0x1e +/* E290C8 802B6698 30822000 */ andi $v0, $a0, 0x2000 +/* E290CC 802B669C 14400005 */ bnez $v0, .L802B66B4 +/* E290D0 802B66A0 00000000 */ nop +/* E290D4 802B66A4 0C037FDE */ jal func_800DFF78 +/* E290D8 802B66A8 3C04000C */ lui $a0, 0xc +/* E290DC 802B66AC 080AD9B7 */ j .L802B66DC +/* E290E0 802B66B0 2402001E */ addiu $v0, $zero, 0x1e +.L802B66B4: +/* E290E4 802B66B4 8203000C */ lb $v1, 0xc($s0) +/* E290E8 802B66B8 00031040 */ sll $v0, $v1, 1 +/* E290EC 802B66BC 00431021 */ addu $v0, $v0, $v1 +/* E290F0 802B66C0 000210C0 */ sll $v0, $v0, 3 +/* E290F4 802B66C4 3C04800F */ lui $a0, %hi(D_800F7C28) +/* E290F8 802B66C8 00822021 */ addu $a0, $a0, $v0 +/* E290FC 802B66CC 8C847C28 */ lw $a0, %lo(D_800F7C28)($a0) +/* E29100 802B66D0 0C0398DB */ jal func_800E636C +/* E29104 802B66D4 00000000 */ nop +/* E29108 802B66D8 2402001E */ addiu $v0, $zero, 0x1e +.L802B66DC: +/* E2910C 802B66DC A6020008 */ sh $v0, 8($s0) +.L802B66E0: +/* E29110 802B66E0 8E040004 */ lw $a0, 4($s0) +/* E29114 802B66E4 30821000 */ andi $v0, $a0, 0x1000 +/* E29118 802B66E8 10400019 */ beqz $v0, .L802B6750 +/* E2911C 802B66EC 00000000 */ nop +/* E29120 802B66F0 86020008 */ lh $v0, 8($s0) +/* E29124 802B66F4 96030008 */ lhu $v1, 8($s0) +/* E29128 802B66F8 10400003 */ beqz $v0, .L802B6708 +/* E2912C 802B66FC 2462FFFF */ addiu $v0, $v1, -1 +/* E29130 802B6700 080AD9D4 */ j .L802B6750 +/* E29134 802B6704 A6020008 */ sh $v0, 8($s0) +.L802B6708: +/* E29138 802B6708 820200C4 */ lb $v0, 0xc4($s0) +/* E2913C 802B670C 14400010 */ bnez $v0, .L802B6750 +/* E29140 802B6710 30822000 */ andi $v0, $a0, 0x2000 +/* E29144 802B6714 14400005 */ bnez $v0, .L802B672C +/* E29148 802B6718 3C04000A */ lui $a0, 0xa +/* E2914C 802B671C 0C037FDE */ jal func_800DFF78 +/* E29150 802B6720 34840001 */ ori $a0, $a0, 1 +/* E29154 802B6724 080AD9D4 */ j .L802B6750 +/* E29158 802B6728 00000000 */ nop +.L802B672C: +/* E2915C 802B672C 8203000C */ lb $v1, 0xc($s0) +/* E29160 802B6730 00031040 */ sll $v0, $v1, 1 +/* E29164 802B6734 00431021 */ addu $v0, $v0, $v1 +/* E29168 802B6738 000210C0 */ sll $v0, $v0, 3 +/* E2916C 802B673C 3C04800F */ lui $a0, %hi(D_800F7C1C) +/* E29170 802B6740 00822021 */ addu $a0, $a0, $v0 +/* E29174 802B6744 8C847C1C */ lw $a0, %lo(D_800F7C1C)($a0) +/* E29178 802B6748 0C0398DB */ jal func_800E636C +/* E2917C 802B674C 00000000 */ nop +.L802B6750: +/* E29180 802B6750 8FBF0014 */ lw $ra, 0x14($sp) +/* E29184 802B6754 8FB00010 */ lw $s0, 0x10($sp) +/* E29188 802B6758 03E00008 */ jr $ra +/* E2918C 802B675C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s b/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s new file mode 100644 index 0000000000..4d021a0803 --- /dev/null +++ b/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s @@ -0,0 +1,180 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E291A0 +/* E291A0 802B6000 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E291A4 802B6004 AFB1001C */ sw $s1, 0x1c($sp) +/* E291A8 802B6008 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E291AC 802B600C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E291B0 802B6010 AFBF0020 */ sw $ra, 0x20($sp) +/* E291B4 802B6014 AFB00018 */ sw $s0, 0x18($sp) +/* E291B8 802B6018 F7B40028 */ sdc1 $f20, 0x28($sp) +/* E291BC 802B601C 8E250000 */ lw $a1, ($s1) +/* E291C0 802B6020 04A1000D */ bgez $a1, .L802B6058 +/* E291C4 802B6024 3C027FFF */ lui $v0, 0x7fff +/* E291C8 802B6028 3442FFFF */ ori $v0, $v0, 0xffff +/* E291CC 802B602C 3C04800A */ lui $a0, %hi(D_8009A650) +/* E291D0 802B6030 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) +/* E291D4 802B6034 8C830000 */ lw $v1, ($a0) +/* E291D8 802B6038 00A21024 */ and $v0, $a1, $v0 +/* E291DC 802B603C AE220000 */ sw $v0, ($s1) +/* E291E0 802B6040 A22000B6 */ sb $zero, 0xb6($s1) +/* E291E4 802B6044 34630040 */ ori $v1, $v1, 0x40 +/* E291E8 802B6048 0C038045 */ jal disable_player_static_collisions +/* E291EC 802B604C AC830000 */ sw $v1, ($a0) +/* E291F0 802B6050 0C03805E */ jal disable_player_input +/* E291F4 802B6054 00000000 */ nop +.L802B6058: +/* E291F8 802B6058 822300B6 */ lb $v1, 0xb6($s1) +/* E291FC 802B605C 2C620006 */ sltiu $v0, $v1, 6 +/* E29200 802B6060 1040008D */ beqz $v0, .L802B6298 +/* E29204 802B6064 00031080 */ sll $v0, $v1, 2 +/* E29208 802B6068 3C01802B */ lui $at, %hi(D_802B62B0) +/* E2920C 802B606C 00220821 */ addu $at, $at, $v0 +/* E29210 802B6070 8C2262B0 */ lw $v0, %lo(D_802B62B0)($at) +/* E29214 802B6074 00400008 */ jr $v0 +/* E29218 802B6078 00000000 */ nop +/* E2921C 802B607C 3C040001 */ lui $a0, 1 +/* E29220 802B6080 0C037FBF */ jal func_800DFEFC +/* E29224 802B6084 3484002E */ ori $a0, $a0, 0x2e +/* E29228 802B6088 3C014180 */ lui $at, 0x4180 +/* E2922C 802B608C 44810000 */ mtc1 $at, $f0 +/* E29230 802B6090 3C013F80 */ lui $at, 0x3f80 +/* E29234 802B6094 44811000 */ mtc1 $at, $f2 +/* E29238 802B6098 3C013FF0 */ lui $at, 0x3ff0 +/* E2923C 802B609C 44812000 */ mtc1 $at, $f4 +/* E29240 802B60A0 24020020 */ addiu $v0, $zero, 0x20 +/* E29244 802B60A4 3C01802B */ lui $at, %hi(D_802B62E0) +/* E29248 802B60A8 AC2262E0 */ sw $v0, %lo(D_802B62E0)($at) +/* E2924C 802B60AC 3C01802B */ lui $at, %hi(D_802B62D0) +/* E29250 802B60B0 E42062D0 */ swc1 $f0, %lo(D_802B62D0)($at) +/* E29254 802B60B4 3C014080 */ lui $at, 0x4080 +/* E29258 802B60B8 44810000 */ mtc1 $at, $f0 +/* E2925C 802B60BC 3C02802B */ lui $v0, %hi(D_802B62D4) +/* E29260 802B60C0 244262D4 */ addiu $v0, $v0, %lo(D_802B62D4) +/* E29264 802B60C4 E4400000 */ swc1 $f0, ($v0) +/* E29268 802B60C8 3C01802B */ lui $at, %hi(D_802B62D8) +/* E2926C 802B60CC E42262D8 */ swc1 $f2, %lo(D_802B62D8)($at) +/* E29270 802B60D0 E4440000 */ swc1 $f4, ($v0) +/* E29274 802B60D4 922200B6 */ lbu $v0, 0xb6($s1) +/* E29278 802B60D8 C6200080 */ lwc1 $f0, 0x80($s1) +/* E2927C 802B60DC 24420001 */ addiu $v0, $v0, 1 +/* E29280 802B60E0 A22200B6 */ sb $v0, 0xb6($s1) +/* E29284 802B60E4 3C01802B */ lui $at, %hi(D_802B62DC) +/* E29288 802B60E8 E42062DC */ swc1 $f0, %lo(D_802B62DC)($at) +/* E2928C 802B60EC 080AD8A6 */ j .L802B6298 +/* E29290 802B60F0 00000000 */ nop +/* E29294 802B60F4 26240028 */ addiu $a0, $s1, 0x28 +/* E29298 802B60F8 3C10802B */ lui $s0, %hi(D_802B62D0) +/* E2929C 802B60FC 261062D0 */ addiu $s0, $s0, %lo(D_802B62D0) +/* E292A0 802B6100 C622002C */ lwc1 $f2, 0x2c($s1) +/* E292A4 802B6104 C6000000 */ lwc1 $f0, ($s0) +/* E292A8 802B6108 3C06802B */ lui $a2, %hi(D_802B62D4) +/* E292AC 802B610C 8CC662D4 */ lw $a2, %lo(D_802B62D4)($a2) +/* E292B0 802B6110 46001080 */ add.s $f2, $f2, $f0 +/* E292B4 802B6114 3C01802B */ lui $at, %hi(D_802B62D8) +/* E292B8 802B6118 C42462D8 */ lwc1 $f4, %lo(D_802B62D8)($at) +/* E292BC 802B611C 3C07802B */ lui $a3, %hi(D_802B62DC) +/* E292C0 802B6120 8CE762DC */ lw $a3, %lo(D_802B62DC)($a3) +/* E292C4 802B6124 46040001 */ sub.s $f0, $f0, $f4 +/* E292C8 802B6128 26250030 */ addiu $a1, $s1, 0x30 +/* E292CC 802B612C E622002C */ swc1 $f2, 0x2c($s1) +/* E292D0 802B6130 0C00A7E7 */ jal add_vec2D_polar +/* E292D4 802B6134 E6000000 */ swc1 $f0, ($s0) +/* E292D8 802B6138 3C02800B */ lui $v0, %hi(gCameras) +/* E292DC 802B613C 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* E292E0 802B6140 C6220028 */ lwc1 $f2, 0x28($s1) +/* E292E4 802B6144 C624002C */ lwc1 $f4, 0x2c($s1) +/* E292E8 802B6148 C6080000 */ lwc1 $f8, ($s0) +/* E292EC 802B614C 44800000 */ mtc1 $zero, $f0 +/* E292F0 802B6150 C6260030 */ lwc1 $f6, 0x30($s1) +/* E292F4 802B6154 4600403E */ c.le.s $f8, $f0 +/* E292F8 802B6158 E4420060 */ swc1 $f2, 0x60($v0) +/* E292FC 802B615C E4440064 */ swc1 $f4, 0x64($v0) +/* E29300 802B6160 4500004D */ bc1f .L802B6298 +/* E29304 802B6164 E4460068 */ swc1 $f6, 0x68($v0) +/* E29308 802B6168 922200B6 */ lbu $v0, 0xb6($s1) +/* E2930C 802B616C 080AD888 */ j .L802B6220 +/* E29310 802B6170 24420001 */ addiu $v0, $v0, 1 +/* E29314 802B6174 26240028 */ addiu $a0, $s1, 0x28 +/* E29318 802B6178 3C10802B */ lui $s0, %hi(D_802B62D0) +/* E2931C 802B617C 261062D0 */ addiu $s0, $s0, %lo(D_802B62D0) +/* E29320 802B6180 C622002C */ lwc1 $f2, 0x2c($s1) +/* E29324 802B6184 C6000000 */ lwc1 $f0, ($s0) +/* E29328 802B6188 3C06802B */ lui $a2, %hi(D_802B62D4) +/* E2932C 802B618C 8CC662D4 */ lw $a2, %lo(D_802B62D4)($a2) +/* E29330 802B6190 46001080 */ add.s $f2, $f2, $f0 +/* E29334 802B6194 3C01802B */ lui $at, %hi(D_802B62D8) +/* E29338 802B6198 C42462D8 */ lwc1 $f4, %lo(D_802B62D8)($at) +/* E2933C 802B619C 3C07802B */ lui $a3, %hi(D_802B62DC) +/* E29340 802B61A0 8CE762DC */ lw $a3, %lo(D_802B62DC)($a3) +/* E29344 802B61A4 46040001 */ sub.s $f0, $f0, $f4 +/* E29348 802B61A8 26250030 */ addiu $a1, $s1, 0x30 +/* E2934C 802B61AC E622002C */ swc1 $f2, 0x2c($s1) +/* E29350 802B61B0 0C00A7E7 */ jal add_vec2D_polar +/* E29354 802B61B4 E6000000 */ swc1 $f0, ($s0) +/* E29358 802B61B8 27A50010 */ addiu $a1, $sp, 0x10 +/* E2935C 802B61BC C6200028 */ lwc1 $f0, 0x28($s1) +/* E29360 802B61C0 C622002C */ lwc1 $f2, 0x2c($s1) +/* E29364 802B61C4 C6240030 */ lwc1 $f4, 0x30($s1) +/* E29368 802B61C8 C60C0000 */ lwc1 $f12, ($s0) +/* E2936C 802B61CC 3C02800B */ lui $v0, %hi(gCameras) +/* E29370 802B61D0 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* E29374 802B61D4 E4400060 */ swc1 $f0, 0x60($v0) +/* E29378 802B61D8 E4420064 */ swc1 $f2, 0x64($v0) +/* E2937C 802B61DC 0C038D45 */ jal func_800E3514 +/* E29380 802B61E0 E4440068 */ swc1 $f4, 0x68($v0) +/* E29384 802B61E4 8FA20010 */ lw $v0, 0x10($sp) +/* E29388 802B61E8 0440002B */ bltz $v0, .L802B6298 +/* E2938C 802B61EC 46000506 */ mov.s $f20, $f0 +/* E29390 802B61F0 24040162 */ addiu $a0, $zero, 0x162 +/* E29394 802B61F4 0C052736 */ jal play_sound_at_player +/* E29398 802B61F8 0000282D */ daddu $a1, $zero, $zero +/* E2939C 802B61FC 3C040008 */ lui $a0, 8 +/* E293A0 802B6200 0C037FDE */ jal func_800DFF78 +/* E293A4 802B6204 34840003 */ ori $a0, $a0, 3 +/* E293A8 802B6208 922200B6 */ lbu $v0, 0xb6($s1) +/* E293AC 802B620C 2403000A */ addiu $v1, $zero, 0xa +/* E293B0 802B6210 E634002C */ swc1 $f20, 0x2c($s1) +/* E293B4 802B6214 3C01802B */ lui $at, %hi(D_802B62E0) +/* E293B8 802B6218 AC2362E0 */ sw $v1, %lo(D_802B62E0)($at) +/* E293BC 802B621C 24420001 */ addiu $v0, $v0, 1 +.L802B6220: +/* E293C0 802B6220 080AD8A6 */ j .L802B6298 +/* E293C4 802B6224 A22200B6 */ sb $v0, 0xb6($s1) +/* E293C8 802B6228 962200BC */ lhu $v0, 0xbc($s1) +/* E293CC 802B622C 1040001A */ beqz $v0, .L802B6298 +/* E293D0 802B6230 3C040001 */ lui $a0, 1 +/* E293D4 802B6234 0C037FDE */ jal func_800DFF78 +/* E293D8 802B6238 34840030 */ ori $a0, $a0, 0x30 +/* E293DC 802B623C 24020005 */ addiu $v0, $zero, 5 +/* E293E0 802B6240 A22200B6 */ sb $v0, 0xb6($s1) +/* E293E4 802B6244 2402000F */ addiu $v0, $zero, 0xf +/* E293E8 802B6248 080AD8A6 */ j .L802B6298 +/* E293EC 802B624C A6220008 */ sh $v0, 8($s1) +/* E293F0 802B6250 86220008 */ lh $v0, 8($s1) +/* E293F4 802B6254 96230008 */ lhu $v1, 8($s1) +/* E293F8 802B6258 10400003 */ beqz $v0, .L802B6268 +/* E293FC 802B625C 2462FFFF */ addiu $v0, $v1, -1 +/* E29400 802B6260 080AD8A6 */ j .L802B6298 +/* E29404 802B6264 A6220008 */ sh $v0, 8($s1) +.L802B6268: +/* E29408 802B6268 0C038050 */ jal enable_player_static_collisions +/* E2940C 802B626C 00000000 */ nop +/* E29410 802B6270 0C038069 */ jal enable_player_input +/* E29414 802B6274 00000000 */ nop +/* E29418 802B6278 0C039769 */ jal set_action_state +/* E2941C 802B627C 0000202D */ daddu $a0, $zero, $zero +/* E29420 802B6280 3C02800A */ lui $v0, %hi(D_8009A650) +/* E29424 802B6284 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) +/* E29428 802B6288 8C430000 */ lw $v1, ($v0) +/* E2942C 802B628C 2404FFBF */ addiu $a0, $zero, -0x41 +/* E29430 802B6290 00641824 */ and $v1, $v1, $a0 +/* E29434 802B6294 AC430000 */ sw $v1, ($v0) +.L802B6298: +/* E29438 802B6298 8FBF0020 */ lw $ra, 0x20($sp) +/* E2943C 802B629C 8FB1001C */ lw $s1, 0x1c($sp) +/* E29440 802B62A0 8FB00018 */ lw $s0, 0x18($sp) +/* E29444 802B62A4 D7B40028 */ ldc1 $f20, 0x28($sp) +/* E29448 802B62A8 03E00008 */ jr $ra +/* E2944C 802B62AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_E29470/func_802B6000_E29470.s b/asm/nonmatchings/code_E29470/func_802B6000_E29470.s new file mode 100644 index 0000000000..91c13fa019 --- /dev/null +++ b/asm/nonmatchings/code_E29470/func_802B6000_E29470.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E29470 +/* E29470 802B6000 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* E29474 802B6004 3C048011 */ lui $a0, %hi(gPlayerStatus) +/* E29478 802B6008 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) +/* E2947C 802B600C 27A50028 */ addiu $a1, $sp, 0x28 +/* E29480 802B6010 27A6002C */ addiu $a2, $sp, 0x2c +/* E29484 802B6014 AFBF0048 */ sw $ra, 0x48($sp) +/* E29488 802B6018 848200B0 */ lh $v0, 0xb0($a0) +/* E2948C 802B601C 3C013FE0 */ lui $at, 0x3fe0 +/* E29490 802B6020 44810800 */ mtc1 $at, $f1 +/* E29494 802B6024 44800000 */ mtc1 $zero, $f0 +/* E29498 802B6028 44823000 */ mtc1 $v0, $f6 +/* E2949C 802B602C 00000000 */ nop +/* E294A0 802B6030 468031A0 */ cvt.s.w $f6, $f6 +/* E294A4 802B6034 460030A1 */ cvt.d.s $f2, $f6 +/* E294A8 802B6038 46201082 */ mul.d $f2, $f2, $f0 +/* E294AC 802B603C 00000000 */ nop +/* E294B0 802B6040 27A70030 */ addiu $a3, $sp, 0x30 +/* E294B4 802B6044 C4840028 */ lwc1 $f4, 0x28($a0) +/* E294B8 802B6048 C480002C */ lwc1 $f0, 0x2c($a0) +/* E294BC 802B604C 27A20034 */ addiu $v0, $sp, 0x34 +/* E294C0 802B6050 E7A40028 */ swc1 $f4, 0x28($sp) +/* E294C4 802B6054 C4840030 */ lwc1 $f4, 0x30($a0) +/* E294C8 802B6058 46000021 */ cvt.d.s $f0, $f0 +/* E294CC 802B605C 46220000 */ add.d $f0, $f0, $f2 +/* E294D0 802B6060 E7A60034 */ swc1 $f6, 0x34($sp) +/* E294D4 802B6064 E7A40030 */ swc1 $f4, 0x30($sp) +/* E294D8 802B6068 46200020 */ cvt.s.d $f0, $f0 +/* E294DC 802B606C E7A0002C */ swc1 $f0, 0x2c($sp) +/* E294E0 802B6070 AFA20010 */ sw $v0, 0x10($sp) +/* E294E4 802B6074 27A20038 */ addiu $v0, $sp, 0x38 +/* E294E8 802B6078 AFA20014 */ sw $v0, 0x14($sp) +/* E294EC 802B607C 27A2003C */ addiu $v0, $sp, 0x3c +/* E294F0 802B6080 AFA20018 */ sw $v0, 0x18($sp) +/* E294F4 802B6084 27A20040 */ addiu $v0, $sp, 0x40 +/* E294F8 802B6088 AFA2001C */ sw $v0, 0x1c($sp) +/* E294FC 802B608C 27A20044 */ addiu $v0, $sp, 0x44 +/* E29500 802B6090 0C03791B */ jal func_800DE46C +/* E29504 802B6094 AFA20020 */ sw $v0, 0x20($sp) +/* E29508 802B6098 8FBF0048 */ lw $ra, 0x48($sp) +/* E2950C 802B609C 03E00008 */ jr $ra +/* E29510 802B60A0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s b/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s new file mode 100644 index 0000000000..523e586a10 --- /dev/null +++ b/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s @@ -0,0 +1,925 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B60A4_E29514 +/* E29514 802B60A4 27BDFF98 */ addiu $sp, $sp, -0x68 +/* E29518 802B60A8 AFB30034 */ sw $s3, 0x34($sp) +/* E2951C 802B60AC 3C138011 */ lui $s3, %hi(gPlayerStatus) +/* E29520 802B60B0 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) +/* E29524 802B60B4 AFBF003C */ sw $ra, 0x3c($sp) +/* E29528 802B60B8 AFB40038 */ sw $s4, 0x38($sp) +/* E2952C 802B60BC AFB20030 */ sw $s2, 0x30($sp) +/* E29530 802B60C0 AFB1002C */ sw $s1, 0x2c($sp) +/* E29534 802B60C4 AFB00028 */ sw $s0, 0x28($sp) +/* E29538 802B60C8 F7BC0060 */ sdc1 $f28, 0x60($sp) +/* E2953C 802B60CC F7BA0058 */ sdc1 $f26, 0x58($sp) +/* E29540 802B60D0 F7B80050 */ sdc1 $f24, 0x50($sp) +/* E29544 802B60D4 F7B60048 */ sdc1 $f22, 0x48($sp) +/* E29548 802B60D8 F7B40040 */ sdc1 $f20, 0x40($sp) +/* E2954C 802B60DC 8E650000 */ lw $a1, ($s3) +/* E29550 802B60E0 04A10032 */ bgez $a1, .L802B61AC +/* E29554 802B60E4 3C037FFF */ lui $v1, 0x7fff +/* E29558 802B60E8 3463FFFF */ ori $v1, $v1, 0xffff +/* E2955C 802B60EC 3C04800A */ lui $a0, %hi(D_8009A650) +/* E29560 802B60F0 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) +/* E29564 802B60F4 8C820000 */ lw $v0, ($a0) +/* E29568 802B60F8 00A31824 */ and $v1, $a1, $v1 +/* E2956C 802B60FC AE630000 */ sw $v1, ($s3) +/* E29570 802B6100 34420040 */ ori $v0, $v0, 0x40 +/* E29574 802B6104 0C03BCC0 */ jal func_800EF300 +/* E29578 802B6108 AC820000 */ sw $v0, ($a0) +/* E2957C 802B610C C660002C */ lwc1 $f0, 0x2c($s3) +/* E29580 802B6110 3C014040 */ lui $at, 0x4040 +/* E29584 802B6114 44811000 */ mtc1 $at, $f2 +/* E29588 802B6118 24020001 */ addiu $v0, $zero, 1 +/* E2958C 802B611C A26200B6 */ sb $v0, 0xb6($s3) +/* E29590 802B6120 A6600008 */ sh $zero, 8($s3) +/* E29594 802B6124 3C01802B */ lui $at, %hi(D_802B6EE4) +/* E29598 802B6128 AC206EE4 */ sw $zero, %lo(D_802B6EE4)($at) +/* E2959C 802B612C 3C01802B */ lui $at, %hi(D_802B6EE8) +/* E295A0 802B6130 AC206EE8 */ sw $zero, %lo(D_802B6EE8)($at) +/* E295A4 802B6134 3C01802B */ lui $at, %hi(D_802B6EF4) +/* E295A8 802B6138 E4206EF4 */ swc1 $f0, %lo(D_802B6EF4)($at) +/* E295AC 802B613C 3C01802B */ lui $at, %hi(D_802B6EDC) +/* E295B0 802B6140 E4226EDC */ swc1 $f2, %lo(D_802B6EDC)($at) +/* E295B4 802B6144 0C038045 */ jal disable_player_static_collisions +/* E295B8 802B6148 00000000 */ nop +/* E295BC 802B614C 0C03805E */ jal disable_player_input +/* E295C0 802B6150 00000000 */ nop +/* E295C4 802B6154 3C030010 */ lui $v1, 0x10 +/* E295C8 802B6158 8E620000 */ lw $v0, ($s3) +/* E295CC 802B615C 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2) +/* E295D0 802B6160 8484A552 */ lh $a0, %lo(gCollisionStatus+0x2)($a0) +/* E295D4 802B6164 00431025 */ or $v0, $v0, $v1 +/* E295D8 802B6168 3C03802B */ lui $v1, %hi(D_802B6ED0) +/* E295DC 802B616C 24636ED0 */ addiu $v1, $v1, %lo(D_802B6ED0) +/* E295E0 802B6170 AE620000 */ sw $v0, ($s3) +/* E295E4 802B6174 04800004 */ bltz $a0, .L802B6188 +/* E295E8 802B6178 AFA40020 */ sw $a0, 0x20($sp) +/* E295EC 802B617C 30824000 */ andi $v0, $a0, 0x4000 +/* E295F0 802B6180 14400002 */ bnez $v0, .L802B618C +/* E295F4 802B6184 308203FF */ andi $v0, $a0, 0x3ff +.L802B6188: +/* E295F8 802B6188 2402FFFF */ addiu $v0, $zero, -1 +.L802B618C: +/* E295FC 802B618C AC620000 */ sw $v0, ($v1) +/* E29600 802B6190 8E620004 */ lw $v0, 4($s3) +/* E29604 802B6194 30420003 */ andi $v0, $v0, 3 +/* E29608 802B6198 14400004 */ bnez $v0, .L802B61AC +/* E2960C 802B619C 00000000 */ nop +/* E29610 802B61A0 3C040001 */ lui $a0, 1 +/* E29614 802B61A4 0C037FBF */ jal func_800DFEFC +/* E29618 802B61A8 3484002B */ ori $a0, $a0, 0x2b +.L802B61AC: +/* E2961C 802B61AC 826300B6 */ lb $v1, 0xb6($s3) +/* E29620 802B61B0 24020001 */ addiu $v0, $zero, 1 +/* E29624 802B61B4 10620005 */ beq $v1, $v0, .L802B61CC +/* E29628 802B61B8 24020002 */ addiu $v0, $zero, 2 +/* E2962C 802B61BC 106200F6 */ beq $v1, $v0, .L802B6598 +/* E29630 802B61C0 00000000 */ nop +/* E29634 802B61C4 080AD9D6 */ j .L802B6758 +/* E29638 802B61C8 00000000 */ nop +.L802B61CC: +/* E2963C 802B61CC 3C04802B */ lui $a0, %hi(D_802B6EE4) +/* E29640 802B61D0 24846EE4 */ addiu $a0, $a0, %lo(D_802B6EE4) +/* E29644 802B61D4 3C03800A */ lui $v1, %hi(D_8009A650) +/* E29648 802B61D8 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) +/* E2964C 802B61DC C4800000 */ lwc1 $f0, ($a0) +/* E29650 802B61E0 3C013F80 */ lui $at, 0x3f80 +/* E29654 802B61E4 4481E000 */ mtc1 $at, $f28 +/* E29658 802B61E8 8C620000 */ lw $v0, ($v1) +/* E2965C 802B61EC 3C0141A0 */ lui $at, 0x41a0 +/* E29660 802B61F0 44811000 */ mtc1 $at, $f2 +/* E29664 802B61F4 461C0000 */ add.s $f0, $f0, $f28 +/* E29668 802B61F8 34420040 */ ori $v0, $v0, 0x40 +/* E2966C 802B61FC AC620000 */ sw $v0, ($v1) +/* E29670 802B6200 4600103E */ c.le.s $f2, $f0 +/* E29674 802B6204 00000000 */ nop +/* E29678 802B6208 45000002 */ bc1f .L802B6214 +/* E2967C 802B620C E4800000 */ swc1 $f0, ($a0) +/* E29680 802B6210 E4820000 */ swc1 $f2, ($a0) +.L802B6214: +/* E29684 802B6214 C66000A8 */ lwc1 $f0, 0xa8($s3) +/* E29688 802B6218 C48C0000 */ lwc1 $f12, ($a0) +/* E2968C 802B621C 0C00A6C9 */ jal clamp_angle +/* E29690 802B6220 460C0300 */ add.s $f12, $f0, $f12 +/* E29694 802B6224 86620008 */ lh $v0, 8($s3) +/* E29698 802B6228 96630008 */ lhu $v1, 8($s3) +/* E2969C 802B622C 2842000A */ slti $v0, $v0, 0xa +/* E296A0 802B6230 10400008 */ beqz $v0, .L802B6254 +/* E296A4 802B6234 E66000A8 */ swc1 $f0, 0xa8($s3) +/* E296A8 802B6238 3C02802B */ lui $v0, %hi(D_802B6EF4) +/* E296AC 802B623C 24426EF4 */ addiu $v0, $v0, %lo(D_802B6EF4) +/* E296B0 802B6240 C4400000 */ lwc1 $f0, ($v0) +/* E296B4 802B6244 461C0000 */ add.s $f0, $f0, $f28 +/* E296B8 802B6248 24630001 */ addiu $v1, $v1, 1 +/* E296BC 802B624C A6630008 */ sh $v1, 8($s3) +/* E296C0 802B6250 E4400000 */ swc1 $f0, ($v0) +.L802B6254: +/* E296C4 802B6254 3C02802B */ lui $v0, %hi(D_802B6EE8) +/* E296C8 802B6258 24426EE8 */ addiu $v0, $v0, %lo(D_802B6EE8) +/* E296CC 802B625C C44C0000 */ lwc1 $f12, ($v0) +/* E296D0 802B6260 3C014100 */ lui $at, 0x4100 +/* E296D4 802B6264 44810000 */ mtc1 $at, $f0 +/* E296D8 802B6268 00000000 */ nop +/* E296DC 802B626C 46006300 */ add.s $f12, $f12, $f0 +/* E296E0 802B6270 3C0140C9 */ lui $at, 0x40c9 +/* E296E4 802B6274 34210FD0 */ ori $at, $at, 0xfd0 +/* E296E8 802B6278 4481A000 */ mtc1 $at, $f20 +/* E296EC 802B627C 0C00A6C9 */ jal clamp_angle +/* E296F0 802B6280 E44C0000 */ swc1 $f12, ($v0) +/* E296F4 802B6284 46140002 */ mul.s $f0, $f0, $f20 +/* E296F8 802B6288 00000000 */ nop +/* E296FC 802B628C 3C0143B4 */ lui $at, 0x43b4 +/* E29700 802B6290 4481B000 */ mtc1 $at, $f22 +/* E29704 802B6294 3C014080 */ lui $at, 0x4080 +/* E29708 802B6298 4481D000 */ mtc1 $at, $f26 +/* E2970C 802B629C 0C00A85B */ jal sin_rad +/* E29710 802B62A0 46160303 */ div.s $f12, $f0, $f22 +/* E29714 802B62A4 461A0002 */ mul.s $f0, $f0, $f26 +/* E29718 802B62A8 00000000 */ nop +/* E2971C 802B62AC 3C01802B */ lui $at, %hi(D_802B6EF4) +/* E29720 802B62B0 C4226EF4 */ lwc1 $f2, %lo(D_802B6EF4)($at) +/* E29724 802B62B4 46001080 */ add.s $f2, $f2, $f0 +/* E29728 802B62B8 3C04802B */ lui $a0, %hi(D_802B6ED0) +/* E2972C 802B62BC 8C846ED0 */ lw $a0, %lo(D_802B6ED0)($a0) +/* E29730 802B62C0 04800042 */ bltz $a0, .L802B63CC +/* E29734 802B62C4 E662002C */ swc1 $f2, 0x2c($s3) +/* E29738 802B62C8 0C04417A */ jal get_entity_by_index +/* E2973C 802B62CC 00000000 */ nop +/* E29740 802B62D0 0040902D */ daddu $s2, $v0, $zero +/* E29744 802B62D4 C64C0048 */ lwc1 $f12, 0x48($s2) +/* E29748 802B62D8 C64E0050 */ lwc1 $f14, 0x50($s2) +/* E2974C 802B62DC 8E660028 */ lw $a2, 0x28($s3) +/* E29750 802B62E0 0C00A7B5 */ jal dist2D +/* E29754 802B62E4 8E670030 */ lw $a3, 0x30($s3) +/* E29758 802B62E8 C64C0048 */ lwc1 $f12, 0x48($s2) +/* E2975C 802B62EC C64E0050 */ lwc1 $f14, 0x50($s2) +/* E29760 802B62F0 8E660028 */ lw $a2, 0x28($s3) +/* E29764 802B62F4 8E670030 */ lw $a3, 0x30($s3) +/* E29768 802B62F8 0C00A720 */ jal atan2 +/* E2976C 802B62FC 46000606 */ mov.s $f24, $f0 +/* E29770 802B6300 3C14802B */ lui $s4, %hi(D_802B6EEC) +/* E29774 802B6304 26946EEC */ addiu $s4, $s4, %lo(D_802B6EEC) +/* E29778 802B6308 4618D03C */ c.lt.s $f26, $f24 +/* E2977C 802B630C 00000000 */ nop +/* E29780 802B6310 45000002 */ bc1f .L802B631C +/* E29784 802B6314 E6800000 */ swc1 $f0, ($s4) +/* E29788 802B6318 461CC601 */ sub.s $f24, $f24, $f28 +.L802B631C: +/* E2978C 802B631C 46140302 */ mul.s $f12, $f0, $f20 +/* E29790 802B6320 00000000 */ nop +/* E29794 802B6324 27B00010 */ addiu $s0, $sp, 0x10 +/* E29798 802B6328 0200282D */ daddu $a1, $s0, $zero +/* E2979C 802B632C 27B10014 */ addiu $s1, $sp, 0x14 +/* E297A0 802B6330 0220302D */ daddu $a2, $s1, $zero +/* E297A4 802B6334 0C00A82D */ jal sin_cos_rad +/* E297A8 802B6338 46166303 */ div.s $f12, $f12, $f22 +/* E297AC 802B633C C7A20010 */ lwc1 $f2, 0x10($sp) +/* E297B0 802B6340 46181082 */ mul.s $f2, $f2, $f24 +/* E297B4 802B6344 00000000 */ nop +/* E297B8 802B6348 C7A40014 */ lwc1 $f4, 0x14($sp) +/* E297BC 802B634C 46182102 */ mul.s $f4, $f4, $f24 +/* E297C0 802B6350 00000000 */ nop +/* E297C4 802B6354 C68C0000 */ lwc1 $f12, ($s4) +/* E297C8 802B6358 3C0142B6 */ lui $at, 0x42b6 +/* E297CC 802B635C 44810000 */ mtc1 $at, $f0 +/* E297D0 802B6360 00000000 */ nop +/* E297D4 802B6364 46006301 */ sub.s $f12, $f12, $f0 +/* E297D8 802B6368 C6400048 */ lwc1 $f0, 0x48($s2) +/* E297DC 802B636C 46020000 */ add.s $f0, $f0, $f2 +/* E297E0 802B6370 46146302 */ mul.s $f12, $f12, $f20 +/* E297E4 802B6374 00000000 */ nop +/* E297E8 802B6378 E6600028 */ swc1 $f0, 0x28($s3) +/* E297EC 802B637C C6400050 */ lwc1 $f0, 0x50($s2) +/* E297F0 802B6380 0200282D */ daddu $a1, $s0, $zero +/* E297F4 802B6384 46040001 */ sub.s $f0, $f0, $f4 +/* E297F8 802B6388 0220302D */ daddu $a2, $s1, $zero +/* E297FC 802B638C 46166303 */ div.s $f12, $f12, $f22 +/* E29800 802B6390 0C00A82D */ jal sin_cos_rad +/* E29804 802B6394 E6600030 */ swc1 $f0, 0x30($s3) +/* E29808 802B6398 C7A20010 */ lwc1 $f2, 0x10($sp) +/* E2980C 802B639C 3C01802B */ lui $at, %hi(D_802B6EDC) +/* E29810 802B63A0 C4246EDC */ lwc1 $f4, %lo(D_802B6EDC)($at) +/* E29814 802B63A4 46041082 */ mul.s $f2, $f2, $f4 +/* E29818 802B63A8 00000000 */ nop +/* E2981C 802B63AC C7A00014 */ lwc1 $f0, 0x14($sp) +/* E29820 802B63B0 46000007 */ neg.s $f0, $f0 +/* E29824 802B63B4 46040002 */ mul.s $f0, $f0, $f4 +/* E29828 802B63B8 00000000 */ nop +/* E2982C 802B63BC 3C01802B */ lui $at, %hi(D_802B6ED4) +/* E29830 802B63C0 E4226ED4 */ swc1 $f2, %lo(D_802B6ED4)($at) +/* E29834 802B63C4 3C01802B */ lui $at, %hi(D_802B6ED8) +/* E29838 802B63C8 E4206ED8 */ swc1 $f0, %lo(D_802B6ED8)($at) +.L802B63CC: +/* E2983C 802B63CC 27A40018 */ addiu $a0, $sp, 0x18 +/* E29840 802B63D0 0C0388FF */ jal func_800E23FC +/* E29844 802B63D4 27A5001C */ addiu $a1, $sp, 0x1c +/* E29848 802B63D8 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* E2984C 802B63DC 44800000 */ mtc1 $zero, $f0 +/* E29850 802B63E0 00000000 */ nop +/* E29854 802B63E4 46001032 */ c.eq.s $f2, $f0 +/* E29858 802B63E8 00000000 */ nop +/* E2985C 802B63EC 4501002C */ bc1t .L802B64A0 +/* E29860 802B63F0 27A50010 */ addiu $a1, $sp, 0x10 +/* E29864 802B63F4 C7AC0018 */ lwc1 $f12, 0x18($sp) +/* E29868 802B63F8 3C0140C9 */ lui $at, 0x40c9 +/* E2986C 802B63FC 34210FD0 */ ori $at, $at, 0xfd0 +/* E29870 802B6400 44810000 */ mtc1 $at, $f0 +/* E29874 802B6404 00000000 */ nop +/* E29878 802B6408 46006302 */ mul.s $f12, $f12, $f0 +/* E2987C 802B640C 00000000 */ nop +/* E29880 802B6410 3C0143B4 */ lui $at, 0x43b4 +/* E29884 802B6414 44810000 */ mtc1 $at, $f0 +/* E29888 802B6418 27A60014 */ addiu $a2, $sp, 0x14 +/* E2988C 802B641C 0C00A82D */ jal sin_cos_rad +/* E29890 802B6420 46006303 */ div.s $f12, $f12, $f0 +/* E29894 802B6424 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* E29898 802B6428 3C013D00 */ lui $at, 0x3d00 +/* E2989C 802B642C 44810000 */ mtc1 $at, $f0 +/* E298A0 802B6430 00000000 */ nop +/* E298A4 802B6434 46002102 */ mul.s $f4, $f4, $f0 +/* E298A8 802B6438 00000000 */ nop +/* E298AC 802B643C 3C01802B */ lui $at, %hi(D_802B6E90) +/* E298B0 802B6440 D4226E90 */ ldc1 $f2, %lo(D_802B6E90)($at) +/* E298B4 802B6444 46002021 */ cvt.d.s $f0, $f4 +/* E298B8 802B6448 4622003C */ c.lt.d $f0, $f2 +/* E298BC 802B644C 00000000 */ nop +/* E298C0 802B6450 45000006 */ bc1f .L802B646C +/* E298C4 802B6454 E7A4001C */ swc1 $f4, 0x1c($sp) +/* E298C8 802B6458 3C013DCC */ lui $at, 0x3dcc +/* E298CC 802B645C 3421CCCD */ ori $at, $at, 0xcccd +/* E298D0 802B6460 44810000 */ mtc1 $at, $f0 +/* E298D4 802B6464 00000000 */ nop +/* E298D8 802B6468 E7A0001C */ swc1 $f0, 0x1c($sp) +.L802B646C: +/* E298DC 802B646C C7A00010 */ lwc1 $f0, 0x10($sp) +/* E298E0 802B6470 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* E298E4 802B6474 46020002 */ mul.s $f0, $f0, $f2 +/* E298E8 802B6478 00000000 */ nop +/* E298EC 802B647C C7A40014 */ lwc1 $f4, 0x14($sp) +/* E298F0 802B6480 46022102 */ mul.s $f4, $f4, $f2 +/* E298F4 802B6484 00000000 */ nop +/* E298F8 802B6488 C6620028 */ lwc1 $f2, 0x28($s3) +/* E298FC 802B648C 46001080 */ add.s $f2, $f2, $f0 +/* E29900 802B6490 C6600030 */ lwc1 $f0, 0x30($s3) +/* E29904 802B6494 46040001 */ sub.s $f0, $f0, $f4 +/* E29908 802B6498 E6620028 */ swc1 $f2, 0x28($s3) +/* E2990C 802B649C E6600030 */ swc1 $f0, 0x30($s3) +.L802B64A0: +/* E29910 802B64A0 C6600028 */ lwc1 $f0, 0x28($s3) +/* E29914 802B64A4 C662002C */ lwc1 $f2, 0x2c($s3) +/* E29918 802B64A8 C6640030 */ lwc1 $f4, 0x30($s3) +/* E2991C 802B64AC 3C02800B */ lui $v0, %hi(gCameras) +/* E29920 802B64B0 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* E29924 802B64B4 E4400060 */ swc1 $f0, 0x60($v0) +/* E29928 802B64B8 E4420064 */ swc1 $f2, 0x64($v0) +/* E2992C 802B64BC 0C0AD800 */ jal func_802B6000_E29470 +/* E29930 802B64C0 E4440068 */ swc1 $f4, 0x68($v0) +/* E29934 802B64C4 04400004 */ bltz $v0, .L802B64D8 +/* E29938 802B64C8 AFA20020 */ sw $v0, 0x20($sp) +/* E2993C 802B64CC 30424000 */ andi $v0, $v0, 0x4000 +/* E29940 802B64D0 14400014 */ bnez $v0, .L802B6524 +/* E29944 802B64D4 00000000 */ nop +.L802B64D8: +/* E29948 802B64D8 C660002C */ lwc1 $f0, 0x2c($s3) +/* E2994C 802B64DC 24020014 */ addiu $v0, $zero, 0x14 +/* E29950 802B64E0 A6620008 */ sh $v0, 8($s3) +/* E29954 802B64E4 3C01802B */ lui $at, %hi(D_802B6EE8) +/* E29958 802B64E8 AC206EE8 */ sw $zero, %lo(D_802B6EE8)($at) +/* E2995C 802B64EC 3C01802B */ lui $at, %hi(D_802B6EF4) +/* E29960 802B64F0 E4206EF4 */ swc1 $f0, %lo(D_802B6EF4)($at) +/* E29964 802B64F4 926200B6 */ lbu $v0, 0xb6($s3) +/* E29968 802B64F8 3C013FCC */ lui $at, 0x3fcc +/* E2996C 802B64FC 3421CCCD */ ori $at, $at, 0xcccd +/* E29970 802B6500 44810000 */ mtc1 $at, $f0 +/* E29974 802B6504 24420001 */ addiu $v0, $v0, 1 +/* E29978 802B6508 A26200B6 */ sb $v0, 0xb6($s3) +/* E2997C 802B650C 8E620000 */ lw $v0, ($s3) +/* E29980 802B6510 3C030080 */ lui $v1, 0x80 +/* E29984 802B6514 3C01802B */ lui $at, %hi(D_802B6EF0) +/* E29988 802B6518 E4206EF0 */ swc1 $f0, %lo(D_802B6EF0)($at) +/* E2998C 802B651C 00431025 */ or $v0, $v0, $v1 +/* E29990 802B6520 AE620000 */ sw $v0, ($s3) +.L802B6524: +/* E29994 802B6524 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* E29998 802B6528 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* E2999C 802B652C 8C420010 */ lw $v0, 0x10($v0) +/* E299A0 802B6530 30422000 */ andi $v0, $v0, 0x2000 +/* E299A4 802B6534 10400088 */ beqz $v0, .L802B6758 +/* E299A8 802B6538 00000000 */ nop +/* E299AC 802B653C 8E620004 */ lw $v0, 4($s3) +/* E299B0 802B6540 30420003 */ andi $v0, $v0, 3 +/* E299B4 802B6544 14400084 */ bnez $v0, .L802B6758 +/* E299B8 802B6548 3C040001 */ lui $a0, 1 +/* E299BC 802B654C 0C037FDE */ jal func_800DFF78 +/* E299C0 802B6550 34840007 */ ori $a0, $a0, 7 +/* E299C4 802B6554 3C04802B */ lui $a0, %hi(D_802B6ED0) +/* E299C8 802B6558 8C846ED0 */ lw $a0, %lo(D_802B6ED0)($a0) +/* E299CC 802B655C 24020003 */ addiu $v0, $zero, 3 +/* E299D0 802B6560 A26200B6 */ sb $v0, 0xb6($s3) +/* E299D4 802B6564 2402001E */ addiu $v0, $zero, 0x1e +/* E299D8 802B6568 A6620008 */ sh $v0, 8($s3) +/* E299DC 802B656C 2402FFFF */ addiu $v0, $zero, -1 +/* E299E0 802B6570 3C01802B */ lui $at, %hi(D_802B6EE0) +/* E299E4 802B6574 AC206EE0 */ sw $zero, %lo(D_802B6EE0)($at) +/* E299E8 802B6578 3C018016 */ lui $at, %hi(gCollisionStatus+0x2) +/* E299EC 802B657C A422A552 */ sh $v0, %lo(gCollisionStatus+0x2)($at) +/* E299F0 802B6580 0C04417A */ jal get_entity_by_index +/* E299F4 802B6584 00000000 */ nop +/* E299F8 802B6588 0C043F5A */ jal func_8010FD68 +/* E299FC 802B658C 0040202D */ daddu $a0, $v0, $zero +/* E29A00 802B6590 080AD9D6 */ j .L802B6758 +/* E29A04 802B6594 00000000 */ nop +.L802B6598: +/* E29A08 802B6598 3C04802B */ lui $a0, %hi(D_802B6EE4) +/* E29A0C 802B659C 24846EE4 */ addiu $a0, $a0, %lo(D_802B6EE4) +/* E29A10 802B65A0 3C11800A */ lui $s1, %hi(D_8009A650) +/* E29A14 802B65A4 2631A650 */ addiu $s1, $s1, %lo(D_8009A650) +/* E29A18 802B65A8 C4800000 */ lwc1 $f0, ($a0) +/* E29A1C 802B65AC 3C013F80 */ lui $at, 0x3f80 +/* E29A20 802B65B0 44811000 */ mtc1 $at, $f2 +/* E29A24 802B65B4 8E220000 */ lw $v0, ($s1) +/* E29A28 802B65B8 46020001 */ sub.s $f0, $f0, $f2 +/* E29A2C 802B65BC 44801000 */ mtc1 $zero, $f2 +/* E29A30 802B65C0 34420040 */ ori $v0, $v0, 0x40 +/* E29A34 802B65C4 AE220000 */ sw $v0, ($s1) +/* E29A38 802B65C8 4602003C */ c.lt.s $f0, $f2 +/* E29A3C 802B65CC 00000000 */ nop +/* E29A40 802B65D0 45000007 */ bc1f .L802B65F0 +/* E29A44 802B65D4 E4800000 */ swc1 $f0, ($a0) +/* E29A48 802B65D8 3C03FFEF */ lui $v1, 0xffef +/* E29A4C 802B65DC 8E620000 */ lw $v0, ($s3) +/* E29A50 802B65E0 3463FFFF */ ori $v1, $v1, 0xffff +/* E29A54 802B65E4 E4820000 */ swc1 $f2, ($a0) +/* E29A58 802B65E8 00431024 */ and $v0, $v0, $v1 +/* E29A5C 802B65EC AE620000 */ sw $v0, ($s3) +.L802B65F0: +/* E29A60 802B65F0 C66000A8 */ lwc1 $f0, 0xa8($s3) +/* E29A64 802B65F4 C48C0000 */ lwc1 $f12, ($a0) +/* E29A68 802B65F8 0C00A6C9 */ jal clamp_angle +/* E29A6C 802B65FC 460C0300 */ add.s $f12, $f0, $f12 +/* E29A70 802B6600 3C01802B */ lui $at, %hi(D_802B6EEC) +/* E29A74 802B6604 C42C6EEC */ lwc1 $f12, %lo(D_802B6EEC)($at) +/* E29A78 802B6608 3C014270 */ lui $at, 0x4270 +/* E29A7C 802B660C 44811000 */ mtc1 $at, $f2 +/* E29A80 802B6610 00000000 */ nop +/* E29A84 802B6614 46026301 */ sub.s $f12, $f12, $f2 +/* E29A88 802B6618 3C0140C9 */ lui $at, 0x40c9 +/* E29A8C 802B661C 34210FD0 */ ori $at, $at, 0xfd0 +/* E29A90 802B6620 44811000 */ mtc1 $at, $f2 +/* E29A94 802B6624 00000000 */ nop +/* E29A98 802B6628 46026302 */ mul.s $f12, $f12, $f2 +/* E29A9C 802B662C 00000000 */ nop +/* E29AA0 802B6630 27A50010 */ addiu $a1, $sp, 0x10 +/* E29AA4 802B6634 3C0143B4 */ lui $at, 0x43b4 +/* E29AA8 802B6638 44811000 */ mtc1 $at, $f2 +/* E29AAC 802B663C 27A60014 */ addiu $a2, $sp, 0x14 +/* E29AB0 802B6640 E66000A8 */ swc1 $f0, 0xa8($s3) +/* E29AB4 802B6644 0C00A82D */ jal sin_cos_rad +/* E29AB8 802B6648 46026303 */ div.s $f12, $f12, $f2 +/* E29ABC 802B664C 3C02802B */ lui $v0, %hi(D_802B6EDC) +/* E29AC0 802B6650 24426EDC */ addiu $v0, $v0, %lo(D_802B6EDC) +/* E29AC4 802B6654 C4400000 */ lwc1 $f0, ($v0) +/* E29AC8 802B6658 3C01802B */ lui $at, %hi(D_802B6E98) +/* E29ACC 802B665C D4226E98 */ ldc1 $f2, %lo(D_802B6E98)($at) +/* E29AD0 802B6660 46000021 */ cvt.d.s $f0, $f0 +/* E29AD4 802B6664 46220000 */ add.d $f0, $f0, $f2 +/* E29AD8 802B6668 C7A80010 */ lwc1 $f8, 0x10($sp) +/* E29ADC 802B666C 46200020 */ cvt.s.d $f0, $f0 +/* E29AE0 802B6670 46004202 */ mul.s $f8, $f8, $f0 +/* E29AE4 802B6674 00000000 */ nop +/* E29AE8 802B6678 3C10802B */ lui $s0, %hi(D_802B6EF0) +/* E29AEC 802B667C 26106EF0 */ addiu $s0, $s0, %lo(D_802B6EF0) +/* E29AF0 802B6680 C6020000 */ lwc1 $f2, ($s0) +/* E29AF4 802B6684 3C01802B */ lui $at, %hi(D_802B6EA0) +/* E29AF8 802B6688 D4246EA0 */ ldc1 $f4, %lo(D_802B6EA0)($at) +/* E29AFC 802B668C 460010A1 */ cvt.d.s $f2, $f2 +/* E29B00 802B6690 46241081 */ sub.d $f2, $f2, $f4 +/* E29B04 802B6694 C7A40014 */ lwc1 $f4, 0x14($sp) +/* E29B08 802B6698 46002107 */ neg.s $f4, $f4 +/* E29B0C 802B669C 46002102 */ mul.s $f4, $f4, $f0 +/* E29B10 802B66A0 00000000 */ nop +/* E29B14 802B66A4 E4400000 */ swc1 $f0, ($v0) +/* E29B18 802B66A8 C6600028 */ lwc1 $f0, 0x28($s3) +/* E29B1C 802B66AC C6660030 */ lwc1 $f6, 0x30($s3) +/* E29B20 802B66B0 46080000 */ add.s $f0, $f0, $f8 +/* E29B24 802B66B4 462010A0 */ cvt.s.d $f2, $f2 +/* E29B28 802B66B8 E6020000 */ swc1 $f2, ($s0) +/* E29B2C 802B66BC 46043180 */ add.s $f6, $f6, $f4 +/* E29B30 802B66C0 3C01802B */ lui $at, %hi(D_802B6ED4) +/* E29B34 802B66C4 E4286ED4 */ swc1 $f8, %lo(D_802B6ED4)($at) +/* E29B38 802B66C8 3C01802B */ lui $at, %hi(D_802B6ED8) +/* E29B3C 802B66CC E4246ED8 */ swc1 $f4, %lo(D_802B6ED8)($at) +/* E29B40 802B66D0 E6600028 */ swc1 $f0, 0x28($s3) +/* E29B44 802B66D4 0C0392EE */ jal func_800E4BB8 +/* E29B48 802B66D8 E6660030 */ swc1 $f6, 0x30($s3) +/* E29B4C 802B66DC C60C0000 */ lwc1 $f12, ($s0) +/* E29B50 802B66E0 0C038D45 */ jal func_800E3514 +/* E29B54 802B66E4 27A50020 */ addiu $a1, $sp, 0x20 +/* E29B58 802B66E8 E660002C */ swc1 $f0, 0x2c($s3) +/* E29B5C 802B66EC C6600028 */ lwc1 $f0, 0x28($s3) +/* E29B60 802B66F0 C662002C */ lwc1 $f2, 0x2c($s3) +/* E29B64 802B66F4 C6640030 */ lwc1 $f4, 0x30($s3) +/* E29B68 802B66F8 8FA30020 */ lw $v1, 0x20($sp) +/* E29B6C 802B66FC 3C02800B */ lui $v0, %hi(gCameras) +/* E29B70 802B6700 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* E29B74 802B6704 E4400060 */ swc1 $f0, 0x60($v0) +/* E29B78 802B6708 E4420064 */ swc1 $f2, 0x64($v0) +/* E29B7C 802B670C 04600012 */ bltz $v1, .L802B6758 +/* E29B80 802B6710 E4440068 */ swc1 $f4, 0x68($v0) +/* E29B84 802B6714 3C03FFEF */ lui $v1, 0xffef +/* E29B88 802B6718 8E620000 */ lw $v0, ($s3) +/* E29B8C 802B671C 3463FFFF */ ori $v1, $v1, 0xffff +/* E29B90 802B6720 00431024 */ and $v0, $v0, $v1 +/* E29B94 802B6724 0C038069 */ jal enable_player_input +/* E29B98 802B6728 AE620000 */ sw $v0, ($s3) +/* E29B9C 802B672C 0C038050 */ jal enable_player_static_collisions +/* E29BA0 802B6730 00000000 */ nop +/* E29BA4 802B6734 0C039769 */ jal set_action_state +/* E29BA8 802B6738 2404000A */ addiu $a0, $zero, 0xa +/* E29BAC 802B673C 0C03BCCA */ jal enable_partner_ai +/* E29BB0 802B6740 00000000 */ nop +/* E29BB4 802B6744 8E220000 */ lw $v0, ($s1) +/* E29BB8 802B6748 2403FFBF */ addiu $v1, $zero, -0x41 +/* E29BBC 802B674C 00431024 */ and $v0, $v0, $v1 +/* E29BC0 802B6750 080ADB96 */ j .L802B6E58 +/* E29BC4 802B6754 AE220000 */ sw $v0, ($s1) +.L802B6758: +/* E29BC8 802B6758 926200B6 */ lbu $v0, 0xb6($s3) +/* E29BCC 802B675C 2442FFFD */ addiu $v0, $v0, -3 +/* E29BD0 802B6760 00021600 */ sll $v0, $v0, 0x18 +/* E29BD4 802B6764 00021E03 */ sra $v1, $v0, 0x18 +/* E29BD8 802B6768 2C620009 */ sltiu $v0, $v1, 9 +/* E29BDC 802B676C 104001BA */ beqz $v0, .L802B6E58 +/* E29BE0 802B6770 00031080 */ sll $v0, $v1, 2 +/* E29BE4 802B6774 3C01802B */ lui $at, %hi(D_802B6EA8) +/* E29BE8 802B6778 00220821 */ addu $at, $at, $v0 +/* E29BEC 802B677C 8C226EA8 */ lw $v0, %lo(D_802B6EA8)($at) +/* E29BF0 802B6780 00400008 */ jr $v0 +/* E29BF4 802B6784 00000000 */ nop +/* E29BF8 802B6788 3C04802B */ lui $a0, %hi(D_802B6ED0) +/* E29BFC 802B678C 8C846ED0 */ lw $a0, %lo(D_802B6ED0)($a0) +/* E29C00 802B6790 0480004D */ bltz $a0, .L802B68C8 +/* E29C04 802B6794 00000000 */ nop +/* E29C08 802B6798 0C04417A */ jal get_entity_by_index +/* E29C0C 802B679C 00000000 */ nop +/* E29C10 802B67A0 0040902D */ daddu $s2, $v0, $zero +/* E29C14 802B67A4 C44C0048 */ lwc1 $f12, 0x48($v0) +/* E29C18 802B67A8 C64E0050 */ lwc1 $f14, 0x50($s2) +/* E29C1C 802B67AC 8E660028 */ lw $a2, 0x28($s3) +/* E29C20 802B67B0 0C00A7B5 */ jal dist2D +/* E29C24 802B67B4 8E670030 */ lw $a3, 0x30($s3) +/* E29C28 802B67B8 C64C0048 */ lwc1 $f12, 0x48($s2) +/* E29C2C 802B67BC C64E0050 */ lwc1 $f14, 0x50($s2) +/* E29C30 802B67C0 8E660028 */ lw $a2, 0x28($s3) +/* E29C34 802B67C4 8E670030 */ lw $a3, 0x30($s3) +/* E29C38 802B67C8 0C00A720 */ jal atan2 +/* E29C3C 802B67CC 46000606 */ mov.s $f24, $f0 +/* E29C40 802B67D0 46000306 */ mov.s $f12, $f0 +/* E29C44 802B67D4 3C014080 */ lui $at, 0x4080 +/* E29C48 802B67D8 44810000 */ mtc1 $at, $f0 +/* E29C4C 802B67DC 3C14802B */ lui $s4, %hi(D_802B6EEC) +/* E29C50 802B67E0 26946EEC */ addiu $s4, $s4, %lo(D_802B6EEC) +/* E29C54 802B67E4 4618003C */ c.lt.s $f0, $f24 +/* E29C58 802B67E8 00000000 */ nop +/* E29C5C 802B67EC 45000005 */ bc1f .L802B6804 +/* E29C60 802B67F0 E68C0000 */ swc1 $f12, ($s4) +/* E29C64 802B67F4 3C013F80 */ lui $at, 0x3f80 +/* E29C68 802B67F8 44810000 */ mtc1 $at, $f0 +/* E29C6C 802B67FC 00000000 */ nop +/* E29C70 802B6800 4600C601 */ sub.s $f24, $f24, $f0 +.L802B6804: +/* E29C74 802B6804 3C0140C9 */ lui $at, 0x40c9 +/* E29C78 802B6808 34210FD0 */ ori $at, $at, 0xfd0 +/* E29C7C 802B680C 4481A000 */ mtc1 $at, $f20 +/* E29C80 802B6810 27B10010 */ addiu $s1, $sp, 0x10 +/* E29C84 802B6814 46146302 */ mul.s $f12, $f12, $f20 +/* E29C88 802B6818 00000000 */ nop +/* E29C8C 802B681C 0220282D */ daddu $a1, $s1, $zero +/* E29C90 802B6820 27B00014 */ addiu $s0, $sp, 0x14 +/* E29C94 802B6824 3C0143B4 */ lui $at, 0x43b4 +/* E29C98 802B6828 4481B000 */ mtc1 $at, $f22 +/* E29C9C 802B682C 0200302D */ daddu $a2, $s0, $zero +/* E29CA0 802B6830 0C00A82D */ jal sin_cos_rad +/* E29CA4 802B6834 46166303 */ div.s $f12, $f12, $f22 +/* E29CA8 802B6838 C7A20010 */ lwc1 $f2, 0x10($sp) +/* E29CAC 802B683C 46181082 */ mul.s $f2, $f2, $f24 +/* E29CB0 802B6840 00000000 */ nop +/* E29CB4 802B6844 C7A40014 */ lwc1 $f4, 0x14($sp) +/* E29CB8 802B6848 46182102 */ mul.s $f4, $f4, $f24 +/* E29CBC 802B684C 00000000 */ nop +/* E29CC0 802B6850 C68C0000 */ lwc1 $f12, ($s4) +/* E29CC4 802B6854 3C0142B6 */ lui $at, 0x42b6 +/* E29CC8 802B6858 44810000 */ mtc1 $at, $f0 +/* E29CCC 802B685C 00000000 */ nop +/* E29CD0 802B6860 46006301 */ sub.s $f12, $f12, $f0 +/* E29CD4 802B6864 C6400048 */ lwc1 $f0, 0x48($s2) +/* E29CD8 802B6868 46020000 */ add.s $f0, $f0, $f2 +/* E29CDC 802B686C 46146302 */ mul.s $f12, $f12, $f20 +/* E29CE0 802B6870 00000000 */ nop +/* E29CE4 802B6874 E6600028 */ swc1 $f0, 0x28($s3) +/* E29CE8 802B6878 C6400050 */ lwc1 $f0, 0x50($s2) +/* E29CEC 802B687C 0220282D */ daddu $a1, $s1, $zero +/* E29CF0 802B6880 46040001 */ sub.s $f0, $f0, $f4 +/* E29CF4 802B6884 0200302D */ daddu $a2, $s0, $zero +/* E29CF8 802B6888 46166303 */ div.s $f12, $f12, $f22 +/* E29CFC 802B688C 0C00A82D */ jal sin_cos_rad +/* E29D00 802B6890 E6600030 */ swc1 $f0, 0x30($s3) +/* E29D04 802B6894 C7A20010 */ lwc1 $f2, 0x10($sp) +/* E29D08 802B6898 3C01802B */ lui $at, %hi(D_802B6EDC) +/* E29D0C 802B689C C4246EDC */ lwc1 $f4, %lo(D_802B6EDC)($at) +/* E29D10 802B68A0 46041082 */ mul.s $f2, $f2, $f4 +/* E29D14 802B68A4 00000000 */ nop +/* E29D18 802B68A8 C7A00014 */ lwc1 $f0, 0x14($sp) +/* E29D1C 802B68AC 46000007 */ neg.s $f0, $f0 +/* E29D20 802B68B0 46040002 */ mul.s $f0, $f0, $f4 +/* E29D24 802B68B4 00000000 */ nop +/* E29D28 802B68B8 3C01802B */ lui $at, %hi(D_802B6ED4) +/* E29D2C 802B68BC E4226ED4 */ swc1 $f2, %lo(D_802B6ED4)($at) +/* E29D30 802B68C0 3C01802B */ lui $at, %hi(D_802B6ED8) +/* E29D34 802B68C4 E4206ED8 */ swc1 $f0, %lo(D_802B6ED8)($at) +.L802B68C8: +/* E29D38 802B68C8 3C02802B */ lui $v0, %hi(D_802B6EE8) +/* E29D3C 802B68CC 24426EE8 */ addiu $v0, $v0, %lo(D_802B6EE8) +/* E29D40 802B68D0 C44C0000 */ lwc1 $f12, ($v0) +/* E29D44 802B68D4 3C014100 */ lui $at, 0x4100 +/* E29D48 802B68D8 44810000 */ mtc1 $at, $f0 +/* E29D4C 802B68DC 00000000 */ nop +/* E29D50 802B68E0 46006300 */ add.s $f12, $f12, $f0 +/* E29D54 802B68E4 0C00A6C9 */ jal clamp_angle +/* E29D58 802B68E8 E44C0000 */ swc1 $f12, ($v0) +/* E29D5C 802B68EC 3C0140C9 */ lui $at, 0x40c9 +/* E29D60 802B68F0 34210FD0 */ ori $at, $at, 0xfd0 +/* E29D64 802B68F4 44811000 */ mtc1 $at, $f2 +/* E29D68 802B68F8 00000000 */ nop +/* E29D6C 802B68FC 46020002 */ mul.s $f0, $f0, $f2 +/* E29D70 802B6900 00000000 */ nop +/* E29D74 802B6904 3C0143B4 */ lui $at, 0x43b4 +/* E29D78 802B6908 44816000 */ mtc1 $at, $f12 +/* E29D7C 802B690C 0C00A85B */ jal sin_rad +/* E29D80 802B6910 460C0303 */ div.s $f12, $f0, $f12 +/* E29D84 802B6914 3C014080 */ lui $at, 0x4080 +/* E29D88 802B6918 44811000 */ mtc1 $at, $f2 +/* E29D8C 802B691C 00000000 */ nop +/* E29D90 802B6920 46020002 */ mul.s $f0, $f0, $f2 +/* E29D94 802B6924 00000000 */ nop +/* E29D98 802B6928 3C01802B */ lui $at, %hi(D_802B6EF4) +/* E29D9C 802B692C C4226EF4 */ lwc1 $f2, %lo(D_802B6EF4)($at) +/* E29DA0 802B6930 46001080 */ add.s $f2, $f2, $f0 +/* E29DA4 802B6934 C6600030 */ lwc1 $f0, 0x30($s3) +/* E29DA8 802B6938 E662002C */ swc1 $f2, 0x2c($s3) +/* E29DAC 802B693C C6620028 */ lwc1 $f2, 0x28($s3) +/* E29DB0 802B6940 C664002C */ lwc1 $f4, 0x2c($s3) +/* E29DB4 802B6944 3C02800B */ lui $v0, %hi(gCameras) +/* E29DB8 802B6948 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* E29DBC 802B694C E4400068 */ swc1 $f0, 0x68($v0) +/* E29DC0 802B6950 E4420060 */ swc1 $f2, 0x60($v0) +/* E29DC4 802B6954 E4440064 */ swc1 $f4, 0x64($v0) +/* E29DC8 802B6958 86620008 */ lh $v0, 8($s3) +/* E29DCC 802B695C 96640008 */ lhu $a0, 8($s3) +/* E29DD0 802B6960 10400016 */ beqz $v0, .L802B69BC +/* E29DD4 802B6964 2482FFFF */ addiu $v0, $a0, -1 +/* E29DD8 802B6968 3C03802B */ lui $v1, %hi(D_802B6EE4) +/* E29DDC 802B696C 24636EE4 */ addiu $v1, $v1, %lo(D_802B6EE4) +/* E29DE0 802B6970 C4600000 */ lwc1 $f0, ($v1) +/* E29DE4 802B6974 3C014000 */ lui $at, 0x4000 +/* E29DE8 802B6978 44811000 */ mtc1 $at, $f2 +/* E29DEC 802B697C 00000000 */ nop +/* E29DF0 802B6980 46020000 */ add.s $f0, $f0, $f2 +/* E29DF4 802B6984 3C014234 */ lui $at, 0x4234 +/* E29DF8 802B6988 44811000 */ mtc1 $at, $f2 +/* E29DFC 802B698C A6620008 */ sh $v0, 8($s3) +/* E29E00 802B6990 4600103E */ c.le.s $f2, $f0 +/* E29E04 802B6994 00000000 */ nop +/* E29E08 802B6998 45000002 */ bc1f .L802B69A4 +/* E29E0C 802B699C E4600000 */ swc1 $f0, ($v1) +/* E29E10 802B69A0 E4620000 */ swc1 $f2, ($v1) +.L802B69A4: +/* E29E14 802B69A4 C66000A8 */ lwc1 $f0, 0xa8($s3) +/* E29E18 802B69A8 C46C0000 */ lwc1 $f12, ($v1) +/* E29E1C 802B69AC 0C00A6C9 */ jal clamp_angle +/* E29E20 802B69B0 460C0300 */ add.s $f12, $f0, $f12 +/* E29E24 802B69B4 080ADB96 */ j .L802B6E58 +/* E29E28 802B69B8 E66000A8 */ swc1 $f0, 0xa8($s3) +.L802B69BC: +/* E29E2C 802B69BC 926200B6 */ lbu $v0, 0xb6($s3) +/* E29E30 802B69C0 2403001E */ addiu $v1, $zero, 0x1e +/* E29E34 802B69C4 A6630008 */ sh $v1, 8($s3) +/* E29E38 802B69C8 24420001 */ addiu $v0, $v0, 1 +/* E29E3C 802B69CC 0C03954C */ jal func_800E5530 +/* E29E40 802B69D0 A26200B6 */ sb $v0, 0xb6($s3) +/* E29E44 802B69D4 080ADB96 */ j .L802B6E58 +/* E29E48 802B69D8 00000000 */ nop +/* E29E4C 802B69DC 3C02802B */ lui $v0, %hi(D_802B6EE4) +/* E29E50 802B69E0 24426EE4 */ addiu $v0, $v0, %lo(D_802B6EE4) +/* E29E54 802B69E4 C4400000 */ lwc1 $f0, ($v0) +/* E29E58 802B69E8 3C014000 */ lui $at, 0x4000 +/* E29E5C 802B69EC 4481B000 */ mtc1 $at, $f22 +/* E29E60 802B69F0 00000000 */ nop +/* E29E64 802B69F4 46160000 */ add.s $f0, $f0, $f22 +/* E29E68 802B69F8 3C014234 */ lui $at, 0x4234 +/* E29E6C 802B69FC 4481A000 */ mtc1 $at, $f20 +/* E29E70 802B6A00 00000000 */ nop +/* E29E74 802B6A04 4600A03E */ c.le.s $f20, $f0 +/* E29E78 802B6A08 00000000 */ nop +/* E29E7C 802B6A0C 45000002 */ bc1f .L802B6A18 +/* E29E80 802B6A10 E4400000 */ swc1 $f0, ($v0) +/* E29E84 802B6A14 E4540000 */ swc1 $f20, ($v0) +.L802B6A18: +/* E29E88 802B6A18 C66000A8 */ lwc1 $f0, 0xa8($s3) +/* E29E8C 802B6A1C C44C0000 */ lwc1 $f12, ($v0) +/* E29E90 802B6A20 0C00A6C9 */ jal clamp_angle +/* E29E94 802B6A24 460C0300 */ add.s $f12, $f0, $f12 +/* E29E98 802B6A28 3C02802B */ lui $v0, %hi(D_802B6EE0) +/* E29E9C 802B6A2C 24426EE0 */ addiu $v0, $v0, %lo(D_802B6EE0) +/* E29EA0 802B6A30 C4420000 */ lwc1 $f2, ($v0) +/* E29EA4 802B6A34 46161080 */ add.s $f2, $f2, $f22 +/* E29EA8 802B6A38 E66000A8 */ swc1 $f0, 0xa8($s3) +/* E29EAC 802B6A3C 4602A03C */ c.lt.s $f20, $f2 +/* E29EB0 802B6A40 00000000 */ nop +/* E29EB4 802B6A44 45000002 */ bc1f .L802B6A50 +/* E29EB8 802B6A48 E4420000 */ swc1 $f2, ($v0) +/* E29EBC 802B6A4C E4540000 */ swc1 $f20, ($v0) +.L802B6A50: +/* E29EC0 802B6A50 C44C0000 */ lwc1 $f12, ($v0) +/* E29EC4 802B6A54 3C0140C9 */ lui $at, 0x40c9 +/* E29EC8 802B6A58 34210FD0 */ ori $at, $at, 0xfd0 +/* E29ECC 802B6A5C 4481A000 */ mtc1 $at, $f20 +/* E29ED0 802B6A60 00000000 */ nop +/* E29ED4 802B6A64 46146302 */ mul.s $f12, $f12, $f20 +/* E29ED8 802B6A68 00000000 */ nop +/* E29EDC 802B6A6C 3C0143B4 */ lui $at, 0x43b4 +/* E29EE0 802B6A70 4481B000 */ mtc1 $at, $f22 +/* E29EE4 802B6A74 0C00A85B */ jal sin_rad +/* E29EE8 802B6A78 46166303 */ div.s $f12, $f12, $f22 +/* E29EEC 802B6A7C 3C10802C */ lui $s0, %hi(D_802BCE34) +/* E29EF0 802B6A80 2610CE34 */ addiu $s0, $s0, %lo(D_802BCE34) +/* E29EF4 802B6A84 3C11802C */ lui $s1, %hi(D_802BCE32) +/* E29EF8 802B6A88 2631CE32 */ addiu $s1, $s1, %lo(D_802BCE32) +/* E29EFC 802B6A8C 3C014080 */ lui $at, 0x4080 +/* E29F00 802B6A90 44811000 */ mtc1 $at, $f2 +/* E29F04 802B6A94 8E660028 */ lw $a2, 0x28($s3) +/* E29F08 802B6A98 8E670030 */ lw $a3, 0x30($s3) +/* E29F0C 802B6A9C 46020182 */ mul.s $f6, $f0, $f2 +/* E29F10 802B6AA0 00000000 */ nop +/* E29F14 802B6AA4 86020000 */ lh $v0, ($s0) +/* E29F18 802B6AA8 86230000 */ lh $v1, ($s1) +/* E29F1C 802B6AAC C660002C */ lwc1 $f0, 0x2c($s3) +/* E29F20 802B6AB0 44826000 */ mtc1 $v0, $f12 +/* E29F24 802B6AB4 00000000 */ nop +/* E29F28 802B6AB8 46806320 */ cvt.s.w $f12, $f12 +/* E29F2C 802B6ABC 46060000 */ add.s $f0, $f0, $f6 +/* E29F30 802B6AC0 C6620028 */ lwc1 $f2, 0x28($s3) +/* E29F34 802B6AC4 44837000 */ mtc1 $v1, $f14 +/* E29F38 802B6AC8 00000000 */ nop +/* E29F3C 802B6ACC 468073A0 */ cvt.s.w $f14, $f14 +/* E29F40 802B6AD0 E660002C */ swc1 $f0, 0x2c($s3) +/* E29F44 802B6AD4 46000106 */ mov.s $f4, $f0 +/* E29F48 802B6AD8 C6600030 */ lwc1 $f0, 0x30($s3) +/* E29F4C 802B6ADC 3C02800B */ lui $v0, %hi(gCameras) +/* E29F50 802B6AE0 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* E29F54 802B6AE4 E4420060 */ swc1 $f2, 0x60($v0) +/* E29F58 802B6AE8 E4440064 */ swc1 $f4, 0x64($v0) +/* E29F5C 802B6AEC 0C00A7B5 */ jal dist2D +/* E29F60 802B6AF0 E4400068 */ swc1 $f0, 0x68($v0) +/* E29F64 802B6AF4 3C014220 */ lui $at, 0x4220 +/* E29F68 802B6AF8 44811000 */ mtc1 $at, $f2 +/* E29F6C 802B6AFC 46000605 */ abs.s $f24, $f0 +/* E29F70 802B6B00 4618103C */ c.lt.s $f2, $f24 +/* E29F74 802B6B04 00000000 */ nop +/* E29F78 802B6B08 45000040 */ bc1f .L802B6C0C +/* E29F7C 802B6B0C 00000000 */ nop +/* E29F80 802B6B10 3C02802C */ lui $v0, %hi(D_802BCE30) +/* E29F84 802B6B14 8442CE30 */ lh $v0, %lo(D_802BCE30)($v0) +/* E29F88 802B6B18 C662002C */ lwc1 $f2, 0x2c($s3) +/* E29F8C 802B6B1C 2442001E */ addiu $v0, $v0, 0x1e +/* E29F90 802B6B20 44820000 */ mtc1 $v0, $f0 +/* E29F94 802B6B24 00000000 */ nop +/* E29F98 802B6B28 46800020 */ cvt.s.w $f0, $f0 +/* E29F9C 802B6B2C 4602003C */ c.lt.s $f0, $f2 +/* E29FA0 802B6B30 00000000 */ nop +/* E29FA4 802B6B34 450000C8 */ bc1f .L802B6E58 +/* E29FA8 802B6B38 00000000 */ nop +/* E29FAC 802B6B3C C66C0028 */ lwc1 $f12, 0x28($s3) +/* E29FB0 802B6B40 86020000 */ lh $v0, ($s0) +/* E29FB4 802B6B44 C66E0030 */ lwc1 $f14, 0x30($s3) +/* E29FB8 802B6B48 86230000 */ lh $v1, ($s1) +/* E29FBC 802B6B4C 44825000 */ mtc1 $v0, $f10 +/* E29FC0 802B6B50 00000000 */ nop +/* E29FC4 802B6B54 468052A0 */ cvt.s.w $f10, $f10 +/* E29FC8 802B6B58 44065000 */ mfc1 $a2, $f10 +/* E29FCC 802B6B5C 44835000 */ mtc1 $v1, $f10 +/* E29FD0 802B6B60 00000000 */ nop +/* E29FD4 802B6B64 468052A0 */ cvt.s.w $f10, $f10 +/* E29FD8 802B6B68 926200B6 */ lbu $v0, 0xb6($s3) +/* E29FDC 802B6B6C 44075000 */ mfc1 $a3, $f10 +/* E29FE0 802B6B70 24420001 */ addiu $v0, $v0, 1 +/* E29FE4 802B6B74 0C00A720 */ jal atan2 +/* E29FE8 802B6B78 A26200B6 */ sb $v0, 0xb6($s3) +/* E29FEC 802B6B7C 46140302 */ mul.s $f12, $f0, $f20 +/* E29FF0 802B6B80 00000000 */ nop +/* E29FF4 802B6B84 27A50010 */ addiu $a1, $sp, 0x10 +/* E29FF8 802B6B88 27A60014 */ addiu $a2, $sp, 0x14 +/* E29FFC 802B6B8C E7A00018 */ swc1 $f0, 0x18($sp) +/* E2A000 802B6B90 0C00A82D */ jal sin_cos_rad +/* E2A004 802B6B94 46166303 */ div.s $f12, $f12, $f22 +/* E2A008 802B6B98 C7A20010 */ lwc1 $f2, 0x10($sp) +/* E2A00C 802B6B9C 46181082 */ mul.s $f2, $f2, $f24 +/* E2A010 802B6BA0 00000000 */ nop +/* E2A014 802B6BA4 3C013F90 */ lui $at, 0x3f90 +/* E2A018 802B6BA8 44812800 */ mtc1 $at, $f5 +/* E2A01C 802B6BAC 44802000 */ mtc1 $zero, $f4 +/* E2A020 802B6BB0 460010A1 */ cvt.d.s $f2, $f2 +/* E2A024 802B6BB4 46241082 */ mul.d $f2, $f2, $f4 +/* E2A028 802B6BB8 00000000 */ nop +/* E2A02C 802B6BBC C7A00014 */ lwc1 $f0, 0x14($sp) +/* E2A030 802B6BC0 46000007 */ neg.s $f0, $f0 +/* E2A034 802B6BC4 46180002 */ mul.s $f0, $f0, $f24 +/* E2A038 802B6BC8 00000000 */ nop +/* E2A03C 802B6BCC 46000021 */ cvt.d.s $f0, $f0 +/* E2A040 802B6BD0 46240002 */ mul.d $f0, $f0, $f4 +/* E2A044 802B6BD4 00000000 */ nop +/* E2A048 802B6BD8 C7A40018 */ lwc1 $f4, 0x18($sp) +/* E2A04C 802B6BDC 24020040 */ addiu $v0, $zero, 0x40 +/* E2A050 802B6BE0 A6620008 */ sh $v0, 8($s3) +/* E2A054 802B6BE4 3C01802B */ lui $at, %hi(D_802B6EEC) +/* E2A058 802B6BE8 E4246EEC */ swc1 $f4, %lo(D_802B6EEC)($at) +/* E2A05C 802B6BEC 462010A0 */ cvt.s.d $f2, $f2 +/* E2A060 802B6BF0 46200020 */ cvt.s.d $f0, $f0 +/* E2A064 802B6BF4 3C01802B */ lui $at, %hi(D_802B6ED4) +/* E2A068 802B6BF8 E4226ED4 */ swc1 $f2, %lo(D_802B6ED4)($at) +/* E2A06C 802B6BFC 3C01802B */ lui $at, %hi(D_802B6ED8) +/* E2A070 802B6C00 E4206ED8 */ swc1 $f0, %lo(D_802B6ED8)($at) +/* E2A074 802B6C04 080ADB96 */ j .L802B6E58 +/* E2A078 802B6C08 00000000 */ nop +.L802B6C0C: +/* E2A07C 802B6C0C 86620008 */ lh $v0, 8($s3) +/* E2A080 802B6C10 96630008 */ lhu $v1, 8($s3) +/* E2A084 802B6C14 1440007A */ bnez $v0, .L802B6E00 +/* E2A088 802B6C18 2462FFFF */ addiu $v0, $v1, -1 +/* E2A08C 802B6C1C 2402000A */ addiu $v0, $zero, 0xa +/* E2A090 802B6C20 A26200B6 */ sb $v0, 0xb6($s3) +/* E2A094 802B6C24 24020014 */ addiu $v0, $zero, 0x14 +/* E2A098 802B6C28 080ADB96 */ j .L802B6E58 +/* E2A09C 802B6C2C A6620008 */ sh $v0, 8($s3) +/* E2A0A0 802B6C30 C66000A8 */ lwc1 $f0, 0xa8($s3) +/* E2A0A4 802B6C34 3C01802B */ lui $at, %hi(D_802B6EE4) +/* E2A0A8 802B6C38 C42C6EE4 */ lwc1 $f12, %lo(D_802B6EE4)($at) +/* E2A0AC 802B6C3C 0C00A6C9 */ jal clamp_angle +/* E2A0B0 802B6C40 460C0300 */ add.s $f12, $f0, $f12 +/* E2A0B4 802B6C44 86620008 */ lh $v0, 8($s3) +/* E2A0B8 802B6C48 96640008 */ lhu $a0, 8($s3) +/* E2A0BC 802B6C4C 1040002A */ beqz $v0, .L802B6CF8 +/* E2A0C0 802B6C50 E66000A8 */ swc1 $f0, 0xa8($s3) +/* E2A0C4 802B6C54 3C03802B */ lui $v1, %hi(D_802B6EE0) +/* E2A0C8 802B6C58 24636EE0 */ addiu $v1, $v1, %lo(D_802B6EE0) +/* E2A0CC 802B6C5C C4600000 */ lwc1 $f0, ($v1) +/* E2A0D0 802B6C60 3C013F80 */ lui $at, 0x3f80 +/* E2A0D4 802B6C64 44811000 */ mtc1 $at, $f2 +/* E2A0D8 802B6C68 46000106 */ mov.s $f4, $f0 +/* E2A0DC 802B6C6C 46020001 */ sub.s $f0, $f0, $f2 +/* E2A0E0 802B6C70 44801000 */ mtc1 $zero, $f2 +/* E2A0E4 802B6C74 2482FFFF */ addiu $v0, $a0, -1 +/* E2A0E8 802B6C78 A6620008 */ sh $v0, 8($s3) +/* E2A0EC 802B6C7C 4602203C */ c.lt.s $f4, $f2 +/* E2A0F0 802B6C80 00000000 */ nop +/* E2A0F4 802B6C84 45000002 */ bc1f .L802B6C90 +/* E2A0F8 802B6C88 E4600000 */ swc1 $f0, ($v1) +/* E2A0FC 802B6C8C E4620000 */ swc1 $f2, ($v1) +.L802B6C90: +/* E2A100 802B6C90 C46C0000 */ lwc1 $f12, ($v1) +/* E2A104 802B6C94 3C0140C9 */ lui $at, 0x40c9 +/* E2A108 802B6C98 34210FD0 */ ori $at, $at, 0xfd0 +/* E2A10C 802B6C9C 44810000 */ mtc1 $at, $f0 +/* E2A110 802B6CA0 00000000 */ nop +/* E2A114 802B6CA4 46006302 */ mul.s $f12, $f12, $f0 +/* E2A118 802B6CA8 00000000 */ nop +/* E2A11C 802B6CAC 3C0143B4 */ lui $at, 0x43b4 +/* E2A120 802B6CB0 44810000 */ mtc1 $at, $f0 +/* E2A124 802B6CB4 0C00A85B */ jal sin_rad +/* E2A128 802B6CB8 46006303 */ div.s $f12, $f12, $f0 +/* E2A12C 802B6CBC 46000180 */ add.s $f6, $f0, $f0 +/* E2A130 802B6CC0 C6640028 */ lwc1 $f4, 0x28($s3) +/* E2A134 802B6CC4 3C01802B */ lui $at, %hi(D_802B6ED4) +/* E2A138 802B6CC8 C4206ED4 */ lwc1 $f0, %lo(D_802B6ED4)($at) +/* E2A13C 802B6CCC C6620030 */ lwc1 $f2, 0x30($s3) +/* E2A140 802B6CD0 46002100 */ add.s $f4, $f4, $f0 +/* E2A144 802B6CD4 3C01802B */ lui $at, %hi(D_802B6ED8) +/* E2A148 802B6CD8 C4206ED8 */ lwc1 $f0, %lo(D_802B6ED8)($at) +/* E2A14C 802B6CDC 46001080 */ add.s $f2, $f2, $f0 +/* E2A150 802B6CE0 C660002C */ lwc1 $f0, 0x2c($s3) +/* E2A154 802B6CE4 46060000 */ add.s $f0, $f0, $f6 +/* E2A158 802B6CE8 E6640028 */ swc1 $f4, 0x28($s3) +/* E2A15C 802B6CEC E6620030 */ swc1 $f2, 0x30($s3) +/* E2A160 802B6CF0 080ADB40 */ j .L802B6D00 +/* E2A164 802B6CF4 E660002C */ swc1 $f0, 0x2c($s3) +.L802B6CF8: +/* E2A168 802B6CF8 2402000B */ addiu $v0, $zero, 0xb +/* E2A16C 802B6CFC A26200B6 */ sb $v0, 0xb6($s3) +.L802B6D00: +/* E2A170 802B6D00 C6600028 */ lwc1 $f0, 0x28($s3) +/* E2A174 802B6D04 C662002C */ lwc1 $f2, 0x2c($s3) +/* E2A178 802B6D08 C6640030 */ lwc1 $f4, 0x30($s3) +/* E2A17C 802B6D0C 3C02800B */ lui $v0, %hi(gCameras) +/* E2A180 802B6D10 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* E2A184 802B6D14 E4400060 */ swc1 $f0, 0x60($v0) +/* E2A188 802B6D18 E4420064 */ swc1 $f2, 0x64($v0) +/* E2A18C 802B6D1C 080ADB96 */ j .L802B6E58 +/* E2A190 802B6D20 E4440068 */ swc1 $f4, 0x68($v0) +/* E2A194 802B6D24 3C02802B */ lui $v0, %hi(D_802B6EE4) +/* E2A198 802B6D28 24426EE4 */ addiu $v0, $v0, %lo(D_802B6EE4) +/* E2A19C 802B6D2C C4400000 */ lwc1 $f0, ($v0) +/* E2A1A0 802B6D30 3C013F80 */ lui $at, 0x3f80 +/* E2A1A4 802B6D34 44811000 */ mtc1 $at, $f2 +/* E2A1A8 802B6D38 00000000 */ nop +/* E2A1AC 802B6D3C 46020000 */ add.s $f0, $f0, $f2 +/* E2A1B0 802B6D40 3C014234 */ lui $at, 0x4234 +/* E2A1B4 802B6D44 4481A000 */ mtc1 $at, $f20 +/* E2A1B8 802B6D48 00000000 */ nop +/* E2A1BC 802B6D4C 4600A03E */ c.le.s $f20, $f0 +/* E2A1C0 802B6D50 00000000 */ nop +/* E2A1C4 802B6D54 45000002 */ bc1f .L802B6D60 +/* E2A1C8 802B6D58 E4400000 */ swc1 $f0, ($v0) +/* E2A1CC 802B6D5C E4540000 */ swc1 $f20, ($v0) +.L802B6D60: +/* E2A1D0 802B6D60 C66000A8 */ lwc1 $f0, 0xa8($s3) +/* E2A1D4 802B6D64 C44C0000 */ lwc1 $f12, ($v0) +/* E2A1D8 802B6D68 0C00A6C9 */ jal clamp_angle +/* E2A1DC 802B6D6C 460C0300 */ add.s $f12, $f0, $f12 +/* E2A1E0 802B6D70 3C02802B */ lui $v0, %hi(D_802B6EE0) +/* E2A1E4 802B6D74 24426EE0 */ addiu $v0, $v0, %lo(D_802B6EE0) +/* E2A1E8 802B6D78 C4420000 */ lwc1 $f2, ($v0) +/* E2A1EC 802B6D7C 3C014000 */ lui $at, 0x4000 +/* E2A1F0 802B6D80 44812000 */ mtc1 $at, $f4 +/* E2A1F4 802B6D84 00000000 */ nop +/* E2A1F8 802B6D88 46041080 */ add.s $f2, $f2, $f4 +/* E2A1FC 802B6D8C E66000A8 */ swc1 $f0, 0xa8($s3) +/* E2A200 802B6D90 4602A03C */ c.lt.s $f20, $f2 +/* E2A204 802B6D94 00000000 */ nop +/* E2A208 802B6D98 45000002 */ bc1f .L802B6DA4 +/* E2A20C 802B6D9C E4420000 */ swc1 $f2, ($v0) +/* E2A210 802B6DA0 E4540000 */ swc1 $f20, ($v0) +.L802B6DA4: +/* E2A214 802B6DA4 C44C0000 */ lwc1 $f12, ($v0) +/* E2A218 802B6DA8 3C0140C9 */ lui $at, 0x40c9 +/* E2A21C 802B6DAC 34210FD0 */ ori $at, $at, 0xfd0 +/* E2A220 802B6DB0 44810000 */ mtc1 $at, $f0 +/* E2A224 802B6DB4 00000000 */ nop +/* E2A228 802B6DB8 46006302 */ mul.s $f12, $f12, $f0 +/* E2A22C 802B6DBC 00000000 */ nop +/* E2A230 802B6DC0 3C0143B4 */ lui $at, 0x43b4 +/* E2A234 802B6DC4 44810000 */ mtc1 $at, $f0 +/* E2A238 802B6DC8 0C00A85B */ jal sin_rad +/* E2A23C 802B6DCC 46006303 */ div.s $f12, $f12, $f0 +/* E2A240 802B6DD0 3C014040 */ lui $at, 0x4040 +/* E2A244 802B6DD4 44811000 */ mtc1 $at, $f2 +/* E2A248 802B6DD8 00000000 */ nop +/* E2A24C 802B6DDC 46020182 */ mul.s $f6, $f0, $f2 +/* E2A250 802B6DE0 00000000 */ nop +/* E2A254 802B6DE4 C660002C */ lwc1 $f0, 0x2c($s3) +/* E2A258 802B6DE8 86620008 */ lh $v0, 8($s3) +/* E2A25C 802B6DEC 46060000 */ add.s $f0, $f0, $f6 +/* E2A260 802B6DF0 96630008 */ lhu $v1, 8($s3) +/* E2A264 802B6DF4 10400004 */ beqz $v0, .L802B6E08 +/* E2A268 802B6DF8 E660002C */ swc1 $f0, 0x2c($s3) +/* E2A26C 802B6DFC 2462FFFF */ addiu $v0, $v1, -1 +.L802B6E00: +/* E2A270 802B6E00 080ADB96 */ j .L802B6E58 +/* E2A274 802B6E04 A6620008 */ sh $v0, 8($s3) +.L802B6E08: +/* E2A278 802B6E08 0C038050 */ jal enable_player_static_collisions +/* E2A27C 802B6E0C 00000000 */ nop +/* E2A280 802B6E10 0C038069 */ jal enable_player_input +/* E2A284 802B6E14 00000000 */ nop +/* E2A288 802B6E18 3C03FFEF */ lui $v1, 0xffef +/* E2A28C 802B6E1C 8E620000 */ lw $v0, ($s3) +/* E2A290 802B6E20 3463FFFF */ ori $v1, $v1, 0xffff +/* E2A294 802B6E24 00431024 */ and $v0, $v0, $v1 +/* E2A298 802B6E28 3C030080 */ lui $v1, 0x80 +/* E2A29C 802B6E2C 00431025 */ or $v0, $v0, $v1 +/* E2A2A0 802B6E30 0C0397F4 */ jal start_falling +/* E2A2A4 802B6E34 AE620000 */ sw $v0, ($s3) +/* E2A2A8 802B6E38 0C03BCCA */ jal enable_partner_ai +/* E2A2AC 802B6E3C 00000000 */ nop +/* E2A2B0 802B6E40 3C04800A */ lui $a0, %hi(D_8009A650) +/* E2A2B4 802B6E44 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) +/* E2A2B8 802B6E48 8C820000 */ lw $v0, ($a0) +/* E2A2BC 802B6E4C 2403FFBF */ addiu $v1, $zero, -0x41 +/* E2A2C0 802B6E50 00431024 */ and $v0, $v0, $v1 +/* E2A2C4 802B6E54 AC820000 */ sw $v0, ($a0) +.L802B6E58: +/* E2A2C8 802B6E58 8FBF003C */ lw $ra, 0x3c($sp) +/* E2A2CC 802B6E5C 8FB40038 */ lw $s4, 0x38($sp) +/* E2A2D0 802B6E60 8FB30034 */ lw $s3, 0x34($sp) +/* E2A2D4 802B6E64 8FB20030 */ lw $s2, 0x30($sp) +/* E2A2D8 802B6E68 8FB1002C */ lw $s1, 0x2c($sp) +/* E2A2DC 802B6E6C 8FB00028 */ lw $s0, 0x28($sp) +/* E2A2E0 802B6E70 D7BC0060 */ ldc1 $f28, 0x60($sp) +/* E2A2E4 802B6E74 D7BA0058 */ ldc1 $f26, 0x58($sp) +/* E2A2E8 802B6E78 D7B80050 */ ldc1 $f24, 0x50($sp) +/* E2A2EC 802B6E7C D7B60048 */ ldc1 $f22, 0x48($sp) +/* E2A2F0 802B6E80 D7B40040 */ ldc1 $f20, 0x40($sp) +/* E2A2F4 802B6E84 03E00008 */ jr $ra +/* E2A2F8 802B6E88 27BD0068 */ addiu $sp, $sp, 0x68 +/* E2A2FC 802B6E8C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s b/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s new file mode 100644 index 0000000000..29e12bc3ef --- /dev/null +++ b/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E2A340 +/* E2A340 802B6000 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E2A344 802B6004 AFB1001C */ sw $s1, 0x1c($sp) +/* E2A348 802B6008 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E2A34C 802B600C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E2A350 802B6010 AFBF0024 */ sw $ra, 0x24($sp) +/* E2A354 802B6014 AFB20020 */ sw $s2, 0x20($sp) +/* E2A358 802B6018 AFB00018 */ sw $s0, 0x18($sp) +/* E2A35C 802B601C F7B40028 */ sdc1 $f20, 0x28($sp) +/* E2A360 802B6020 8E230000 */ lw $v1, ($s1) +/* E2A364 802B6024 3C128011 */ lui $s2, %hi(D_8010C934) +/* E2A368 802B6028 8E52C934 */ lw $s2, %lo(D_8010C934)($s2) +/* E2A36C 802B602C 0461002F */ bgez $v1, .L802B60EC +/* E2A370 802B6030 3C027FFF */ lui $v0, 0x7fff +/* E2A374 802B6034 3442FFFF */ ori $v0, $v0, 0xffff +/* E2A378 802B6038 00621024 */ and $v0, $v1, $v0 +/* E2A37C 802B603C 0C038045 */ jal disable_player_static_collisions +/* E2A380 802B6040 AE220000 */ sw $v0, ($s1) +/* E2A384 802B6044 0C03805E */ jal disable_player_input +/* E2A388 802B6048 00000000 */ nop +/* E2A38C 802B604C 3C030010 */ lui $v1, 0x10 +/* E2A390 802B6050 34630008 */ ori $v1, $v1, 8 +/* E2A394 802B6054 3C040008 */ lui $a0, 8 +/* E2A398 802B6058 8E220000 */ lw $v0, ($s1) +/* E2A39C 802B605C 3484001F */ ori $a0, $a0, 0x1f +/* E2A3A0 802B6060 00431025 */ or $v0, $v0, $v1 +/* E2A3A4 802B6064 0C037FBF */ jal func_800DFEFC +/* E2A3A8 802B6068 AE220000 */ sw $v0, ($s1) +/* E2A3AC 802B606C 3C10802B */ lui $s0, %hi(func_802B6350_E28D80) +/* E2A3B0 802B6070 26106350 */ addiu $s0, $s0, %lo(func_802B6350_E28D80) +/* E2A3B4 802B6074 8E040000 */ lw $a0, ($s0) +/* E2A3B8 802B6078 2405001C */ addiu $a1, $zero, 0x1c +/* E2A3BC 802B607C 0C00A580 */ jal mem_clear +/* E2A3C0 802B6080 A22000B6 */ sb $zero, 0xb6($s1) +/* E2A3C4 802B6084 C62C0028 */ lwc1 $f12, 0x28($s1) +/* E2A3C8 802B6088 C62E0030 */ lwc1 $f14, 0x30($s1) +/* E2A3CC 802B608C 8E460048 */ lw $a2, 0x48($s2) +/* E2A3D0 802B6090 0C00A7B5 */ jal dist2D +/* E2A3D4 802B6094 8E470050 */ lw $a3, 0x50($s2) +/* E2A3D8 802B6098 8E020000 */ lw $v0, ($s0) +/* E2A3DC 802B609C 46000005 */ abs.s $f0, $f0 +/* E2A3E0 802B60A0 E440000C */ swc1 $f0, 0xc($v0) +/* E2A3E4 802B60A4 C64C0048 */ lwc1 $f12, 0x48($s2) +/* E2A3E8 802B60A8 C64E0050 */ lwc1 $f14, 0x50($s2) +/* E2A3EC 802B60AC 8E260028 */ lw $a2, 0x28($s1) +/* E2A3F0 802B60B0 0C00A720 */ jal atan2 +/* E2A3F4 802B60B4 8E270030 */ lw $a3, 0x30($s1) +/* E2A3F8 802B60B8 240402F6 */ addiu $a0, $zero, 0x2f6 +/* E2A3FC 802B60BC 0000282D */ daddu $a1, $zero, $zero +/* E2A400 802B60C0 8E030000 */ lw $v1, ($s0) +/* E2A404 802B60C4 3C0140C0 */ lui $at, 0x40c0 +/* E2A408 802B60C8 44811000 */ mtc1 $at, $f2 +/* E2A40C 802B60CC 3C014248 */ lui $at, 0x4248 +/* E2A410 802B60D0 44812000 */ mtc1 $at, $f4 +/* E2A414 802B60D4 24020078 */ addiu $v0, $zero, 0x78 +/* E2A418 802B60D8 E4600010 */ swc1 $f0, 0x10($v1) +/* E2A41C 802B60DC E4620014 */ swc1 $f2, 0x14($v1) +/* E2A420 802B60E0 E4640018 */ swc1 $f4, 0x18($v1) +/* E2A424 802B60E4 0C052736 */ jal play_sound_at_player +/* E2A428 802B60E8 AC620000 */ sw $v0, ($v1) +.L802B60EC: +/* E2A42C 802B60EC 822300B6 */ lb $v1, 0xb6($s1) +/* E2A430 802B60F0 10600005 */ beqz $v1, .L802B6108 +/* E2A434 802B60F4 24020001 */ addiu $v0, $zero, 1 +/* E2A438 802B60F8 1062007A */ beq $v1, $v0, .L802B62E4 +/* E2A43C 802B60FC 00000000 */ nop +/* E2A440 802B6100 080AD8CB */ j .L802B632C +/* E2A444 802B6104 00000000 */ nop +.L802B6108: +/* E2A448 802B6108 3C10802B */ lui $s0, %hi(func_802B6350_E28D80) +/* E2A44C 802B610C 26106350 */ addiu $s0, $s0, %lo(func_802B6350_E28D80) +/* E2A450 802B6110 8E020000 */ lw $v0, ($s0) +/* E2A454 802B6114 3C0140C9 */ lui $at, 0x40c9 +/* E2A458 802B6118 34210FD0 */ ori $at, $at, 0xfd0 +/* E2A45C 802B611C 44810000 */ mtc1 $at, $f0 +/* E2A460 802B6120 C44C0010 */ lwc1 $f12, 0x10($v0) +/* E2A464 802B6124 46006302 */ mul.s $f12, $f12, $f0 +/* E2A468 802B6128 00000000 */ nop +/* E2A46C 802B612C 27A50010 */ addiu $a1, $sp, 0x10 +/* E2A470 802B6130 3C0143B4 */ lui $at, 0x43b4 +/* E2A474 802B6134 44810000 */ mtc1 $at, $f0 +/* E2A478 802B6138 27A60014 */ addiu $a2, $sp, 0x14 +/* E2A47C 802B613C 0C00A82D */ jal sin_cos_rad +/* E2A480 802B6140 46006303 */ div.s $f12, $f12, $f0 +/* E2A484 802B6144 8E020000 */ lw $v0, ($s0) +/* E2A488 802B6148 C7A20010 */ lwc1 $f2, 0x10($sp) +/* E2A48C 802B614C C440000C */ lwc1 $f0, 0xc($v0) +/* E2A490 802B6150 46001082 */ mul.s $f2, $f2, $f0 +/* E2A494 802B6154 00000000 */ nop +/* E2A498 802B6158 C6400048 */ lwc1 $f0, 0x48($s2) +/* E2A49C 802B615C 46020000 */ add.s $f0, $f0, $f2 +/* E2A4A0 802B6160 E6200028 */ swc1 $f0, 0x28($s1) +/* E2A4A4 802B6164 C7A20014 */ lwc1 $f2, 0x14($sp) +/* E2A4A8 802B6168 C440000C */ lwc1 $f0, 0xc($v0) +/* E2A4AC 802B616C 46001082 */ mul.s $f2, $f2, $f0 +/* E2A4B0 802B6170 00000000 */ nop +/* E2A4B4 802B6174 C6400050 */ lwc1 $f0, 0x50($s2) +/* E2A4B8 802B6178 46020001 */ sub.s $f0, $f0, $f2 +/* E2A4BC 802B617C E6200030 */ swc1 $f0, 0x30($s1) +/* E2A4C0 802B6180 C4400010 */ lwc1 $f0, 0x10($v0) +/* E2A4C4 802B6184 C44C0014 */ lwc1 $f12, 0x14($v0) +/* E2A4C8 802B6188 0C00A6C9 */ jal clamp_angle +/* E2A4CC 802B618C 460C0301 */ sub.s $f12, $f0, $f12 +/* E2A4D0 802B6190 8E100000 */ lw $s0, ($s0) +/* E2A4D4 802B6194 3C0141A0 */ lui $at, 0x41a0 +/* E2A4D8 802B6198 44811000 */ mtc1 $at, $f2 +/* E2A4DC 802B619C C604000C */ lwc1 $f4, 0xc($s0) +/* E2A4E0 802B61A0 4604103C */ c.lt.s $f2, $f4 +/* E2A4E4 802B61A4 00000000 */ nop +/* E2A4E8 802B61A8 45000005 */ bc1f .L802B61C0 +/* E2A4EC 802B61AC E6000010 */ swc1 $f0, 0x10($s0) +/* E2A4F0 802B61B0 3C013F80 */ lui $at, 0x3f80 +/* E2A4F4 802B61B4 44810000 */ mtc1 $at, $f0 +/* E2A4F8 802B61B8 080AD87B */ j .L802B61EC +/* E2A4FC 802B61BC 46002001 */ sub.s $f0, $f4, $f0 +.L802B61C0: +/* E2A500 802B61C0 3C014198 */ lui $at, 0x4198 +/* E2A504 802B61C4 44810000 */ mtc1 $at, $f0 +/* E2A508 802B61C8 00000000 */ nop +/* E2A50C 802B61CC 4600203C */ c.lt.s $f4, $f0 +/* E2A510 802B61D0 00000000 */ nop +/* E2A514 802B61D4 45000006 */ bc1f .L802B61F0 +/* E2A518 802B61D8 00000000 */ nop +/* E2A51C 802B61DC 3C013F80 */ lui $at, 0x3f80 +/* E2A520 802B61E0 44810000 */ mtc1 $at, $f0 +/* E2A524 802B61E4 00000000 */ nop +/* E2A528 802B61E8 46002000 */ add.s $f0, $f4, $f0 +.L802B61EC: +/* E2A52C 802B61EC E600000C */ swc1 $f0, 0xc($s0) +.L802B61F0: +/* E2A530 802B61F0 3C10802B */ lui $s0, %hi(func_802B6350_E28D80) +/* E2A534 802B61F4 26106350 */ addiu $s0, $s0, %lo(func_802B6350_E28D80) +/* E2A538 802B61F8 8E020000 */ lw $v0, ($s0) +/* E2A53C 802B61FC 3C0140C9 */ lui $at, 0x40c9 +/* E2A540 802B6200 34210FD0 */ ori $at, $at, 0xfd0 +/* E2A544 802B6204 44810000 */ mtc1 $at, $f0 +/* E2A548 802B6208 C44C0018 */ lwc1 $f12, 0x18($v0) +/* E2A54C 802B620C 46006302 */ mul.s $f12, $f12, $f0 +/* E2A550 802B6210 00000000 */ nop +/* E2A554 802B6214 3C0143B4 */ lui $at, 0x43b4 +/* E2A558 802B6218 4481A000 */ mtc1 $at, $f20 +/* E2A55C 802B621C 0C00A85B */ jal sin_rad +/* E2A560 802B6220 46146303 */ div.s $f12, $f12, $f20 +/* E2A564 802B6224 8E020000 */ lw $v0, ($s0) +/* E2A568 802B6228 3C014040 */ lui $at, 0x4040 +/* E2A56C 802B622C 44812000 */ mtc1 $at, $f4 +/* E2A570 802B6230 C4420018 */ lwc1 $f2, 0x18($v0) +/* E2A574 802B6234 46041080 */ add.s $f2, $f2, $f4 +/* E2A578 802B6238 3C014316 */ lui $at, 0x4316 +/* E2A57C 802B623C 44813000 */ mtc1 $at, $f6 +/* E2A580 802B6240 00000000 */ nop +/* E2A584 802B6244 4602303C */ c.lt.s $f6, $f2 +/* E2A588 802B6248 E4420018 */ swc1 $f2, 0x18($v0) +/* E2A58C 802B624C 46040082 */ mul.s $f2, $f0, $f4 +/* E2A590 802B6250 00000000 */ nop +/* E2A594 802B6254 45030001 */ bc1tl .L802B625C +/* E2A598 802B6258 E4460018 */ swc1 $f6, 0x18($v0) +.L802B625C: +/* E2A59C 802B625C C620002C */ lwc1 $f0, 0x2c($s1) +/* E2A5A0 802B6260 46020000 */ add.s $f0, $f0, $f2 +/* E2A5A4 802B6264 8E020000 */ lw $v0, ($s0) +/* E2A5A8 802B6268 E620002C */ swc1 $f0, 0x2c($s1) +/* E2A5AC 802B626C C44C0010 */ lwc1 $f12, 0x10($v0) +/* E2A5B0 802B6270 0C00A6C9 */ jal clamp_angle +/* E2A5B4 802B6274 460CA301 */ sub.s $f12, $f20, $f12 +/* E2A5B8 802B6278 8E020000 */ lw $v0, ($s0) +/* E2A5BC 802B627C E62000A8 */ swc1 $f0, 0xa8($s1) +/* E2A5C0 802B6280 C4400014 */ lwc1 $f0, 0x14($v0) +/* E2A5C4 802B6284 3C01802B */ lui $at, %hi(D_802B6360) +/* E2A5C8 802B6288 D4226360 */ ldc1 $f2, %lo(D_802B6360)($at) +/* E2A5CC 802B628C 46000021 */ cvt.d.s $f0, $f0 +/* E2A5D0 802B6290 46220000 */ add.d $f0, $f0, $f2 +/* E2A5D4 802B6294 3C014220 */ lui $at, 0x4220 +/* E2A5D8 802B6298 44811000 */ mtc1 $at, $f2 +/* E2A5DC 802B629C 46200020 */ cvt.s.d $f0, $f0 +/* E2A5E0 802B62A0 4600103C */ c.lt.s $f2, $f0 +/* E2A5E4 802B62A4 00000000 */ nop +/* E2A5E8 802B62A8 45000002 */ bc1f .L802B62B4 +/* E2A5EC 802B62AC E4400014 */ swc1 $f0, 0x14($v0) +/* E2A5F0 802B62B0 E4420014 */ swc1 $f2, 0x14($v0) +.L802B62B4: +/* E2A5F4 802B62B4 8E030000 */ lw $v1, ($s0) +/* E2A5F8 802B62B8 8C620000 */ lw $v0, ($v1) +/* E2A5FC 802B62BC 2442FFFF */ addiu $v0, $v0, -1 +/* E2A600 802B62C0 1440001A */ bnez $v0, .L802B632C +/* E2A604 802B62C4 AC620000 */ sw $v0, ($v1) +/* E2A608 802B62C8 922200B6 */ lbu $v0, 0xb6($s1) +/* E2A60C 802B62CC 0240202D */ daddu $a0, $s2, $zero +/* E2A610 802B62D0 24420001 */ addiu $v0, $v0, 1 +/* E2A614 802B62D4 0C04419E */ jal func_80110678 +/* E2A618 802B62D8 A22200B6 */ sb $v0, 0xb6($s1) +/* E2A61C 802B62DC 080AD8CB */ j .L802B632C +/* E2A620 802B62E0 00000000 */ nop +.L802B62E4: +/* E2A624 802B62E4 0C038039 */ jal disable_player_shadow +/* E2A628 802B62E8 00000000 */ nop +/* E2A62C 802B62EC 3C048011 */ lui $a0, %hi(D_8010C930) +/* E2A630 802B62F0 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) +/* E2A634 802B62F4 0C00EAFF */ jal disable_npc_shadow +/* E2A638 802B62F8 00000000 */ nop +/* E2A63C 802B62FC 24020032 */ addiu $v0, $zero, 0x32 +/* E2A640 802B6300 0C038050 */ jal enable_player_static_collisions +/* E2A644 802B6304 A6220010 */ sh $v0, 0x10($s1) +/* E2A648 802B6308 0C038069 */ jal enable_player_input +/* E2A64C 802B630C 00000000 */ nop +/* E2A650 802B6310 3C03FFEF */ lui $v1, 0xffef +/* E2A654 802B6314 3463FFF7 */ ori $v1, $v1, 0xfff7 +/* E2A658 802B6318 8E220000 */ lw $v0, ($s1) +/* E2A65C 802B631C 0000202D */ daddu $a0, $zero, $zero +/* E2A660 802B6320 00431024 */ and $v0, $v0, $v1 +/* E2A664 802B6324 0C039769 */ jal set_action_state +/* E2A668 802B6328 AE220000 */ sw $v0, ($s1) +.L802B632C: +/* E2A66C 802B632C 8FBF0024 */ lw $ra, 0x24($sp) +/* E2A670 802B6330 8FB20020 */ lw $s2, 0x20($sp) +/* E2A674 802B6334 8FB1001C */ lw $s1, 0x1c($sp) +/* E2A678 802B6338 8FB00018 */ lw $s0, 0x18($sp) +/* E2A67C 802B633C D7B40028 */ ldc1 $f20, 0x28($sp) +/* E2A680 802B6340 03E00008 */ jr $ra +/* E2A684 802B6344 27BD0030 */ addiu $sp, $sp, 0x30 +/* E2A688 802B6348 00000000 */ nop +/* E2A68C 802B634C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s b/asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s new file mode 100644 index 0000000000..8fae980efd --- /dev/null +++ b/asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6000_E2A6B0 +/* E2A6B0 802B6000 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E2A6B4 802B6004 AFB00010 */ sw $s0, 0x10($sp) +/* E2A6B8 802B6008 0000802D */ daddu $s0, $zero, $zero +/* E2A6BC 802B600C AFB10014 */ sw $s1, 0x14($sp) +/* E2A6C0 802B6010 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E2A6C4 802B6014 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E2A6C8 802B6018 AFB20018 */ sw $s2, 0x18($sp) +/* E2A6CC 802B601C AFBF001C */ sw $ra, 0x1c($sp) +/* E2A6D0 802B6020 F7B40020 */ sdc1 $f20, 0x20($sp) +/* E2A6D4 802B6024 8222000D */ lb $v0, 0xd($s1) +/* E2A6D8 802B6028 10400035 */ beqz $v0, .L802B6100 +/* E2A6DC 802B602C 0220902D */ daddu $s2, $s1, $zero +/* E2A6E0 802B6030 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* E2A6E4 802B6034 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) +/* E2A6E8 802B6038 9083007E */ lbu $v1, 0x7e($a0) +/* E2A6EC 802B603C 30620008 */ andi $v0, $v1, 8 +/* E2A6F0 802B6040 10400003 */ beqz $v0, .L802B6050 +/* E2A6F4 802B6044 306200F7 */ andi $v0, $v1, 0xf7 +/* E2A6F8 802B6048 080AD840 */ j .L802B6100 +/* E2A6FC 802B604C A082007E */ sb $v0, 0x7e($a0) +.L802B6050: +/* E2A700 802B6050 C62C0028 */ lwc1 $f12, 0x28($s1) +/* E2A704 802B6054 C62E002C */ lwc1 $f14, 0x2c($s1) +/* E2A708 802B6058 8E260030 */ lw $a2, 0x30($s1) +/* E2A70C 802B605C 0C00F3ED */ jal func_8003CFB4 +/* E2A710 802B6060 3C0742C8 */ lui $a3, 0x42c8 +/* E2A714 802B6064 0040802D */ daddu $s0, $v0, $zero +/* E2A718 802B6068 12000026 */ beqz $s0, .L802B6104 +/* E2A71C 802B606C 0200102D */ daddu $v0, $s0, $zero +/* E2A720 802B6070 C600003C */ lwc1 $f0, 0x3c($s0) +/* E2A724 802B6074 C622002C */ lwc1 $f2, 0x2c($s1) +/* E2A728 802B6078 46020001 */ sub.s $f0, $f0, $f2 +/* E2A72C 802B607C 3C013FF0 */ lui $at, 0x3ff0 +/* E2A730 802B6080 44811800 */ mtc1 $at, $f3 +/* E2A734 802B6084 44801000 */ mtc1 $zero, $f2 +/* E2A738 802B6088 46000021 */ cvt.d.s $f0, $f0 +/* E2A73C 802B608C 46200005 */ abs.d $f0, $f0 +/* E2A740 802B6090 46220001 */ sub.d $f0, $f0, $f2 +/* E2A744 802B6094 44801000 */ mtc1 $zero, $f2 +/* E2A748 802B6098 44801800 */ mtc1 $zero, $f3 +/* E2A74C 802B609C 00000000 */ nop +/* E2A750 802B60A0 4620103C */ c.lt.d $f2, $f0 +/* E2A754 802B60A4 00000000 */ nop +/* E2A758 802B60A8 45030015 */ bc1tl .L802B6100 +/* E2A75C 802B60AC 0000802D */ daddu $s0, $zero, $zero +/* E2A760 802B60B0 C64C0028 */ lwc1 $f12, 0x28($s2) +/* E2A764 802B60B4 C64E0030 */ lwc1 $f14, 0x30($s2) +/* E2A768 802B60B8 8E060038 */ lw $a2, 0x38($s0) +/* E2A76C 802B60BC 0C00A720 */ jal atan2 +/* E2A770 802B60C0 8E070040 */ lw $a3, 0x40($s0) +/* E2A774 802B60C4 0C00A6C9 */ jal clamp_angle +/* E2A778 802B60C8 46000306 */ mov.s $f12, $f0 +/* E2A77C 802B60CC 0C0394D2 */ jal func_800E5348 +/* E2A780 802B60D0 46000506 */ mov.s $f20, $f0 +/* E2A784 802B60D4 4600A501 */ sub.s $f20, $f20, $f0 +/* E2A788 802B60D8 3C01403E */ lui $at, 0x403e +/* E2A78C 802B60DC 44810800 */ mtc1 $at, $f1 +/* E2A790 802B60E0 44800000 */ mtc1 $zero, $f0 +/* E2A794 802B60E4 4600A521 */ cvt.d.s $f20, $f20 +/* E2A798 802B60E8 4620A505 */ abs.d $f20, $f20 +/* E2A79C 802B60EC 4634003C */ c.lt.d $f0, $f20 +/* E2A7A0 802B60F0 00000000 */ nop +/* E2A7A4 802B60F4 45000003 */ bc1f .L802B6104 +/* E2A7A8 802B60F8 0200102D */ daddu $v0, $s0, $zero +/* E2A7AC 802B60FC 0000802D */ daddu $s0, $zero, $zero +.L802B6100: +/* E2A7B0 802B6100 0200102D */ daddu $v0, $s0, $zero +.L802B6104: +/* E2A7B4 802B6104 8FBF001C */ lw $ra, 0x1c($sp) +/* E2A7B8 802B6108 8FB20018 */ lw $s2, 0x18($sp) +/* E2A7BC 802B610C 8FB10014 */ lw $s1, 0x14($sp) +/* E2A7C0 802B6110 8FB00010 */ lw $s0, 0x10($sp) +/* E2A7C4 802B6114 D7B40020 */ ldc1 $f20, 0x20($sp) +/* E2A7C8 802B6118 03E00008 */ jr $ra +/* E2A7CC 802B611C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s b/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s new file mode 100644 index 0000000000..fa4fb790f1 --- /dev/null +++ b/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s @@ -0,0 +1,794 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6120_E2A7D0 +/* E2A7D0 802B6120 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* E2A7D4 802B6124 AFB10024 */ sw $s1, 0x24($sp) +/* E2A7D8 802B6128 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E2A7DC 802B612C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E2A7E0 802B6130 AFB20028 */ sw $s2, 0x28($sp) +/* E2A7E4 802B6134 3C12802B */ lui $s2, %hi(D_802B6E80) +/* E2A7E8 802B6138 26526E80 */ addiu $s2, $s2, %lo(D_802B6E80) +/* E2A7EC 802B613C 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E2A7F0 802B6140 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E2A7F4 802B6144 3C04800B */ lui $a0, %hi(gCameras) +/* E2A7F8 802B6148 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* E2A7FC 802B614C AFBF0030 */ sw $ra, 0x30($sp) +/* E2A800 802B6150 AFB3002C */ sw $s3, 0x2c($sp) +/* E2A804 802B6154 AFB00020 */ sw $s0, 0x20($sp) +/* E2A808 802B6158 F7B80048 */ sdc1 $f24, 0x48($sp) +/* E2A80C 802B615C F7B60040 */ sdc1 $f22, 0x40($sp) +/* E2A810 802B6160 F7B40038 */ sdc1 $f20, 0x38($sp) +/* E2A814 802B6164 00031080 */ sll $v0, $v1, 2 +/* E2A818 802B6168 00431021 */ addu $v0, $v0, $v1 +/* E2A81C 802B616C 00021080 */ sll $v0, $v0, 2 +/* E2A820 802B6170 00431023 */ subu $v0, $v0, $v1 +/* E2A824 802B6174 000218C0 */ sll $v1, $v0, 3 +/* E2A828 802B6178 00431021 */ addu $v0, $v0, $v1 +/* E2A82C 802B617C 000210C0 */ sll $v0, $v0, 3 +/* E2A830 802B6180 8E230000 */ lw $v1, ($s1) +/* E2A834 802B6184 04610043 */ bgez $v1, .L802B6294 +/* E2A838 802B6188 00449821 */ addu $s3, $v0, $a0 +/* E2A83C 802B618C 3C027FFF */ lui $v0, 0x7fff +/* E2A840 802B6190 3442FFFF */ ori $v0, $v0, 0xffff +/* E2A844 802B6194 0240202D */ daddu $a0, $s2, $zero +/* E2A848 802B6198 24050024 */ addiu $a1, $zero, 0x24 +/* E2A84C 802B619C 00621024 */ and $v0, $v1, $v0 +/* E2A850 802B61A0 0C00A580 */ jal mem_clear +/* E2A854 802B61A4 AE220000 */ sw $v0, ($s1) +/* E2A858 802B61A8 0C038045 */ jal disable_player_static_collisions +/* E2A85C 802B61AC 00000000 */ nop +/* E2A860 802B61B0 3C01C000 */ lui $at, 0xc000 +/* E2A864 802B61B4 44812000 */ mtc1 $at, $f4 +/* E2A868 802B61B8 C62200A8 */ lwc1 $f2, 0xa8($s1) +/* E2A86C 802B61BC 3C0142B4 */ lui $at, 0x42b4 +/* E2A870 802B61C0 44810000 */ mtc1 $at, $f0 +/* E2A874 802B61C4 2643001C */ addiu $v1, $s2, 0x1c +/* E2A878 802B61C8 A62000C0 */ sh $zero, 0xc0($s1) +/* E2A87C 802B61CC A62000C2 */ sh $zero, 0xc2($s1) +/* E2A880 802B61D0 AE200054 */ sw $zero, 0x54($s1) +/* E2A884 802B61D4 4602003E */ c.le.s $f0, $f2 +/* E2A888 802B61D8 00000000 */ nop +/* E2A88C 802B61DC 4500000A */ bc1f .L802B6208 +/* E2A890 802B61E0 AE20008C */ sw $zero, 0x8c($s1) +/* E2A894 802B61E4 3C014387 */ lui $at, 0x4387 +/* E2A898 802B61E8 44810000 */ mtc1 $at, $f0 +/* E2A89C 802B61EC 00000000 */ nop +/* E2A8A0 802B61F0 4600103C */ c.lt.s $f2, $f0 +/* E2A8A4 802B61F4 00000000 */ nop +/* E2A8A8 802B61F8 45000003 */ bc1f .L802B6208 +/* E2A8AC 802B61FC 00000000 */ nop +/* E2A8B0 802B6200 3C014000 */ lui $at, 0x4000 +/* E2A8B4 802B6204 44812000 */ mtc1 $at, $f4 +.L802B6208: +/* E2A8B8 802B6208 8E220004 */ lw $v0, 4($s1) +/* E2A8BC 802B620C 30422000 */ andi $v0, $v0, 0x2000 +/* E2A8C0 802B6210 14400009 */ bnez $v0, .L802B6238 +/* E2A8C4 802B6214 E4640000 */ swc1 $f4, ($v1) +/* E2A8C8 802B6218 24020014 */ addiu $v0, $zero, 0x14 +/* E2A8CC 802B621C A6220008 */ sh $v0, 8($s1) +/* E2A8D0 802B6220 2402000F */ addiu $v0, $zero, 0xf +/* E2A8D4 802B6224 A22000B6 */ sb $zero, 0xb6($s1) +/* E2A8D8 802B6228 0C0AD800 */ jal func_802B6000_E2A6B0 +/* E2A8DC 802B622C AE420008 */ sw $v0, 8($s2) +/* E2A8E0 802B6230 080AD8A5 */ j .L802B6294 +/* E2A8E4 802B6234 AE420000 */ sw $v0, ($s2) +.L802B6238: +/* E2A8E8 802B6238 3C048011 */ lui $a0, %hi(D_8010C96C) +/* E2A8EC 802B623C 8C84C96C */ lw $a0, %lo(D_8010C96C)($a0) +/* E2A8F0 802B6240 24020014 */ addiu $v0, $zero, 0x14 +/* E2A8F4 802B6244 A22200B6 */ sb $v0, 0xb6($s1) +/* E2A8F8 802B6248 24020028 */ addiu $v0, $zero, 0x28 +/* E2A8FC 802B624C A6220008 */ sh $v0, 8($s1) +/* E2A900 802B6250 24020001 */ addiu $v0, $zero, 1 +/* E2A904 802B6254 AE420004 */ sw $v0, 4($s2) +/* E2A908 802B6258 2402000C */ addiu $v0, $zero, 0xc +/* E2A90C 802B625C 0C00E2B7 */ jal get_npc_by_index +/* E2A910 802B6260 AE42000C */ sw $v0, 0xc($s2) +/* E2A914 802B6264 0040802D */ daddu $s0, $v0, $zero +/* E2A918 802B6268 240400FD */ addiu $a0, $zero, 0xfd +/* E2A91C 802B626C 0000282D */ daddu $a1, $zero, $zero +/* E2A920 802B6270 8E020000 */ lw $v0, ($s0) +/* E2A924 802B6274 3C030004 */ lui $v1, 4 +/* E2A928 802B6278 00431025 */ or $v0, $v0, $v1 +/* E2A92C 802B627C AE020000 */ sw $v0, ($s0) +/* E2A930 802B6280 8E220000 */ lw $v0, ($s1) +/* E2A934 802B6284 3C030010 */ lui $v1, 0x10 +/* E2A938 802B6288 00431025 */ or $v0, $v0, $v1 +/* E2A93C 802B628C 0C052736 */ jal play_sound_at_player +/* E2A940 802B6290 AE220000 */ sw $v0, ($s1) +.L802B6294: +/* E2A944 802B6294 822300B6 */ lb $v1, 0xb6($s1) +/* E2A948 802B6298 2C620033 */ sltiu $v0, $v1, 0x33 +/* E2A94C 802B629C 104001D4 */ beqz $v0, .L802B69F0 +/* E2A950 802B62A0 00031080 */ sll $v0, $v1, 2 +/* E2A954 802B62A4 3C01802B */ lui $at, %hi(D_802B6D90) +/* E2A958 802B62A8 00220821 */ addu $at, $at, $v0 +/* E2A95C 802B62AC 8C226D90 */ lw $v0, %lo(D_802B6D90)($at) +/* E2A960 802B62B0 00400008 */ jr $v0 +/* E2A964 802B62B4 00000000 */ nop +/* E2A968 802B62B8 C6220090 */ lwc1 $f2, 0x90($s1) +/* E2A96C 802B62BC 44800000 */ mtc1 $zero, $f0 +/* E2A970 802B62C0 00000000 */ nop +/* E2A974 802B62C4 46001032 */ c.eq.s $f2, $f0 +/* E2A978 802B62C8 00000000 */ nop +/* E2A97C 802B62CC 45000015 */ bc1f .L802B6324 +/* E2A980 802B62D0 00000000 */ nop +/* E2A984 802B62D4 0C0399B1 */ jal func_800E66C4 +/* E2A988 802B62D8 00000000 */ nop +/* E2A98C 802B62DC 0441000A */ bgez $v0, .L802B6308 +/* E2A990 802B62E0 3C04000C */ lui $a0, 0xc +/* E2A994 802B62E4 0C037FBF */ jal func_800DFEFC +/* E2A998 802B62E8 34840024 */ ori $a0, $a0, 0x24 +/* E2A99C 802B62EC 24040092 */ addiu $a0, $zero, 0x92 +/* E2A9A0 802B62F0 0C052736 */ jal play_sound_at_player +/* E2A9A4 802B62F4 0000282D */ daddu $a1, $zero, $zero +/* E2A9A8 802B62F8 922200B6 */ lbu $v0, 0xb6($s1) +/* E2A9AC 802B62FC 24420001 */ addiu $v0, $v0, 1 +/* E2A9B0 802B6300 080AD8C9 */ j .L802B6324 +/* E2A9B4 802B6304 A22200B6 */ sb $v0, 0xb6($s1) +.L802B6308: +/* E2A9B8 802B6308 0C037FBF */ jal func_800DFEFC +/* E2A9BC 802B630C 34840027 */ ori $a0, $a0, 0x27 +/* E2A9C0 802B6310 24020032 */ addiu $v0, $zero, 0x32 +/* E2A9C4 802B6314 A22200B6 */ sb $v0, 0xb6($s1) +/* E2A9C8 802B6318 2402000A */ addiu $v0, $zero, 0xa +/* E2A9CC 802B631C A6220008 */ sh $v0, 8($s1) +/* E2A9D0 802B6320 AE400008 */ sw $zero, 8($s2) +.L802B6324: +/* E2A9D4 802B6324 96220008 */ lhu $v0, 8($s1) +/* E2A9D8 802B6328 2442FFFF */ addiu $v0, $v0, -1 +/* E2A9DC 802B632C A6220008 */ sh $v0, 8($s1) +/* E2A9E0 802B6330 00021400 */ sll $v0, $v0, 0x10 +/* E2A9E4 802B6334 144001AE */ bnez $v0, .L802B69F0 +/* E2A9E8 802B6338 3C04000C */ lui $a0, 0xc +/* E2A9EC 802B633C 0C037FBF */ jal func_800DFEFC +/* E2A9F0 802B6340 34840025 */ ori $a0, $a0, 0x25 +/* E2A9F4 802B6344 8E430000 */ lw $v1, ($s2) +/* E2A9F8 802B6348 24020002 */ addiu $v0, $zero, 2 +/* E2A9FC 802B634C 14600004 */ bnez $v1, .L802B6360 +/* E2AA00 802B6350 A22200B6 */ sb $v0, 0xb6($s1) +/* E2AA04 802B6354 24020028 */ addiu $v0, $zero, 0x28 +/* E2AA08 802B6358 080ADA7C */ j .L802B69F0 +/* E2AA0C 802B635C A22200B6 */ sb $v0, 0xb6($s1) +.L802B6360: +/* E2AA10 802B6360 0C009C22 */ jal func_80027088 +/* E2AA14 802B6364 24040002 */ addiu $a0, $zero, 2 +/* E2AA18 802B6368 080ADA7C */ j .L802B69F0 +/* E2AA1C 802B636C 00000000 */ nop +/* E2AA20 802B6370 962200BC */ lhu $v0, 0xbc($s1) +/* E2AA24 802B6374 1040019E */ beqz $v0, .L802B69F0 +/* E2AA28 802B6378 240400FD */ addiu $a0, $zero, 0xfd +/* E2AA2C 802B637C 0000282D */ daddu $a1, $zero, $zero +/* E2AA30 802B6380 2402000C */ addiu $v0, $zero, 0xc +/* E2AA34 802B6384 3C060010 */ lui $a2, 0x10 +/* E2AA38 802B6388 A6220008 */ sh $v0, 8($s1) +/* E2AA3C 802B638C 8E220000 */ lw $v0, ($s1) +/* E2AA40 802B6390 922300B6 */ lbu $v1, 0xb6($s1) +/* E2AA44 802B6394 00461025 */ or $v0, $v0, $a2 +/* E2AA48 802B6398 24630001 */ addiu $v1, $v1, 1 +/* E2AA4C 802B639C AE220000 */ sw $v0, ($s1) +/* E2AA50 802B63A0 0C052736 */ jal play_sound_at_player +/* E2AA54 802B63A4 A22300B6 */ sb $v1, 0xb6($s1) +/* E2AA58 802B63A8 080ADA7C */ j .L802B69F0 +/* E2AA5C 802B63AC 00000000 */ nop +/* E2AA60 802B63B0 96220008 */ lhu $v0, 8($s1) +/* E2AA64 802B63B4 2442FFFF */ addiu $v0, $v0, -1 +/* E2AA68 802B63B8 A6220008 */ sh $v0, 8($s1) +/* E2AA6C 802B63BC 00021400 */ sll $v0, $v0, 0x10 +/* E2AA70 802B63C0 14400116 */ bnez $v0, .L802B681C +/* E2AA74 802B63C4 2402000A */ addiu $v0, $zero, 0xa +/* E2AA78 802B63C8 A6220008 */ sh $v0, 8($s1) +/* E2AA7C 802B63CC 922200B6 */ lbu $v0, 0xb6($s1) +/* E2AA80 802B63D0 2403000A */ addiu $v1, $zero, 0xa +/* E2AA84 802B63D4 080ADA05 */ j .L802B6814 +/* E2AA88 802B63D8 AE43000C */ sw $v1, 0xc($s2) +/* E2AA8C 802B63DC C63400A8 */ lwc1 $f20, 0xa8($s1) +/* E2AA90 802B63E0 0C0ADB3C */ jal func_802B6CF0_E2B3A0 +/* E2AA94 802B63E4 00000000 */ nop +/* E2AA98 802B63E8 C66C006C */ lwc1 $f12, 0x6c($s3) +/* E2AA9C 802B63EC C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E2AAA0 802B63F0 46006301 */ sub.s $f12, $f12, $f0 +/* E2AAA4 802B63F4 3C0142B4 */ lui $at, 0x42b4 +/* E2AAA8 802B63F8 44810000 */ mtc1 $at, $f0 +/* E2AAAC 802B63FC 0C00A6C9 */ jal clamp_angle +/* E2AAB0 802B6400 46006301 */ sub.s $f12, $f12, $f0 +/* E2AAB4 802B6404 86220008 */ lh $v0, 8($s1) +/* E2AAB8 802B6408 96230008 */ lhu $v1, 8($s1) +/* E2AABC 802B640C 144000F7 */ bnez $v0, .L802B67EC +/* E2AAC0 802B6410 E6200080 */ swc1 $f0, 0x80($s1) +/* E2AAC4 802B6414 C642001C */ lwc1 $f2, 0x1c($s2) +/* E2AAC8 802B6418 44800000 */ mtc1 $zero, $f0 +/* E2AACC 802B641C 00000000 */ nop +/* E2AAD0 802B6420 4602003C */ c.lt.s $f0, $f2 +/* E2AAD4 802B6424 00000000 */ nop +/* E2AAD8 802B6428 45000010 */ bc1f .L802B646C +/* E2AADC 802B642C 0000102D */ daddu $v0, $zero, $zero +/* E2AAE0 802B6430 3C014387 */ lui $at, 0x4387 +/* E2AAE4 802B6434 44811000 */ mtc1 $at, $f2 +/* E2AAE8 802B6438 00000000 */ nop +/* E2AAEC 802B643C 4602A03C */ c.lt.s $f20, $f2 +/* E2AAF0 802B6440 00000000 */ nop +/* E2AAF4 802B6444 45000006 */ bc1f .L802B6460 +/* E2AAF8 802B6448 00000000 */ nop +/* E2AAFC 802B644C C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E2AB00 802B6450 4600103E */ c.le.s $f2, $f0 +/* E2AB04 802B6454 00000000 */ nop +/* E2AB08 802B6458 45030001 */ bc1tl .L802B6460 +/* E2AB0C 802B645C 24020001 */ addiu $v0, $zero, 1 +.L802B6460: +/* E2AB10 802B6460 C642001C */ lwc1 $f2, 0x1c($s2) +/* E2AB14 802B6464 44800000 */ mtc1 $zero, $f0 +/* E2AB18 802B6468 00000000 */ nop +.L802B646C: +/* E2AB1C 802B646C 4600103C */ c.lt.s $f2, $f0 +/* E2AB20 802B6470 00000000 */ nop +/* E2AB24 802B6474 4500000D */ bc1f .L802B64AC +/* E2AB28 802B6478 00000000 */ nop +/* E2AB2C 802B647C 3C014387 */ lui $at, 0x4387 +/* E2AB30 802B6480 44811000 */ mtc1 $at, $f2 +/* E2AB34 802B6484 00000000 */ nop +/* E2AB38 802B6488 4614103C */ c.lt.s $f2, $f20 +/* E2AB3C 802B648C 00000000 */ nop +/* E2AB40 802B6490 45000006 */ bc1f .L802B64AC +/* E2AB44 802B6494 00000000 */ nop +/* E2AB48 802B6498 C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E2AB4C 802B649C 4602003E */ c.le.s $f0, $f2 +/* E2AB50 802B64A0 00000000 */ nop +/* E2AB54 802B64A4 45030001 */ bc1tl .L802B64AC +/* E2AB58 802B64A8 24020001 */ addiu $v0, $zero, 1 +.L802B64AC: +/* E2AB5C 802B64AC 10400150 */ beqz $v0, .L802B69F0 +/* E2AB60 802B64B0 24020006 */ addiu $v0, $zero, 6 +/* E2AB64 802B64B4 8224000D */ lb $a0, 0xd($s1) +/* E2AB68 802B64B8 A22200B6 */ sb $v0, 0xb6($s1) +/* E2AB6C 802B64BC 24020002 */ addiu $v0, $zero, 2 +/* E2AB70 802B64C0 0C03995F */ jal make_disguise_npc +/* E2AB74 802B64C4 A6220008 */ sh $v0, 8($s1) +/* E2AB78 802B64C8 10400149 */ beqz $v0, .L802B69F0 +/* E2AB7C 802B64CC 24020005 */ addiu $v0, $zero, 5 +/* E2AB80 802B64D0 0C039940 */ jal func_800E6500 +/* E2AB84 802B64D4 A22200B6 */ sb $v0, 0xb6($s1) +/* E2AB88 802B64D8 080ADA7C */ j .L802B69F0 +/* E2AB8C 802B64DC 00000000 */ nop +/* E2AB90 802B64E0 8E220004 */ lw $v0, 4($s1) +/* E2AB94 802B64E4 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* E2AB98 802B64E8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* E2AB9C 802B64EC 34422000 */ ori $v0, $v0, 0x2000 +/* E2ABA0 802B64F0 AE220004 */ sw $v0, 4($s1) +/* E2ABA4 802B64F4 9062007E */ lbu $v0, 0x7e($v1) +/* E2ABA8 802B64F8 34420002 */ ori $v0, $v0, 2 +/* E2ABAC 802B64FC A062007E */ sb $v0, 0x7e($v1) +/* E2ABB0 802B6500 922200B6 */ lbu $v0, 0xb6($s1) +/* E2ABB4 802B6504 24420001 */ addiu $v0, $v0, 1 +/* E2ABB8 802B6508 080AD9FE */ j .L802B67F8 +/* E2ABBC 802B650C A22200B6 */ sb $v0, 0xb6($s1) +/* E2ABC0 802B6510 C640001C */ lwc1 $f0, 0x1c($s2) +/* E2ABC4 802B6514 44802000 */ mtc1 $zero, $f4 +/* E2ABC8 802B6518 00000000 */ nop +/* E2ABCC 802B651C 4600203C */ c.lt.s $f4, $f0 +/* E2ABD0 802B6520 00000000 */ nop +/* E2ABD4 802B6524 4500001B */ bc1f .L802B6594 +/* E2ABD8 802B6528 00000000 */ nop +/* E2ABDC 802B652C C6400020 */ lwc1 $f0, 0x20($s2) +/* E2ABE0 802B6530 3C01802B */ lui $at, %hi(D_802B6E60) +/* E2ABE4 802B6534 D4226E60 */ ldc1 $f2, %lo(D_802B6E60)($at) +/* E2ABE8 802B6538 46000021 */ cvt.d.s $f0, $f0 +/* E2ABEC 802B653C 46220001 */ sub.d $f0, $f0, $f2 +/* E2ABF0 802B6540 46200020 */ cvt.s.d $f0, $f0 +/* E2ABF4 802B6544 4604003E */ c.le.s $f0, $f4 +/* E2ABF8 802B6548 00000000 */ nop +/* E2ABFC 802B654C 450000F9 */ bc1f .L802B6934 +/* E2AC00 802B6550 E6400020 */ swc1 $f0, 0x20($s2) +/* E2AC04 802B6554 3C048011 */ lui $a0, %hi(D_8010C96C) +/* E2AC08 802B6558 8C84C96C */ lw $a0, %lo(D_8010C96C)($a0) +/* E2AC0C 802B655C 2402000A */ addiu $v0, $zero, 0xa +/* E2AC10 802B6560 E6440020 */ swc1 $f4, 0x20($s2) +/* E2AC14 802B6564 A6220008 */ sh $v0, 8($s1) +/* E2AC18 802B6568 922200B6 */ lbu $v0, 0xb6($s1) +/* E2AC1C 802B656C 3C014334 */ lui $at, 0x4334 +/* E2AC20 802B6570 44810000 */ mtc1 $at, $f0 +/* E2AC24 802B6574 24420001 */ addiu $v0, $v0, 1 +/* E2AC28 802B6578 A22200B6 */ sb $v0, 0xb6($s1) +/* E2AC2C 802B657C 0C00E2B7 */ jal get_npc_by_index +/* E2AC30 802B6580 E62000A8 */ swc1 $f0, 0xa8($s1) +/* E2AC34 802B6584 0040802D */ daddu $s0, $v0, $zero +/* E2AC38 802B6588 24020001 */ addiu $v0, $zero, 1 +/* E2AC3C 802B658C 080AD97B */ j .L802B65EC +/* E2AC40 802B6590 A6020088 */ sh $v0, 0x88($s0) +.L802B6594: +/* E2AC44 802B6594 C6400020 */ lwc1 $f0, 0x20($s2) +/* E2AC48 802B6598 3C01802B */ lui $at, %hi(D_802B6E68) +/* E2AC4C 802B659C D4226E68 */ ldc1 $f2, %lo(D_802B6E68)($at) +/* E2AC50 802B65A0 46000021 */ cvt.d.s $f0, $f0 +/* E2AC54 802B65A4 46220000 */ add.d $f0, $f0, $f2 +/* E2AC58 802B65A8 46200020 */ cvt.s.d $f0, $f0 +/* E2AC5C 802B65AC 4600203E */ c.le.s $f4, $f0 +/* E2AC60 802B65B0 00000000 */ nop +/* E2AC64 802B65B4 450000DF */ bc1f .L802B6934 +/* E2AC68 802B65B8 E6400020 */ swc1 $f0, 0x20($s2) +/* E2AC6C 802B65BC 3C048011 */ lui $a0, %hi(D_8010C96C) +/* E2AC70 802B65C0 8C84C96C */ lw $a0, %lo(D_8010C96C)($a0) +/* E2AC74 802B65C4 E6440020 */ swc1 $f4, 0x20($s2) +/* E2AC78 802B65C8 922300B6 */ lbu $v1, 0xb6($s1) +/* E2AC7C 802B65CC 2402000A */ addiu $v0, $zero, 0xa +/* E2AC80 802B65D0 A6220008 */ sh $v0, 8($s1) +/* E2AC84 802B65D4 E62400A8 */ swc1 $f4, 0xa8($s1) +/* E2AC88 802B65D8 24630001 */ addiu $v1, $v1, 1 +/* E2AC8C 802B65DC 0C00E2B7 */ jal get_npc_by_index +/* E2AC90 802B65E0 A22300B6 */ sb $v1, 0xb6($s1) +/* E2AC94 802B65E4 0040802D */ daddu $s0, $v0, $zero +/* E2AC98 802B65E8 A6000088 */ sh $zero, 0x88($s0) +.L802B65EC: +/* E2AC9C 802B65EC C66C006C */ lwc1 $f12, 0x6c($s3) +/* E2ACA0 802B65F0 C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E2ACA4 802B65F4 46006301 */ sub.s $f12, $f12, $f0 +/* E2ACA8 802B65F8 3C0142B4 */ lui $at, 0x42b4 +/* E2ACAC 802B65FC 44810000 */ mtc1 $at, $f0 +/* E2ACB0 802B6600 0C00A6C9 */ jal clamp_angle +/* E2ACB4 802B6604 46006301 */ sub.s $f12, $f12, $f0 +/* E2ACB8 802B6608 4600018D */ trunc.w.s $f6, $f0 +/* E2ACBC 802B660C 44023000 */ mfc1 $v0, $f6 +/* E2ACC0 802B6610 E600000C */ swc1 $f0, 0xc($s0) +/* E2ACC4 802B6614 080ADA4D */ j .L802B6934 +/* E2ACC8 802B6618 A602008A */ sh $v0, 0x8a($s0) +/* E2ACCC 802B661C 96220008 */ lhu $v0, 8($s1) +/* E2ACD0 802B6620 2442FFFF */ addiu $v0, $v0, -1 +/* E2ACD4 802B6624 A6220008 */ sh $v0, 8($s1) +/* E2ACD8 802B6628 00021400 */ sll $v0, $v0, 0x10 +/* E2ACDC 802B662C 144000F0 */ bnez $v0, .L802B69F0 +/* E2ACE0 802B6630 00000000 */ nop +/* E2ACE4 802B6634 0C009C22 */ jal func_80027088 +/* E2ACE8 802B6638 0000202D */ daddu $a0, $zero, $zero +/* E2ACEC 802B663C 3C048011 */ lui $a0, %hi(D_8010C96C) +/* E2ACF0 802B6640 8C84C96C */ lw $a0, %lo(D_8010C96C)($a0) +/* E2ACF4 802B6644 0C00E2B7 */ jal get_npc_by_index +/* E2ACF8 802B6648 00000000 */ nop +/* E2ACFC 802B664C 0040802D */ daddu $s0, $v0, $zero +/* E2AD00 802B6650 3C03FFFB */ lui $v1, 0xfffb +/* E2AD04 802B6654 3463FFFF */ ori $v1, $v1, 0xffff +/* E2AD08 802B6658 3C05FFEF */ lui $a1, 0xffef +/* E2AD0C 802B665C 8E020000 */ lw $v0, ($s0) +/* E2AD10 802B6660 34A5FFFF */ ori $a1, $a1, 0xffff +/* E2AD14 802B6664 00431024 */ and $v0, $v0, $v1 +/* E2AD18 802B6668 AE020000 */ sw $v0, ($s0) +/* E2AD1C 802B666C 8E220000 */ lw $v0, ($s1) +/* E2AD20 802B6670 0000202D */ daddu $a0, $zero, $zero +/* E2AD24 802B6674 00451024 */ and $v0, $v0, $a1 +/* E2AD28 802B6678 080ADA78 */ j .L802B69E0 +/* E2AD2C 802B667C AE220000 */ sw $v0, ($s1) +/* E2AD30 802B6680 96220008 */ lhu $v0, 8($s1) +/* E2AD34 802B6684 2442FFFF */ addiu $v0, $v0, -1 +/* E2AD38 802B6688 A6220008 */ sh $v0, 8($s1) +/* E2AD3C 802B668C 00021400 */ sll $v0, $v0, 0x10 +/* E2AD40 802B6690 14400004 */ bnez $v0, .L802B66A4 +/* E2AD44 802B6694 00000000 */ nop +/* E2AD48 802B6698 922200B6 */ lbu $v0, 0xb6($s1) +/* E2AD4C 802B669C 24420001 */ addiu $v0, $v0, 1 +/* E2AD50 802B66A0 A22200B6 */ sb $v0, 0xb6($s1) +.L802B66A4: +/* E2AD54 802B66A4 0C0ADB3C */ jal func_802B6CF0_E2B3A0 +/* E2AD58 802B66A8 00000000 */ nop +/* E2AD5C 802B66AC C66C006C */ lwc1 $f12, 0x6c($s3) +/* E2AD60 802B66B0 C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E2AD64 802B66B4 080ADA54 */ j .L802B6950 +/* E2AD68 802B66B8 46006301 */ sub.s $f12, $f12, $f0 +/* E2AD6C 802B66BC C63400A8 */ lwc1 $f20, 0xa8($s1) +/* E2AD70 802B66C0 0C0ADB3C */ jal func_802B6CF0_E2B3A0 +/* E2AD74 802B66C4 00000000 */ nop +/* E2AD78 802B66C8 C66C006C */ lwc1 $f12, 0x6c($s3) +/* E2AD7C 802B66CC C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E2AD80 802B66D0 46006301 */ sub.s $f12, $f12, $f0 +/* E2AD84 802B66D4 3C0142B4 */ lui $at, 0x42b4 +/* E2AD88 802B66D8 44810000 */ mtc1 $at, $f0 +/* E2AD8C 802B66DC 0C00A6C9 */ jal clamp_angle +/* E2AD90 802B66E0 46006301 */ sub.s $f12, $f12, $f0 +/* E2AD94 802B66E4 86220008 */ lh $v0, 8($s1) +/* E2AD98 802B66E8 96230008 */ lhu $v1, 8($s1) +/* E2AD9C 802B66EC 1440003F */ bnez $v0, .L802B67EC +/* E2ADA0 802B66F0 E6200080 */ swc1 $f0, 0x80($s1) +/* E2ADA4 802B66F4 C642001C */ lwc1 $f2, 0x1c($s2) +/* E2ADA8 802B66F8 44800000 */ mtc1 $zero, $f0 +/* E2ADAC 802B66FC 00000000 */ nop +/* E2ADB0 802B6700 4602003C */ c.lt.s $f0, $f2 +/* E2ADB4 802B6704 00000000 */ nop +/* E2ADB8 802B6708 45000010 */ bc1f .L802B674C +/* E2ADBC 802B670C 0000102D */ daddu $v0, $zero, $zero +/* E2ADC0 802B6710 3C014387 */ lui $at, 0x4387 +/* E2ADC4 802B6714 44811000 */ mtc1 $at, $f2 +/* E2ADC8 802B6718 00000000 */ nop +/* E2ADCC 802B671C 4602A03C */ c.lt.s $f20, $f2 +/* E2ADD0 802B6720 00000000 */ nop +/* E2ADD4 802B6724 45000006 */ bc1f .L802B6740 +/* E2ADD8 802B6728 00000000 */ nop +/* E2ADDC 802B672C C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E2ADE0 802B6730 4600103E */ c.le.s $f2, $f0 +/* E2ADE4 802B6734 00000000 */ nop +/* E2ADE8 802B6738 45030001 */ bc1tl .L802B6740 +/* E2ADEC 802B673C 24020001 */ addiu $v0, $zero, 1 +.L802B6740: +/* E2ADF0 802B6740 C642001C */ lwc1 $f2, 0x1c($s2) +/* E2ADF4 802B6744 44800000 */ mtc1 $zero, $f0 +/* E2ADF8 802B6748 00000000 */ nop +.L802B674C: +/* E2ADFC 802B674C 4600103C */ c.lt.s $f2, $f0 +/* E2AE00 802B6750 00000000 */ nop +/* E2AE04 802B6754 4500000D */ bc1f .L802B678C +/* E2AE08 802B6758 00000000 */ nop +/* E2AE0C 802B675C 3C014387 */ lui $at, 0x4387 +/* E2AE10 802B6760 44811000 */ mtc1 $at, $f2 +/* E2AE14 802B6764 00000000 */ nop +/* E2AE18 802B6768 4614103C */ c.lt.s $f2, $f20 +/* E2AE1C 802B676C 00000000 */ nop +/* E2AE20 802B6770 45000006 */ bc1f .L802B678C +/* E2AE24 802B6774 00000000 */ nop +/* E2AE28 802B6778 C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E2AE2C 802B677C 4602003E */ c.le.s $f0, $f2 +/* E2AE30 802B6780 00000000 */ nop +/* E2AE34 802B6784 45030001 */ bc1tl .L802B678C +/* E2AE38 802B6788 24020001 */ addiu $v0, $zero, 1 +.L802B678C: +/* E2AE3C 802B678C 10400098 */ beqz $v0, .L802B69F0 +/* E2AE40 802B6790 24030002 */ addiu $v1, $zero, 2 +/* E2AE44 802B6794 922200B6 */ lbu $v0, 0xb6($s1) +/* E2AE48 802B6798 A6230008 */ sh $v1, 8($s1) +/* E2AE4C 802B679C 2403DFFF */ addiu $v1, $zero, -0x2001 +/* E2AE50 802B67A0 24420001 */ addiu $v0, $v0, 1 +/* E2AE54 802B67A4 A22200B6 */ sb $v0, 0xb6($s1) +/* E2AE58 802B67A8 8E220004 */ lw $v0, 4($s1) +/* E2AE5C 802B67AC 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* E2AE60 802B67B0 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) +/* E2AE64 802B67B4 00431024 */ and $v0, $v0, $v1 +/* E2AE68 802B67B8 AE220004 */ sw $v0, 4($s1) +/* E2AE6C 802B67BC 9082007E */ lbu $v0, 0x7e($a0) +/* E2AE70 802B67C0 304200FD */ andi $v0, $v0, 0xfd +/* E2AE74 802B67C4 A082007E */ sb $v0, 0x7e($a0) +/* E2AE78 802B67C8 3C048011 */ lui $a0, %hi(D_8010C96C) +/* E2AE7C 802B67CC 8C84C96C */ lw $a0, %lo(D_8010C96C)($a0) +/* E2AE80 802B67D0 0C00E228 */ jal free_npc_by_index +/* E2AE84 802B67D4 A220000C */ sb $zero, 0xc($s1) +/* E2AE88 802B67D8 24020037 */ addiu $v0, $zero, 0x37 +/* E2AE8C 802B67DC A62200B0 */ sh $v0, 0xb0($s1) +/* E2AE90 802B67E0 24020026 */ addiu $v0, $zero, 0x26 +/* E2AE94 802B67E4 080ADA7C */ j .L802B69F0 +/* E2AE98 802B67E8 A62200B2 */ sh $v0, 0xb2($s1) +.L802B67EC: +/* E2AE9C 802B67EC 2462FFFF */ addiu $v0, $v1, -1 +/* E2AEA0 802B67F0 080ADA7C */ j .L802B69F0 +/* E2AEA4 802B67F4 A6220008 */ sh $v0, 8($s1) +.L802B67F8: +/* E2AEA8 802B67F8 96220008 */ lhu $v0, 8($s1) +/* E2AEAC 802B67FC 2442FFFF */ addiu $v0, $v0, -1 +/* E2AEB0 802B6800 A6220008 */ sh $v0, 8($s1) +/* E2AEB4 802B6804 00021400 */ sll $v0, $v0, 0x10 +/* E2AEB8 802B6808 14400004 */ bnez $v0, .L802B681C +/* E2AEBC 802B680C 00000000 */ nop +/* E2AEC0 802B6810 922200B6 */ lbu $v0, 0xb6($s1) +.L802B6814: +/* E2AEC4 802B6814 24420001 */ addiu $v0, $v0, 1 +/* E2AEC8 802B6818 A22200B6 */ sb $v0, 0xb6($s1) +.L802B681C: +/* E2AECC 802B681C 0C0ADB3C */ jal func_802B6CF0_E2B3A0 +/* E2AED0 802B6820 00000000 */ nop +/* E2AED4 802B6824 080ADA7C */ j .L802B69F0 +/* E2AED8 802B6828 00000000 */ nop +/* E2AEDC 802B682C C640001C */ lwc1 $f0, 0x1c($s2) +/* E2AEE0 802B6830 44802000 */ mtc1 $zero, $f4 +/* E2AEE4 802B6834 00000000 */ nop +/* E2AEE8 802B6838 4600203C */ c.lt.s $f4, $f0 +/* E2AEEC 802B683C 00000000 */ nop +/* E2AEF0 802B6840 4500001D */ bc1f .L802B68B8 +/* E2AEF4 802B6844 00000000 */ nop +/* E2AEF8 802B6848 C6400020 */ lwc1 $f0, 0x20($s2) +/* E2AEFC 802B684C 3C01802B */ lui $at, %hi(D_802B6E70) +/* E2AF00 802B6850 D4226E70 */ ldc1 $f2, %lo(D_802B6E70)($at) +/* E2AF04 802B6854 46000021 */ cvt.d.s $f0, $f0 +/* E2AF08 802B6858 46220001 */ sub.d $f0, $f0, $f2 +/* E2AF0C 802B685C 46200020 */ cvt.s.d $f0, $f0 +/* E2AF10 802B6860 4604003E */ c.le.s $f0, $f4 +/* E2AF14 802B6864 00000000 */ nop +/* E2AF18 802B6868 45000032 */ bc1f .L802B6934 +/* E2AF1C 802B686C E6400020 */ swc1 $f0, 0x20($s2) +/* E2AF20 802B6870 2402000A */ addiu $v0, $zero, 0xa +/* E2AF24 802B6874 E6440020 */ swc1 $f4, 0x20($s2) +/* E2AF28 802B6878 A6220008 */ sh $v0, 8($s1) +/* E2AF2C 802B687C 922200B6 */ lbu $v0, 0xb6($s1) +/* E2AF30 802B6880 3C014334 */ lui $at, 0x4334 +/* E2AF34 802B6884 44810000 */ mtc1 $at, $f0 +/* E2AF38 802B6888 24420001 */ addiu $v0, $v0, 1 +/* E2AF3C 802B688C A22200B6 */ sb $v0, 0xb6($s1) +/* E2AF40 802B6890 E62000A8 */ swc1 $f0, 0xa8($s1) +/* E2AF44 802B6894 C66C006C */ lwc1 $f12, 0x6c($s3) +/* E2AF48 802B6898 46006301 */ sub.s $f12, $f12, $f0 +/* E2AF4C 802B689C 3C0142B4 */ lui $at, 0x42b4 +/* E2AF50 802B68A0 44810000 */ mtc1 $at, $f0 +/* E2AF54 802B68A4 24020001 */ addiu $v0, $zero, 1 +/* E2AF58 802B68A8 3C018011 */ lui $at, %hi(D_8010C95C) +/* E2AF5C 802B68AC AC22C95C */ sw $v0, %lo(D_8010C95C)($at) +/* E2AF60 802B68B0 080ADA47 */ j .L802B691C +/* E2AF64 802B68B4 46006301 */ sub.s $f12, $f12, $f0 +.L802B68B8: +/* E2AF68 802B68B8 C6400020 */ lwc1 $f0, 0x20($s2) +/* E2AF6C 802B68BC 3C01802B */ lui $at, %hi(D_802B6E78) +/* E2AF70 802B68C0 D4226E78 */ ldc1 $f2, %lo(D_802B6E78)($at) +/* E2AF74 802B68C4 46000021 */ cvt.d.s $f0, $f0 +/* E2AF78 802B68C8 46220000 */ add.d $f0, $f0, $f2 +/* E2AF7C 802B68CC 46200020 */ cvt.s.d $f0, $f0 +/* E2AF80 802B68D0 4600203E */ c.le.s $f4, $f0 +/* E2AF84 802B68D4 00000000 */ nop +/* E2AF88 802B68D8 45000016 */ bc1f .L802B6934 +/* E2AF8C 802B68DC E6400020 */ swc1 $f0, 0x20($s2) +/* E2AF90 802B68E0 E6440020 */ swc1 $f4, 0x20($s2) +/* E2AF94 802B68E4 922300B6 */ lbu $v1, 0xb6($s1) +/* E2AF98 802B68E8 2402000A */ addiu $v0, $zero, 0xa +/* E2AF9C 802B68EC A6220008 */ sh $v0, 8($s1) +/* E2AFA0 802B68F0 E62400A8 */ swc1 $f4, 0xa8($s1) +/* E2AFA4 802B68F4 24630001 */ addiu $v1, $v1, 1 +/* E2AFA8 802B68F8 A22300B6 */ sb $v1, 0xb6($s1) +/* E2AFAC 802B68FC C66C006C */ lwc1 $f12, 0x6c($s3) +/* E2AFB0 802B6900 46046301 */ sub.s $f12, $f12, $f4 +/* E2AFB4 802B6904 3C0142B4 */ lui $at, 0x42b4 +/* E2AFB8 802B6908 44810000 */ mtc1 $at, $f0 +/* E2AFBC 802B690C 00000000 */ nop +/* E2AFC0 802B6910 46006301 */ sub.s $f12, $f12, $f0 +/* E2AFC4 802B6914 3C018011 */ lui $at, %hi(D_8010C95C) +/* E2AFC8 802B6918 AC20C95C */ sw $zero, %lo(D_8010C95C)($at) +.L802B691C: +/* E2AFCC 802B691C 0C00A6C9 */ jal clamp_angle +/* E2AFD0 802B6920 00000000 */ nop +/* E2AFD4 802B6924 4600018D */ trunc.w.s $f6, $f0 +/* E2AFD8 802B6928 3C01800F */ lui $at, %hi(D_800F7B40) +/* E2AFDC 802B692C E4267B40 */ swc1 $f6, %lo(D_800F7B40)($at) +/* E2AFE0 802B6930 E6200084 */ swc1 $f0, 0x84($s1) +.L802B6934: +/* E2AFE4 802B6934 C62000A8 */ lwc1 $f0, 0xa8($s1) +/* E2AFE8 802B6938 C64C0020 */ lwc1 $f12, 0x20($s2) +/* E2AFEC 802B693C 0C00A6C9 */ jal clamp_angle +/* E2AFF0 802B6940 460C0300 */ add.s $f12, $f0, $f12 +/* E2AFF4 802B6944 E62000A8 */ swc1 $f0, 0xa8($s1) +/* E2AFF8 802B6948 C66C006C */ lwc1 $f12, 0x6c($s3) +/* E2AFFC 802B694C 46006301 */ sub.s $f12, $f12, $f0 +.L802B6950: +/* E2B000 802B6950 3C0142B4 */ lui $at, 0x42b4 +/* E2B004 802B6954 44810000 */ mtc1 $at, $f0 +/* E2B008 802B6958 0C00A6C9 */ jal clamp_angle +/* E2B00C 802B695C 46006301 */ sub.s $f12, $f12, $f0 +/* E2B010 802B6960 080ADA7C */ j .L802B69F0 +/* E2B014 802B6964 E6200080 */ swc1 $f0, 0x80($s1) +/* E2B018 802B6968 96220008 */ lhu $v0, 8($s1) +/* E2B01C 802B696C 2442FFFF */ addiu $v0, $v0, -1 +/* E2B020 802B6970 A6220008 */ sh $v0, 8($s1) +/* E2B024 802B6974 00021400 */ sll $v0, $v0, 0x10 +/* E2B028 802B6978 1440001D */ bnez $v0, .L802B69F0 +/* E2B02C 802B697C 00000000 */ nop +/* E2B030 802B6980 0C009C22 */ jal func_80027088 +/* E2B034 802B6984 0000202D */ daddu $a0, $zero, $zero +/* E2B038 802B6988 3C03FFEF */ lui $v1, 0xffef +/* E2B03C 802B698C 3463FFFF */ ori $v1, $v1, 0xffff +/* E2B040 802B6990 8E220000 */ lw $v0, ($s1) +/* E2B044 802B6994 0000202D */ daddu $a0, $zero, $zero +/* E2B048 802B6998 00431024 */ and $v0, $v0, $v1 +/* E2B04C 802B699C 080ADA78 */ j .L802B69E0 +/* E2B050 802B69A0 AE220000 */ sw $v0, ($s1) +/* E2B054 802B69A4 0C0398E9 */ jal func_800E63A4 +/* E2B058 802B69A8 0000202D */ daddu $a0, $zero, $zero +/* E2B05C 802B69AC 080ADA7A */ j .L802B69E8 +/* E2B060 802B69B0 00000000 */ nop +/* E2B064 802B69B4 962200BC */ lhu $v0, 0xbc($s1) +/* E2B068 802B69B8 1040000D */ beqz $v0, .L802B69F0 +/* E2B06C 802B69BC 0000202D */ daddu $a0, $zero, $zero +/* E2B070 802B69C0 080ADA78 */ j .L802B69E0 +/* E2B074 802B69C4 00000000 */ nop +/* E2B078 802B69C8 96220008 */ lhu $v0, 8($s1) +/* E2B07C 802B69CC 2442FFFF */ addiu $v0, $v0, -1 +/* E2B080 802B69D0 A6220008 */ sh $v0, 8($s1) +/* E2B084 802B69D4 00021400 */ sll $v0, $v0, 0x10 +/* E2B088 802B69D8 14400005 */ bnez $v0, .L802B69F0 +/* E2B08C 802B69DC 0000202D */ daddu $a0, $zero, $zero +.L802B69E0: +/* E2B090 802B69E0 0C039769 */ jal set_action_state +/* E2B094 802B69E4 00000000 */ nop +.L802B69E8: +/* E2B098 802B69E8 0C038050 */ jal enable_player_static_collisions +/* E2B09C 802B69EC 00000000 */ nop +.L802B69F0: +/* E2B0A0 802B69F0 8E430008 */ lw $v1, 8($s2) +/* E2B0A4 802B69F4 18600084 */ blez $v1, .L802B6C08 +/* E2B0A8 802B69F8 2402000A */ addiu $v0, $zero, 0xa +/* E2B0AC 802B69FC 2463FFFF */ addiu $v1, $v1, -1 +/* E2B0B0 802B6A00 14620042 */ bne $v1, $v0, .L802B6B0C +/* E2B0B4 802B6A04 AE430008 */ sw $v1, 8($s2) +/* E2B0B8 802B6A08 C62200A8 */ lwc1 $f2, 0xa8($s1) +/* E2B0BC 802B6A0C 3C0142B4 */ lui $at, 0x42b4 +/* E2B0C0 802B6A10 44810000 */ mtc1 $at, $f0 +/* E2B0C4 802B6A14 00000000 */ nop +/* E2B0C8 802B6A18 4602003E */ c.le.s $f0, $f2 +/* E2B0CC 802B6A1C 00000000 */ nop +/* E2B0D0 802B6A20 45000016 */ bc1f .L802B6A7C +/* E2B0D4 802B6A24 00000000 */ nop +/* E2B0D8 802B6A28 3C014387 */ lui $at, 0x4387 +/* E2B0DC 802B6A2C 44812000 */ mtc1 $at, $f4 +/* E2B0E0 802B6A30 00000000 */ nop +/* E2B0E4 802B6A34 4604103C */ c.lt.s $f2, $f4 +/* E2B0E8 802B6A38 00000000 */ nop +/* E2B0EC 802B6A3C 4500000F */ bc1f .L802B6A7C +/* E2B0F0 802B6A40 00000000 */ nop +/* E2B0F4 802B6A44 C660006C */ lwc1 $f0, 0x6c($s3) +/* E2B0F8 802B6A48 46040001 */ sub.s $f0, $f0, $f4 +/* E2B0FC 802B6A4C 3C0140C9 */ lui $at, 0x40c9 +/* E2B100 802B6A50 34210FD0 */ ori $at, $at, 0xfd0 +/* E2B104 802B6A54 44811000 */ mtc1 $at, $f2 +/* E2B108 802B6A58 00000000 */ nop +/* E2B10C 802B6A5C 46020002 */ mul.s $f0, $f0, $f2 +/* E2B110 802B6A60 00000000 */ nop +/* E2B114 802B6A64 3C0143B4 */ lui $at, 0x43b4 +/* E2B118 802B6A68 44811000 */ mtc1 $at, $f2 +/* E2B11C 802B6A6C 3C014238 */ lui $at, 0x4238 +/* E2B120 802B6A70 4481B000 */ mtc1 $at, $f22 +/* E2B124 802B6A74 080ADAAF */ j .L802B6ABC +/* E2B128 802B6A78 46020503 */ div.s $f20, $f0, $f2 +.L802B6A7C: +/* E2B12C 802B6A7C C662006C */ lwc1 $f2, 0x6c($s3) +/* E2B130 802B6A80 3C0142B4 */ lui $at, 0x42b4 +/* E2B134 802B6A84 44810000 */ mtc1 $at, $f0 +/* E2B138 802B6A88 00000000 */ nop +/* E2B13C 802B6A8C 46001081 */ sub.s $f2, $f2, $f0 +/* E2B140 802B6A90 3C0140C9 */ lui $at, 0x40c9 +/* E2B144 802B6A94 34210FD0 */ ori $at, $at, 0xfd0 +/* E2B148 802B6A98 44810000 */ mtc1 $at, $f0 +/* E2B14C 802B6A9C 00000000 */ nop +/* E2B150 802B6AA0 46001082 */ mul.s $f2, $f2, $f0 +/* E2B154 802B6AA4 00000000 */ nop +/* E2B158 802B6AA8 3C0143B4 */ lui $at, 0x43b4 +/* E2B15C 802B6AAC 44810000 */ mtc1 $at, $f0 +/* E2B160 802B6AB0 3C0141F0 */ lui $at, 0x41f0 +/* E2B164 802B6AB4 4481B000 */ mtc1 $at, $f22 +/* E2B168 802B6AB8 46001503 */ div.s $f20, $f2, $f0 +.L802B6ABC: +/* E2B16C 802B6ABC 0C00A85B */ jal sin_rad +/* E2B170 802B6AC0 4600A306 */ mov.s $f12, $f20 +/* E2B174 802B6AC4 4600B002 */ mul.s $f0, $f22, $f0 +/* E2B178 802B6AC8 00000000 */ nop +/* E2B17C 802B6ACC C6220028 */ lwc1 $f2, 0x28($s1) +/* E2B180 802B6AD0 46001080 */ add.s $f2, $f2, $f0 +/* E2B184 802B6AD4 4600A306 */ mov.s $f12, $f20 +/* E2B188 802B6AD8 0C00A874 */ jal cos_rad +/* E2B18C 802B6ADC E6420010 */ swc1 $f2, 0x10($s2) +/* E2B190 802B6AE0 4600B002 */ mul.s $f0, $f22, $f0 +/* E2B194 802B6AE4 00000000 */ nop +/* E2B198 802B6AE8 C624002C */ lwc1 $f4, 0x2c($s1) +/* E2B19C 802B6AEC 3C0141A0 */ lui $at, 0x41a0 +/* E2B1A0 802B6AF0 44811000 */ mtc1 $at, $f2 +/* E2B1A4 802B6AF4 00000000 */ nop +/* E2B1A8 802B6AF8 46022101 */ sub.s $f4, $f4, $f2 +/* E2B1AC 802B6AFC C6220030 */ lwc1 $f2, 0x30($s1) +/* E2B1B0 802B6B00 46001081 */ sub.s $f2, $f2, $f0 +/* E2B1B4 802B6B04 E6440014 */ swc1 $f4, 0x14($s2) +/* E2B1B8 802B6B08 E6420018 */ swc1 $f2, 0x18($s2) +.L802B6B0C: +/* E2B1BC 802B6B0C 8E430008 */ lw $v1, 8($s2) +/* E2B1C0 802B6B10 2862000B */ slti $v0, $v1, 0xb +/* E2B1C4 802B6B14 10400050 */ beqz $v0, .L802B6C58 +/* E2B1C8 802B6B18 30620001 */ andi $v0, $v1, 1 +/* E2B1CC 802B6B1C 1040004E */ beqz $v0, .L802B6C58 +/* E2B1D0 802B6B20 00000000 */ nop +/* E2B1D4 802B6B24 C6420010 */ lwc1 $f2, 0x10($s2) +/* E2B1D8 802B6B28 3C014100 */ lui $at, 0x4100 +/* E2B1DC 802B6B2C 44810000 */ mtc1 $at, $f0 +/* E2B1E0 802B6B30 00000000 */ nop +/* E2B1E4 802B6B34 46001081 */ sub.s $f2, $f2, $f0 +/* E2B1E8 802B6B38 3C014248 */ lui $at, 0x4248 +/* E2B1EC 802B6B3C 44810000 */ mtc1 $at, $f0 +/* E2B1F0 802B6B40 44051000 */ mfc1 $a1, $f2 +/* E2B1F4 802B6B44 C6420014 */ lwc1 $f2, 0x14($s2) +/* E2B1F8 802B6B48 46001080 */ add.s $f2, $f2, $f0 +/* E2B1FC 802B6B4C 8E470018 */ lw $a3, 0x18($s2) +/* E2B200 802B6B50 3C014000 */ lui $at, 0x4000 +/* E2B204 802B6B54 44810000 */ mtc1 $at, $f0 +/* E2B208 802B6B58 44061000 */ mfc1 $a2, $f2 +/* E2B20C 802B6B5C 24040003 */ addiu $a0, $zero, 3 +/* E2B210 802B6B60 0C01BFBC */ jal func_8006FEF0 +/* E2B214 802B6B64 E7A00010 */ swc1 $f0, 0x10($sp) +/* E2B218 802B6B68 C660006C */ lwc1 $f0, 0x6c($s3) +/* E2B21C 802B6B6C C62200A8 */ lwc1 $f2, 0xa8($s1) +/* E2B220 802B6B70 46020000 */ add.s $f0, $f0, $f2 +/* E2B224 802B6B74 3C0142B4 */ lui $at, 0x42b4 +/* E2B228 802B6B78 44811000 */ mtc1 $at, $f2 +/* E2B22C 802B6B7C 00000000 */ nop +/* E2B230 802B6B80 46020001 */ sub.s $f0, $f0, $f2 +/* E2B234 802B6B84 3C0140C9 */ lui $at, 0x40c9 +/* E2B238 802B6B88 34210FD0 */ ori $at, $at, 0xfd0 +/* E2B23C 802B6B8C 44811000 */ mtc1 $at, $f2 +/* E2B240 802B6B90 00000000 */ nop +/* E2B244 802B6B94 46020002 */ mul.s $f0, $f0, $f2 +/* E2B248 802B6B98 00000000 */ nop +/* E2B24C 802B6B9C C6560010 */ lwc1 $f22, 0x10($s2) +/* E2B250 802B6BA0 3C0143B4 */ lui $at, 0x43b4 +/* E2B254 802B6BA4 44811000 */ mtc1 $at, $f2 +/* E2B258 802B6BA8 4600B5A1 */ cvt.d.s $f22, $f22 +/* E2B25C 802B6BAC 46020503 */ div.s $f20, $f0, $f2 +/* E2B260 802B6BB0 0C00A85B */ jal sin_rad +/* E2B264 802B6BB4 4600A306 */ mov.s $f12, $f20 +/* E2B268 802B6BB8 3C014024 */ lui $at, 0x4024 +/* E2B26C 802B6BBC 4481C800 */ mtc1 $at, $f25 +/* E2B270 802B6BC0 4480C000 */ mtc1 $zero, $f24 +/* E2B274 802B6BC4 46000021 */ cvt.d.s $f0, $f0 +/* E2B278 802B6BC8 46380002 */ mul.d $f0, $f0, $f24 +/* E2B27C 802B6BCC 00000000 */ nop +/* E2B280 802B6BD0 4600A306 */ mov.s $f12, $f20 +/* E2B284 802B6BD4 C6540018 */ lwc1 $f20, 0x18($s2) +/* E2B288 802B6BD8 4620B580 */ add.d $f22, $f22, $f0 +/* E2B28C 802B6BDC 4600A521 */ cvt.d.s $f20, $f20 +/* E2B290 802B6BE0 4620B5A0 */ cvt.s.d $f22, $f22 +/* E2B294 802B6BE4 0C00A874 */ jal cos_rad +/* E2B298 802B6BE8 E6560010 */ swc1 $f22, 0x10($s2) +/* E2B29C 802B6BEC 46000021 */ cvt.d.s $f0, $f0 +/* E2B2A0 802B6BF0 46380002 */ mul.d $f0, $f0, $f24 +/* E2B2A4 802B6BF4 00000000 */ nop +/* E2B2A8 802B6BF8 4620A501 */ sub.d $f20, $f20, $f0 +/* E2B2AC 802B6BFC 4620A520 */ cvt.s.d $f20, $f20 +/* E2B2B0 802B6C00 080ADB16 */ j .L802B6C58 +/* E2B2B4 802B6C04 E6540018 */ swc1 $f20, 0x18($s2) +.L802B6C08: +/* E2B2B8 802B6C08 14600013 */ bnez $v1, .L802B6C58 +/* E2B2BC 802B6C0C 2402FFFF */ addiu $v0, $zero, -1 +/* E2B2C0 802B6C10 8E430000 */ lw $v1, ($s2) +/* E2B2C4 802B6C14 10600010 */ beqz $v1, .L802B6C58 +/* E2B2C8 802B6C18 AE420008 */ sw $v0, 8($s2) +/* E2B2CC 802B6C1C 3C013F80 */ lui $at, 0x3f80 +/* E2B2D0 802B6C20 44810000 */ mtc1 $at, $f0 +/* E2B2D4 802B6C24 0060102D */ daddu $v0, $v1, $zero +/* E2B2D8 802B6C28 E7A00010 */ swc1 $f0, 0x10($sp) +/* E2B2DC 802B6C2C 8442008A */ lh $v0, 0x8a($v0) +/* E2B2E0 802B6C30 44820000 */ mtc1 $v0, $f0 +/* E2B2E4 802B6C34 00000000 */ nop +/* E2B2E8 802B6C38 46800020 */ cvt.s.w $f0, $f0 +/* E2B2EC 802B6C3C E7A00014 */ swc1 $f0, 0x14($sp) +/* E2B2F0 802B6C40 8C650038 */ lw $a1, 0x38($v1) +/* E2B2F4 802B6C44 8C66003C */ lw $a2, 0x3c($v1) +/* E2B2F8 802B6C48 8224000D */ lb $a0, 0xd($s1) +/* E2B2FC 802B6C4C 8C670040 */ lw $a3, 0x40($v1) +/* E2B300 802B6C50 0C01CA84 */ jal func_80072A10 +/* E2B304 802B6C54 2484FFFF */ addiu $a0, $a0, -1 +.L802B6C58: +/* E2B308 802B6C58 8E43000C */ lw $v1, 0xc($s2) +/* E2B30C 802B6C5C 1060001A */ beqz $v1, .L802B6CC8 +/* E2B310 802B6C60 2862000B */ slti $v0, $v1, 0xb +/* E2B314 802B6C64 10400015 */ beqz $v0, .L802B6CBC +/* E2B318 802B6C68 2402000A */ addiu $v0, $zero, 0xa +/* E2B31C 802B6C6C 14620003 */ bne $v1, $v0, .L802B6C7C +/* E2B320 802B6C70 240400FE */ addiu $a0, $zero, 0xfe +/* E2B324 802B6C74 0C052736 */ jal play_sound_at_player +/* E2B328 802B6C78 0000282D */ daddu $a1, $zero, $zero +.L802B6C7C: +/* E2B32C 802B6C7C 8E42000C */ lw $v0, 0xc($s2) +/* E2B330 802B6C80 30420003 */ andi $v0, $v0, 3 +/* E2B334 802B6C84 1440000D */ bnez $v0, .L802B6CBC +/* E2B338 802B6C88 24040004 */ addiu $a0, $zero, 4 +/* E2B33C 802B6C8C 8E250028 */ lw $a1, 0x28($s1) +/* E2B340 802B6C90 8E26002C */ lw $a2, 0x2c($s1) +/* E2B344 802B6C94 8E270030 */ lw $a3, 0x30($s1) +/* E2B348 802B6C98 3C014248 */ lui $at, 0x4248 +/* E2B34C 802B6C9C 44810000 */ mtc1 $at, $f0 +/* E2B350 802B6CA0 24020028 */ addiu $v0, $zero, 0x28 +/* E2B354 802B6CA4 AFA20018 */ sw $v0, 0x18($sp) +/* E2B358 802B6CA8 2402001E */ addiu $v0, $zero, 0x1e +/* E2B35C 802B6CAC AFA2001C */ sw $v0, 0x1c($sp) +/* E2B360 802B6CB0 E7A00010 */ swc1 $f0, 0x10($sp) +/* E2B364 802B6CB4 0C01C154 */ jal func_80070550 +/* E2B368 802B6CB8 E7A00014 */ swc1 $f0, 0x14($sp) +.L802B6CBC: +/* E2B36C 802B6CBC 8E42000C */ lw $v0, 0xc($s2) +/* E2B370 802B6CC0 2442FFFF */ addiu $v0, $v0, -1 +/* E2B374 802B6CC4 AE42000C */ sw $v0, 0xc($s2) +.L802B6CC8: +/* E2B378 802B6CC8 8FBF0030 */ lw $ra, 0x30($sp) +/* E2B37C 802B6CCC 8FB3002C */ lw $s3, 0x2c($sp) +/* E2B380 802B6CD0 8FB20028 */ lw $s2, 0x28($sp) +/* E2B384 802B6CD4 8FB10024 */ lw $s1, 0x24($sp) +/* E2B388 802B6CD8 8FB00020 */ lw $s0, 0x20($sp) +/* E2B38C 802B6CDC D7B80048 */ ldc1 $f24, 0x48($sp) +/* E2B390 802B6CE0 D7B60040 */ ldc1 $f22, 0x40($sp) +/* E2B394 802B6CE4 D7B40038 */ ldc1 $f20, 0x38($sp) +/* E2B398 802B6CE8 03E00008 */ jr $ra +/* E2B39C 802B6CEC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_E2A6B0/func_802B6CF0_E2B3A0.s b/asm/nonmatchings/code_E2A6B0/func_802B6CF0_E2B3A0.s new file mode 100644 index 0000000000..76821114c2 --- /dev/null +++ b/asm/nonmatchings/code_E2A6B0/func_802B6CF0_E2B3A0.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B6CF0_E2B3A0 +/* E2B3A0 802B6CF0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2B3A4 802B6CF4 3C02802B */ lui $v0, %hi(D_802B6E80) +/* E2B3A8 802B6CF8 24426E80 */ addiu $v0, $v0, %lo(D_802B6E80) +/* E2B3AC 802B6CFC AFBF0014 */ sw $ra, 0x14($sp) +/* E2B3B0 802B6D00 AFB00010 */ sw $s0, 0x10($sp) +/* E2B3B4 802B6D04 C4420020 */ lwc1 $f2, 0x20($v0) +/* E2B3B8 802B6D08 C440001C */ lwc1 $f0, 0x1c($v0) +/* E2B3BC 802B6D0C 46001080 */ add.s $f2, $f2, $f0 +/* E2B3C0 802B6D10 3C014248 */ lui $at, 0x4248 +/* E2B3C4 802B6D14 44810000 */ mtc1 $at, $f0 +/* E2B3C8 802B6D18 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E2B3CC 802B6D1C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E2B3D0 802B6D20 4602003C */ c.lt.s $f0, $f2 +/* E2B3D4 802B6D24 00000000 */ nop +/* E2B3D8 802B6D28 45010008 */ bc1t .L802B6D4C +/* E2B3DC 802B6D2C E4420020 */ swc1 $f2, 0x20($v0) +/* E2B3E0 802B6D30 3C01C248 */ lui $at, 0xc248 +/* E2B3E4 802B6D34 44810000 */ mtc1 $at, $f0 +/* E2B3E8 802B6D38 00000000 */ nop +/* E2B3EC 802B6D3C 4600103C */ c.lt.s $f2, $f0 +/* E2B3F0 802B6D40 00000000 */ nop +/* E2B3F4 802B6D44 45000002 */ bc1f .L802B6D50 +/* E2B3F8 802B6D48 00000000 */ nop +.L802B6D4C: +/* E2B3FC 802B6D4C E4400020 */ swc1 $f0, 0x20($v0) +.L802B6D50: +/* E2B400 802B6D50 C60000A8 */ lwc1 $f0, 0xa8($s0) +/* E2B404 802B6D54 C44C0020 */ lwc1 $f12, 0x20($v0) +/* E2B408 802B6D58 0C00A6C9 */ jal clamp_angle +/* E2B40C 802B6D5C 460C0300 */ add.s $f12, $f0, $f12 +/* E2B410 802B6D60 E60000A8 */ swc1 $f0, 0xa8($s0) +/* E2B414 802B6D64 8FBF0014 */ lw $ra, 0x14($sp) +/* E2B418 802B6D68 8FB00010 */ lw $s0, 0x10($sp) +/* E2B41C 802B6D6C 03E00008 */ jr $ra diff --git a/src/code_E23260.c b/src/code_E23260.c new file mode 100644 index 0000000000..f73f6f8773 --- /dev/null +++ b/src/code_E23260.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E23260", func_802B6000_E23260); + +INCLUDE_ASM(s32, "code_E23260", func_802B61E4_E23444); diff --git a/src/code_E236E0.c b/src/code_E236E0.c new file mode 100644 index 0000000000..7b8b46b0e7 --- /dev/null +++ b/src/code_E236E0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E236E0", func_802B6000_E236E0); + +INCLUDE_ASM(s32, "code_E236E0", func_802B6288_E23968); + +INCLUDE_ASM(s32, "code_E236E0", func_802B6550_E23C30); + +INCLUDE_ASM(s32, "code_E236E0", func_802B65E8_E23CC8); + +INCLUDE_ASM(s32, "code_E236E0", func_802B6738_E23E18); diff --git a/src/code_E24040.c b/src/code_E24040.c new file mode 100644 index 0000000000..36982a43b1 --- /dev/null +++ b/src/code_E24040.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E24040", func_802B6000_E24040); + +INCLUDE_ASM(s32, "code_E24040", func_802B60B4_E240F4); + +INCLUDE_ASM(s32, "code_E24040", func_802B6198_E241D8); + +INCLUDE_ASM(s32, "code_E24040", func_802B6294_E242D4); + +INCLUDE_ASM(s32, "code_E24040", func_802B6348_E24388); + +INCLUDE_ASM(s32, "code_E24040", func_802B647C_E244BC); + +INCLUDE_ASM(s32, "code_E24040", func_802B6508_E24548); diff --git a/src/code_E245D0.c b/src/code_E245D0.c new file mode 100644 index 0000000000..72f6978331 --- /dev/null +++ b/src/code_E245D0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E245D0", func_802B6000_E245D0); + +INCLUDE_ASM(s32, "code_E245D0", func_802B6198_E24768); + +INCLUDE_ASM(s32, "code_E245D0", func_802B6230_E24800); diff --git a/src/code_E24920.c b/src/code_E24920.c new file mode 100644 index 0000000000..c1611d4764 --- /dev/null +++ b/src/code_E24920.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E24920", func_802B6000_E24920); + +INCLUDE_ASM(s32, "code_E24920", func_802B61C0_E24AE0); + +INCLUDE_ASM(s32, "code_E24920", func_802B62CC_E24BEC); + +INCLUDE_ASM(s32, "code_E24920", func_802B644C_E24D6C); diff --git a/src/code_E24ED0.c b/src/code_E24ED0.c new file mode 100644 index 0000000000..20d36f762e --- /dev/null +++ b/src/code_E24ED0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E24ED0", func_802B6000_E24ED0); + +INCLUDE_ASM(s32, "code_E24ED0", func_802B6048_E24F18); + +INCLUDE_ASM(s32, "code_E24ED0", func_802B62A4_E25174); + +INCLUDE_ASM(s32, "code_E24ED0", func_802B66A8_E25578); + +INCLUDE_ASM(s32, "code_E24ED0", func_802B6820_E256F0); diff --git a/src/code_E25D60.c b/src/code_E25D60.c new file mode 100644 index 0000000000..5364031790 --- /dev/null +++ b/src/code_E25D60.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E25D60", func_802B6000_E25D60); diff --git a/src/code_E26710.c b/src/code_E26710.c new file mode 100644 index 0000000000..88547a5805 --- /dev/null +++ b/src/code_E26710.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E26710", func_802B6000_E26710); + +INCLUDE_ASM(s32, "code_E26710", func_802B65F8_E26D08); diff --git a/src/code_E26DE0.c b/src/code_E26DE0.c new file mode 100644 index 0000000000..186172ddec --- /dev/null +++ b/src/code_E26DE0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E26DE0", func_802B6000_E26DE0); + +INCLUDE_ASM(s32, "code_E26DE0", func_802B6648_E27428); diff --git a/src/code_E27510.c b/src/code_E27510.c new file mode 100644 index 0000000000..db12654acf --- /dev/null +++ b/src/code_E27510.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E27510", func_802B6000_E27510); + +INCLUDE_ASM(s32, "code_E27510", func_802B6060_E27570); diff --git a/src/code_E27C90.c b/src/code_E27C90.c new file mode 100644 index 0000000000..49f30c94db --- /dev/null +++ b/src/code_E27C90.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E27C90", func_802B6000_E27C90); diff --git a/src/code_E27F40.c b/src/code_E27F40.c new file mode 100644 index 0000000000..29fb3ab96d --- /dev/null +++ b/src/code_E27F40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E27F40", func_802B6000_E27F40); diff --git a/src/code_E287F0.c b/src/code_E287F0.c new file mode 100644 index 0000000000..c0e2f1916c --- /dev/null +++ b/src/code_E287F0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E287F0", func_802B6000_E287F0); diff --git a/src/code_E28A30.c b/src/code_E28A30.c new file mode 100644 index 0000000000..cb56e9b2f3 --- /dev/null +++ b/src/code_E28A30.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E28A30", func_802B6000_E28A30); + +INCLUDE_ASM(s32, "code_E28A30", func_802B609C_E28ACC); + +INCLUDE_ASM(s32, "code_E28A30", func_802B6350_E28D80); + +INCLUDE_ASM(s32, "code_E28A30", func_802B63D4_E28E04); + +INCLUDE_ASM(s32, "code_E28A30", func_802B6478_E28EA8); + +INCLUDE_ASM(s32, "code_E28A30", func_802B6508_E28F38); + +INCLUDE_ASM(s32, "code_E28A30", func_802B6638_E29068); diff --git a/src/code_E291A0.c b/src/code_E291A0.c new file mode 100644 index 0000000000..574a54fff8 --- /dev/null +++ b/src/code_E291A0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E291A0", func_802B6000_E291A0); diff --git a/src/code_E29470.c b/src/code_E29470.c new file mode 100644 index 0000000000..e617a93cbf --- /dev/null +++ b/src/code_E29470.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E29470", func_802B6000_E29470); + +INCLUDE_ASM(s32, "code_E29470", func_802B60A4_E29514); diff --git a/src/code_E2A340.c b/src/code_E2A340.c new file mode 100644 index 0000000000..84ca0ae750 --- /dev/null +++ b/src/code_E2A340.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E2A340", func_802B6000_E2A340); diff --git a/src/code_E2A6B0.c b/src/code_E2A6B0.c new file mode 100644 index 0000000000..6b38beeaec --- /dev/null +++ b/src/code_E2A6B0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E2A6B0", func_802B6000_E2A6B0); + +INCLUDE_ASM(s32, "code_E2A6B0", func_802B6120_E2A7D0); + +INCLUDE_ASM(s32, "code_E2A6B0", func_802B6CF0_E2B3A0); diff --git a/tools/splat.yaml b/tools/splat.yaml index 292d0e4ae6..b13da7226f 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -8299,164 +8299,286 @@ segments: files: - [0xE225B0, c] - [0xE22B30, bin] - - [0xE23260, "bin"] - - [0xF007C0, "bin", "Battle_Fanfare_02"] # BGM start - - [0xF02160, "bin", "Hey_You_03"] - - [0xF03740, "bin", "The_Goomba_King_s_Decree_07"] - - [0xF043F0, "bin", "Attack_of_the_Koopa_Bros_08"] - - [0xF073C0, "bin", "Trojan_Bowser_09"] - - [0xF08D40, "bin", "Chomp_Attack_0A"] - - [0xF09600, "bin", "Ghost_Gulping_0B"] - - [0xF0A550, "bin", "Keeping_Pace_0C"] - - [0xF0BAE0, "bin", "Go_Mario_Go_0D"] - - [0xF0DEC0, "bin", "Huffin_and_Puffin_0E"] - - [0xF0FD20, "bin", "Freeze_0F"] - - [0xF110D0, "bin", "Winning_a_Battle_8B"] - - [0xF116C0, "bin", "Winning_a_Battle_and_Level_Up_8E"] - - [0xF12320, "bin", "Jr_Troopa_Battle_04"] - - [0xF13C20, "bin", "Final_Bowser_Battle_interlude_05"] - - [0xF15F40, "bin", "Master_Battle_2C"] - - [0xF16F80, "bin", "Game_Over_87"] - - [0xF171D0, "bin", "Resting_at_the_Toad_House_88"] - - [0xF17370, "bin", "Running_around_the_Heart_Pillar_in_Ch1_84"] - - [0xF17570, "bin", "Tutankoopa_s_Warning_45"] - - [0xF18940, "bin", "Kammy_Koopa_s_Theme_46"] - - [0xF193D0, "bin", "Jr_Troopa_s_Theme_47"] - - [0xF19BC0, "bin", "Goomba_King_s_Theme_50"] - - [0xF1A6F0, "bin", "Koopa_Bros_Defeated_51"] - - [0xF1ABD0, "bin", "Koopa_Bros_Theme_52"] - - [0xF1C810, "bin", "Tutankoopa_s_Warning_2_53"] - - [0xF1DBF0, "bin", "Tutankoopa_s_Theme_54"] - - [0xF1F2E0, "bin", "Tubba_Blubba_s_Theme_55"] - - [0xF20FF0, "bin", "General_Guy_s_Theme_56"] - - [0xF21780, "bin", "Lava_Piranha_s_Theme_57"] - - [0xF22A00, "bin", "Huff_N_Puff_s_Theme_58"] - - [0xF23A00, "bin", "Crystal_King_s_Theme_59"] - - [0xF24810, "bin", "Blooper_s_Theme_5A"] - - [0xF25240, "bin", "Midboss_Theme_5B"] - - [0xF26260, "bin", "Monstar_s_Theme_5C"] - - [0xF27840, "bin", "Moustafa_s_Theme_86"] - - [0xF27E20, "bin", "Fuzzy_Searching_Minigame_85"] - - [0xF28E20, "bin", "Phonograph_in_Mansion_44"] - - [0xF29AC0, "bin", "Toad_Town_00"] - - [0xF2E130, "bin", "Bill_Blaster_Theme_48"] - - [0xF2EF90, "bin", "Monty_Mole_Theme_in_Flower_Fields_49"] - - [0xF30590, "bin", "Shy_Guys_in_Toad_Town_4A"] - - [0xF318B0, "bin", "Whale_s_Problem_4C"] - - [0xF32220, "bin", "Toad_Town_Sewers_4B"] - - [0xF33060, "bin", "Unused_Theme_4D"] - - [0xF33AA0, "bin", "Mario_s_House_Prologue_3E"] - - [0xF33F10, "bin", "Peach_s_Party_3F"] - - [0xF354E0, "bin", "Goomba_Village_01"] - - [0xF35ED0, "bin", "Pleasant_Path_11"] - - [0xF36690, "bin", "Fuzzy_s_Took_My_Shell_12"] - - [0xF379E0, "bin", "Koopa_Village_13"] - - [0xF38570, "bin", "Koopa_Bros_Fortress_14"] - - [0xF39160, "bin", "Dry_Dry_Ruins_18"] - - [0xF3A0D0, "bin", "Dry_Dry_Ruins_Mystery_19"] - - [0xF3A450, "bin", "Mt_Rugged_16"] - - [0xF3AF20, "bin", "Dry_Dry_Desert_Oasis_17"] - - [0xF3C130, "bin", "Dry_Dry_Outpost_15"] - - [0xF3CCC0, "bin", "Forever_Forest_1A"] - - [0xF3E130, "bin", "Boo_s_Mansion_1B"] - - [0xF3F3E0, "bin", "Bow_s_Theme_1C"] - - [0xF40F00, "bin", "Gusty_Gulch_Adventure_1D"] - - [0xF42F30, "bin", "Tubba_Blubba_s_Castle_1E"] - - [0xF45500, "bin", "The_Castle_Crumbles_1F"] - - [0xF465E0, "bin", "Shy_Guy_s_Toy_Box_20"] - - [0xF474A0, "bin", "Toy_Train_Travel_21"] - - [0xF47E10, "bin", "Big_Lantern_Ghost_s_Theme_22"] - - [0xF48410, "bin", "Jade_Jungle_24"] - - [0xF4A880, "bin", "Deep_Jungle_25"] - - [0xF4BC00, "bin", "Lavalava_Island_26"] - - [0xF4E690, "bin", "Search_for_the_Fearsome_5_27"] - - [0xF50A00, "bin", "Raphael_the_Raven_28"] - - [0xF52520, "bin", "Hot_Times_in_Mt_Lavalava_29"] - - [0xF55C80, "bin", "Escape_from_Mt_Lavalava_2A"] - - [0xF58ED0, "bin", "Cloudy_Climb_32"] - - [0xF592B0, "bin", "Puff_Puff_Machine_33"] - - [0xF5AFF0, "bin", "Flower_Fields_30"] - - [0xF5C8D0, "bin", "Flower_Fields_Sunny_31"] - - [0xF5DF40, "bin", "Sun_s_Tower_34"] - - [0xF5F500, "bin", "Sun_s_Celebration_35"] - - [0xF61700, "bin", "Shiver_City_38"] - - [0xF62E50, "bin", "Detective_Mario_39"] - - [0xF64220, "bin", "Snow_Road_3A"] - - [0xF64CB0, "bin", "Over_Shiver_Mountain_3B"] - - [0xF65B30, "bin", "Starborn_Valley_3C"] - - [0xF66690, "bin", "Sanctuary_3D"] - - [0xF66B70, "bin", "Crystal_Palace_37"] - - [0xF67F80, "bin", "Star_Haven_60"] - - [0xF69640, "bin", "Shooting_Star_Summit_61"] - - [0xF6A050, "bin", "Legendary_Star_Ship_62"] - - [0xF6C270, "bin", "Star_Sanctuary_63"] - - [0xF6CED0, "bin", "Bowser_s_Castle_-_Caves_65"] - - [0xF6EE40, "bin", "Bowser_s_Castle_64"] - - [0xF73390, "bin", "Star_Elevator_2B"] - - [0xF751F0, "bin", "Goomba_Bros_Defeated_7E"] - - [0xF759C0, "bin", "Farewell_Twink_70"] - - [0xF77200, "bin", "Peach_Cooking_71"] - - [0xF77680, "bin", "Gourmet_Guy_72"] - - [0xF78600, "bin", "Hope_on_the_Balcony_Peach_1_73"] - - [0xF79070, "bin", "Peach_s_Theme_2_74"] - - [0xF7A0C0, "bin", "Peach_Sneaking_75"] - - [0xF7AA40, "bin", "Peach_Captured_76"] - - [0xF7AD90, "bin", "Quiz_Show_Intro_77"] - - [0xF7BEA0, "bin", "Unconscious_Mario_78"] - - [0xF7C780, "bin", "Petunia_s_Theme_89"] - - [0xF7DC00, "bin", "Flower_Fields_Door_appears_8A"] - - [0xF7E190, "bin", "Beanstalk_7B"] - - [0xF7EE20, "bin", "Lakilester_s_Theme_7D"] - - [0xF80230, "bin", "The_Sun_s_Back_7F"] - - [0xF81260, "bin", "Shiver_City_in_Crisis_79"] - - [0xF82460, "bin", "Solved_Shiver_City_Mystery_7A"] - - [0xF82D00, "bin", "Merlon_s_Spell_7C"] - - [0xF83DC0, "bin", "Bowser_s_Theme_66"] - - [0xF85590, "bin", "Train_Travel_80"] - - [0xF860E0, "bin", "Whale_Trip_81"] - - [0xF87000, "bin", "Chanterelle_s_Song_8C"] - - [0xF87610, "bin", "Boo_s_Game_8D"] - - [0xF88B30, "bin", "Dry_Dry_Ruins_rises_up_83"] - - [0xF89570, "bin", "End_of_Chapter_40"] - - [0xF8AAF0, "bin", "Beginning_of_Chapter_41"] - - [0xF8B820, "bin", "Hammer_and_Jump_Upgrade_42"] - - [0xF8BD90, "bin", "Found_Baby_Yoshi_s_4E"] - - [0xF8C360, "bin", "New_Partner_JAP_96"] - - [0xF8D110, "bin", "Unused_YI_Fanfare_4F"] - - [0xF8D3E0, "bin", "Unused_YI_Fanfare_2_5D"] - - [0xF90880, "bin", "Peach_s_Castle_inside_Bubble_5E"] - - [0xF92A50, "bin", "Angry_Bowser_67"] - - [0xF95510, "bin", "Bowser_s_Castle_explodes_5F"] - - [0xF96280, "bin", "Peach_s_Wish_68"] - - [0xF98520, "bin", "File_Select_69"] - - [0xF98F90, "bin", "Title_Screen_6A"] - - [0xF9B830, "bin", "Peach_s_Castle_in_Crisis_6B"] - - [0xF9D3B0, "bin", "Mario_falls_from_Bowser_s_Castle_6C"] - - [0xF9D690, "bin", "Peach_s_Arrival_6D"] - - [0xF9EF30, "bin", "Star_Rod_Recovered_6F"] - - [0xF9FA30, "bin", "Mario_s_House_94"] - - [0xFA08A0, "bin", "Bowser_s_Attacks_95"] - - [0xFA3C60, "bin", "End_Parade_1_90"] - - [0xFA85F0, "bin", "End_Parade_2_91"] - - [0xFABE90, "bin", "The_End_6E"] - - [0xFACC80, "bin", "Koopa_Radio_Station_2D"] - - [0xFAD210, "bin", "The_End_Low_Frequency__2E"] - - [0xFAD8F0, "bin", "SMW_Remix_2F"] - - [0xFADE70, "bin", "New_Partner_82"] # BGM end - - [0xFAE860, "bin"] - - [0x19E09A8, "Yay0"] - - [0x19E1390, "Yay0"] - - [0x19E1888, "Yay0"] - - [0x19E2330, "Yay0"] - - [0x19E2DE0, "Yay0"] - - [0x19E3208, "Yay0"] - - [0x19E3BA8, "Yay0"] - - [0x19E3FD8, "Yay0"] - - [0x19E4828, "Yay0"] - - [0x19E4BE0, "Yay0"] - - [0x19E5758, "Yay0"] - - [0x19E5950, "Yay0"] - - [0x19E62A0, "Yay0"] + - type: code + start: 0xE23260 + vram: 0x802B6000 + overlay: True + files: + - [0xE23260, c] + - [0xE23690, bin] + - type: code + start: 0xE236E0 + vram: 0x802B6000 + overlay: True + files: + - [0xE236E0, c] + - [0xE23FE0, bin] + - type: code + start: 0xE24040 + vram: 0x802B6000 + overlay: True + files: + - [0xE24040, c] + - type: code + start: 0xE245D0 + vram: 0x802B6000 + overlay: True + files: + - [0xE245D0, c] + - [0xE248D0, bin] + - type: code + start: 0xE24920 + vram: 0x802B6000 + overlay: True + files: + - [0xE24920, c] + - type: code + start: 0xE24ED0 + vram: 0x802B6000 + overlay: True + files: + - [0xE24ED0, c] + - [0xE25C80, bin] + - type: code + start: 0xE25D60 + vram: 0x802B6000 + overlay: True + files: + - [0xE25D60, c] + - [0xE26700, bin] + - type: code + start: 0xE26710 + vram: 0x802B6000 + overlay: True + files: + - [0xE26710, c] + - [0xE26DA0, bin] + - type: code + start: 0xE26DE0 + vram: 0x802B6000 + overlay: True + files: + - [0xE26DE0, c] + - [0xE274C0, bin] + - type: code + start: 0xE27510 + vram: 0x802B6000 + overlay: True + files: + - [0xE27510, c] + - [0xE27C50, bin] + - type: code + start: 0xE27C90 + vram: 0x802B6000 + overlay: True + files: + - [0xE27C90, c] + - type: code + start: 0xE27F40 + vram: 0x802B6000 + overlay: True + files: + - [0xE27F40, c] + - [0xE28790, bin] + - type: code + start: 0xE287F0 + vram: 0x802B6000 + overlay: True + files: + - [0xE287F0, c] + - type: code + start: 0xE28A30 + vram: 0x802B6000 + overlay: True + files: + - [0xE28A30, c] + - [0xE29190, bin] + - type: code + start: 0xE291A0 + vram: 0x802B6000 + overlay: True + files: + - [0xE291A0, c] + - [0xE29450, bin] + - type: code + start: 0xE29470 + vram: 0x802B6000 + overlay: True + files: + - [0xE29470, c] + - [0xE2A300, bin] + - type: code + start: 0xE2A340 + vram: 0x802B6000 + overlay: True + files: + - [0xE2A340, c] + - [0xE2A690, bin] + - type: code + start: 0xE2A6B0 + vram: 0x802B6000 + overlay: True + files: + - [0xE2A6B0, c] + - [0xE2B420, bin] + - [0xEA0900, bin] + - [0xF007C0, bin, Battle_Fanfare_02] # BGM start + - [0xF02160, bin, Hey_You_03] + - [0xF03740, bin, The_Goomba_King_s_Decree_07] + - [0xF043F0, bin, Attack_of_the_Koopa_Bros_08] + - [0xF073C0, bin, Trojan_Bowser_09] + - [0xF08D40, bin, Chomp_Attack_0A] + - [0xF09600, bin, Ghost_Gulping_0B] + - [0xF0A550, bin, Keeping_Pace_0C] + - [0xF0BAE0, bin, Go_Mario_Go_0D] + - [0xF0DEC0, bin, Huffin_and_Puffin_0E] + - [0xF0FD20, bin, Freeze_0F] + - [0xF110D0, bin, Winning_a_Battle_8B] + - [0xF116C0, bin, Winning_a_Battle_and_Level_Up_8E] + - [0xF12320, bin, Jr_Troopa_Battle_04] + - [0xF13C20, bin, Final_Bowser_Battle_interlude_05] + - [0xF15F40, bin, Master_Battle_2C] + - [0xF16F80, bin, Game_Over_87] + - [0xF171D0, bin, Resting_at_the_Toad_House_88] + - [0xF17370, bin, Running_around_the_Heart_Pillar_in_Ch1_84] + - [0xF17570, bin, Tutankoopa_s_Warning_45] + - [0xF18940, bin, Kammy_Koopa_s_Theme_46] + - [0xF193D0, bin, Jr_Troopa_s_Theme_47] + - [0xF19BC0, bin, Goomba_King_s_Theme_50] + - [0xF1A6F0, bin, Koopa_Bros_Defeated_51] + - [0xF1ABD0, bin, Koopa_Bros_Theme_52] + - [0xF1C810, bin, Tutankoopa_s_Warning_2_53] + - [0xF1DBF0, bin, Tutankoopa_s_Theme_54] + - [0xF1F2E0, bin, Tubba_Blubba_s_Theme_55] + - [0xF20FF0, bin, General_Guy_s_Theme_56] + - [0xF21780, bin, Lava_Piranha_s_Theme_57] + - [0xF22A00, bin, Huff_N_Puff_s_Theme_58] + - [0xF23A00, bin, Crystal_King_s_Theme_59] + - [0xF24810, bin, Blooper_s_Theme_5A] + - [0xF25240, bin, Midboss_Theme_5B] + - [0xF26260, bin, Monstar_s_Theme_5C] + - [0xF27840, bin, Moustafa_s_Theme_86] + - [0xF27E20, bin, Fuzzy_Searching_Minigame_85] + - [0xF28E20, bin, Phonograph_in_Mansion_44] + - [0xF29AC0, bin, Toad_Town_00] + - [0xF2E130, bin, Bill_Blaster_Theme_48] + - [0xF2EF90, bin, Monty_Mole_Theme_in_Flower_Fields_49] + - [0xF30590, bin, Shy_Guys_in_Toad_Town_4A] + - [0xF318B0, bin, Whale_s_Problem_4C] + - [0xF32220, bin, Toad_Town_Sewers_4B] + - [0xF33060, bin, Unused_Theme_4D] + - [0xF33AA0, bin, Mario_s_House_Prologue_3E] + - [0xF33F10, bin, Peach_s_Party_3F] + - [0xF354E0, bin, Goomba_Village_01] + - [0xF35ED0, bin, Pleasant_Path_11] + - [0xF36690, bin, Fuzzy_s_Took_My_Shell_12] + - [0xF379E0, bin, Koopa_Village_13] + - [0xF38570, bin, Koopa_Bros_Fortress_14] + - [0xF39160, bin, Dry_Dry_Ruins_18] + - [0xF3A0D0, bin, Dry_Dry_Ruins_Mystery_19] + - [0xF3A450, bin, Mt_Rugged_16] + - [0xF3AF20, bin, Dry_Dry_Desert_Oasis_17] + - [0xF3C130, bin, Dry_Dry_Outpost_15] + - [0xF3CCC0, bin, Forever_Forest_1A] + - [0xF3E130, bin, Boo_s_Mansion_1B] + - [0xF3F3E0, bin, Bow_s_Theme_1C] + - [0xF40F00, bin, Gusty_Gulch_Adventure_1D] + - [0xF42F30, bin, Tubba_Blubba_s_Castle_1E] + - [0xF45500, bin, The_Castle_Crumbles_1F] + - [0xF465E0, bin, Shy_Guy_s_Toy_Box_20] + - [0xF474A0, bin, Toy_Train_Travel_21] + - [0xF47E10, bin, Big_Lantern_Ghost_s_Theme_22] + - [0xF48410, bin, Jade_Jungle_24] + - [0xF4A880, bin, Deep_Jungle_25] + - [0xF4BC00, bin, Lavalava_Island_26] + - [0xF4E690, bin, Search_for_the_Fearsome_5_27] + - [0xF50A00, bin, Raphael_the_Raven_28] + - [0xF52520, bin, Hot_Times_in_Mt_Lavalava_29] + - [0xF55C80, bin, Escape_from_Mt_Lavalava_2A] + - [0xF58ED0, bin, Cloudy_Climb_32] + - [0xF592B0, bin, Puff_Puff_Machine_33] + - [0xF5AFF0, bin, Flower_Fields_30] + - [0xF5C8D0, bin, Flower_Fields_Sunny_31] + - [0xF5DF40, bin, Sun_s_Tower_34] + - [0xF5F500, bin, Sun_s_Celebration_35] + - [0xF61700, bin, Shiver_City_38] + - [0xF62E50, bin, Detective_Mario_39] + - [0xF64220, bin, Snow_Road_3A] + - [0xF64CB0, bin, Over_Shiver_Mountain_3B] + - [0xF65B30, bin, Starborn_Valley_3C] + - [0xF66690, bin, Sanctuary_3D] + - [0xF66B70, bin, Crystal_Palace_37] + - [0xF67F80, bin, Star_Haven_60] + - [0xF69640, bin, Shooting_Star_Summit_61] + - [0xF6A050, bin, Legendary_Star_Ship_62] + - [0xF6C270, bin, Star_Sanctuary_63] + - [0xF6CED0, bin, Bowser_s_Castle_-_Caves_65] + - [0xF6EE40, bin, Bowser_s_Castle_64] + - [0xF73390, bin, Star_Elevator_2B] + - [0xF751F0, bin, Goomba_Bros_Defeated_7E] + - [0xF759C0, bin, Farewell_Twink_70] + - [0xF77200, bin, Peach_Cooking_71] + - [0xF77680, bin, Gourmet_Guy_72] + - [0xF78600, bin, Hope_on_the_Balcony_Peach_1_73] + - [0xF79070, bin, Peach_s_Theme_2_74] + - [0xF7A0C0, bin, Peach_Sneaking_75] + - [0xF7AA40, bin, Peach_Captured_76] + - [0xF7AD90, bin, Quiz_Show_Intro_77] + - [0xF7BEA0, bin, Unconscious_Mario_78] + - [0xF7C780, bin, Petunia_s_Theme_89] + - [0xF7DC00, bin, Flower_Fields_Door_appears_8A] + - [0xF7E190, bin, Beanstalk_7B] + - [0xF7EE20, bin, Lakilester_s_Theme_7D] + - [0xF80230, bin, The_Sun_s_Back_7F] + - [0xF81260, bin, Shiver_City_in_Crisis_79] + - [0xF82460, bin, Solved_Shiver_City_Mystery_7A] + - [0xF82D00, bin, Merlon_s_Spell_7C] + - [0xF83DC0, bin, Bowser_s_Theme_66] + - [0xF85590, bin, Train_Travel_80] + - [0xF860E0, bin, Whale_Trip_81] + - [0xF87000, bin, Chanterelle_s_Song_8C] + - [0xF87610, bin, Boo_s_Game_8D] + - [0xF88B30, bin, Dry_Dry_Ruins_rises_up_83] + - [0xF89570, bin, End_of_Chapter_40] + - [0xF8AAF0, bin, Beginning_of_Chapter_41] + - [0xF8B820, bin, Hammer_and_Jump_Upgrade_42] + - [0xF8BD90, bin, Found_Baby_Yoshi_s_4E] + - [0xF8C360, bin, New_Partner_JAP_96] + - [0xF8D110, bin, Unused_YI_Fanfare_4F] + - [0xF8D3E0, bin, Unused_YI_Fanfare_2_5D] + - [0xF90880, bin, Peach_s_Castle_inside_Bubble_5E] + - [0xF92A50, bin, Angry_Bowser_67] + - [0xF95510, bin, Bowser_s_Castle_explodes_5F] + - [0xF96280, bin, Peach_s_Wish_68] + - [0xF98520, bin, File_Select_69] + - [0xF98F90, bin, Title_Screen_6A] + - [0xF9B830, bin, Peach_s_Castle_in_Crisis_6B] + - [0xF9D3B0, bin, Mario_falls_from_Bowser_s_Castle_6C] + - [0xF9D690, bin, Peach_s_Arrival_6D] + - [0xF9EF30, bin, Star_Rod_Recovered_6F] + - [0xF9FA30, bin, Mario_s_House_94] + - [0xFA08A0, bin, Bowser_s_Attacks_95] + - [0xFA3C60, bin, End_Parade_1_90] + - [0xFA85F0, bin, End_Parade_2_91] + - [0xFABE90, bin, The_End_6E] + - [0xFACC80, bin, Koopa_Radio_Station_2D] + - [0xFAD210, bin, The_End_Low_Frequency__2E] + - [0xFAD8F0, bin, SMW_Remix_2F] + - [0xFADE70, bin, New_Partner_82] # BGM end + - [0xFAE860, bin] + - [0x19E09A8, Yay0] + - [0x19E1390, Yay0] + - [0x19E1888, Yay0] + - [0x19E2330, Yay0] + - [0x19E2DE0, Yay0] + - [0x19E3208, Yay0] + - [0x19E3BA8, Yay0] + - [0x19E3FD8, Yay0] + - [0x19E4828, Yay0] + - [0x19E4BE0, Yay0] + - [0x19E5758, Yay0] + - [0x19E5950, Yay0] + - [0x19E62A0, Yay0] - start: 0x19E67B8 type: PaperMarioNpcSprites files: diff --git a/undefined_funcs_auto.txt b/undefined_funcs_auto.txt index c0cd1b8daf..244f06a5f7 100644 --- a/undefined_funcs_auto.txt +++ b/undefined_funcs_auto.txt @@ -4,3 +4,4 @@ func_80241190 = 0x80241190; func_802AE000 = 0x802AE000; func_802B7000 = 0x802B7000; func_802B71C8 = 0x802B71C8; +func_802BD100 = 0x802BD100; diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index b86d7e1f8f..7eb31c1366 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -621,6 +621,9 @@ D_800F7B70 = 0x800F7B70; D_800F7B80 = 0x800F7B80; D_800F7B90 = 0x800F7B90; D_800F7C1C = 0x800F7C1C; +D_800F7C20 = 0x800F7C20; +D_800F7C24 = 0x800F7C24; +D_800F7C28 = 0x800F7C28; D_800F7C30 = 0x800F7C30; D_800F7C7C = 0x800F7C7C; D_800F7C8C = 0x800F7C8C; @@ -812,6 +815,7 @@ D_8010C924 = 0x8010C924; D_8010C928 = 0x8010C928; D_8010C92C = 0x8010C92C; D_8010C930 = 0x8010C930; +D_8010C934 = 0x8010C934; D_8010C938 = 0x8010C938; D_8010C93C = 0x8010C93C; D_8010C940 = 0x8010C940; @@ -930,10 +934,10 @@ D_8010F250 = 0x8010F250; gPlayerData = 0x8010F290; D_8010F6B8 = 0x8010F6B8; update_entities = 0x8010F6D0; -func_80147474 = 0x80147474; D_80147474 = 0x80147474; -D_80147574 = 0x80147574; +func_80147474 = 0x80147474; func_80147574 = 0x80147574; +D_80147574 = 0x80147574; func_80147650 = 0x80147650; D_8014B7F0 = 0x8014B7F0; D_8014C248 = 0x8014C248; @@ -1799,8 +1803,8 @@ D_802417D8 = 0x802417D8; D_802417E4 = 0x802417E4; D_802417E8 = 0x802417E8; func_802417EC_C5BF2C = 0x802417EC; -func_80241800_8B1870 = 0x80241800; D_80241800 = 0x80241800; +func_80241800_8B1870 = 0x80241800; D_80241810 = 0x80241810; D_80241820 = 0x80241820; func_80241850_A2BA90 = 0x80241850; @@ -1892,8 +1896,8 @@ D_80241FC0 = 0x80241FC0; func_80241FC8_C87A78 = 0x80241FC8; D_80241FE0 = 0x80241FE0; D_80241FF4 = 0x80241FF4; -D_80242000 = 0x80242000; func_80242000_C48BE0 = 0x80242000; +D_80242000 = 0x80242000; D_80242008 = 0x80242008; D_80242010 = 0x80242010; D_80242030 = 0x80242030; @@ -1962,8 +1966,8 @@ D_80242518 = 0x80242518; D_80242520 = 0x80242520; D_80242528 = 0x80242528; D_80242530 = 0x80242530; -func_80242538_D223C8 = 0x80242538; D_80242538 = 0x80242538; +func_80242538_D223C8 = 0x80242538; D_8024253C = 0x8024253C; func_80242540_A09440 = 0x80242540; func_80242558_A1D658 = 0x80242558; @@ -2009,8 +2013,8 @@ D_80242888 = 0x80242888; D_802428E0_DF1780 = 0x802428E0; func_8024291C_C494FC = 0x8024291C; D_8024292C = 0x8024292C; -D_80242930 = 0x80242930; func_80242930_9C7D10 = 0x80242930; +D_80242930 = 0x80242930; D_8024296C_C8841C = 0x8024296C; func_80242970_7ED680 = 0x80242970; D_802429A4 = 0x802429A4; @@ -2044,8 +2048,8 @@ D_80242BF8 = 0x80242BF8; func_80242C00_BB0540 = 0x80242C00; D_80242C08 = 0x80242C08; D_80242C0E = 0x80242C0E; -D_80242C30 = 0x80242C30; func_80242C30_B37800 = 0x80242C30; +D_80242C30 = 0x80242C30; D_80242C38 = 0x80242C38; D_80242C40 = 0x80242C40; func_80242C48_9122F8 = 0x80242C48; @@ -2232,8 +2236,8 @@ D_80243890 = 0x80243890; func_80243898 = 0x80243898; D_802438E0 = 0x802438E0; D_802438E8 = 0x802438E8; -func_802438F0_C436A0 = 0x802438F0; func_802438F0_95EAF0 = 0x802438F0; +func_802438F0_C436A0 = 0x802438F0; D_802438F8 = 0x802438F8; D_80243900 = 0x80243900; switch_order = 0x80243918; @@ -4570,6 +4574,67 @@ D_802AD6AA = 0x802AD6AA; D_802AD6C0 = 0x802AD6C0; D_802AD6D4 = 0x802AD6D4; func_802AE000_316D90 = 0x802AE000; +D_802B6240 = 0x802B6240; +D_802B62B0 = 0x802B62B0; +D_802B62D0 = 0x802B62D0; +D_802B62D4 = 0x802B62D4; +D_802B62D8 = 0x802B62D8; +D_802B62DC = 0x802B62DC; +D_802B62E0 = 0x802B62E0; +D_802B6300 = 0x802B6300; +func_802B6350_E28D80 = 0x802B6350; +D_802B6360 = 0x802B6360; +D_802B6430 = 0x802B6430; +D_802B6690 = 0x802B6690; +D_802B66E0 = 0x802B66E0; +D_802B6718 = 0x802B6718; +D_802B6720 = 0x802B6720; +D_802B6728 = 0x802B6728; +D_802B6730 = 0x802B6730; +D_802B6740 = 0x802B6740; +D_802B6760 = 0x802B6760; +D_802B6768 = 0x802B6768; +D_802B6770 = 0x802B6770; +D_802B6780 = 0x802B6780; +D_802B6784 = 0x802B6784; +D_802B6788 = 0x802B6788; +D_802B678C = 0x802B678C; +D_802B6790 = 0x802B6790; +D_802B6794 = 0x802B6794; +D_802B6798 = 0x802B6798; +D_802B679C = 0x802B679C; +D_802B6850 = 0x802B6850; +D_802B68B0 = 0x802B68B0; +D_802B68B4 = 0x802B68B4; +D_802B68B8 = 0x802B68B8; +D_802B68BC = 0x802B68BC; +D_802B6910 = 0x802B6910; +D_802B69A0 = 0x802B69A0; +D_802B69A8 = 0x802B69A8; +D_802B6D90 = 0x802B6D90; +D_802B6DB0 = 0x802B6DB0; +D_802B6DC0 = 0x802B6DC0; +D_802B6DF0 = 0x802B6DF0; +D_802B6E08 = 0x802B6E08; +D_802B6E60 = 0x802B6E60; +D_802B6E68 = 0x802B6E68; +D_802B6E70 = 0x802B6E70; +D_802B6E78 = 0x802B6E78; +D_802B6E80 = 0x802B6E80; +D_802B6E90 = 0x802B6E90; +D_802B6E98 = 0x802B6E98; +D_802B6EA0 = 0x802B6EA0; +D_802B6EA8 = 0x802B6EA8; +D_802B6ED0 = 0x802B6ED0; +D_802B6ED4 = 0x802B6ED4; +D_802B6ED8 = 0x802B6ED8; +D_802B6EDC = 0x802B6EDC; +D_802B6EE0 = 0x802B6EE0; +D_802B6EE4 = 0x802B6EE4; +D_802B6EE8 = 0x802B6EE8; +D_802B6EEC = 0x802B6EEC; +D_802B6EF0 = 0x802B6EF0; +D_802B6EF4 = 0x802B6EF4; D_802B70B4 = 0x802B70B4; D_802B7140 = 0x802B7140; D_802B72C0 = 0x802B72C0; @@ -4592,6 +4657,9 @@ D_802B7CA0 = 0x802B7CA0; D_802B7D18 = 0x802B7D18; D_802B7D20 = 0x802B7D20; D_802B9E00 = 0x802B9E00; +D_802BCE30 = 0x802BCE30; +D_802BCE32 = 0x802BCE32; +D_802BCE34 = 0x802BCE34; D_802BD5F0 = 0x802BD5F0; D_802BDE80 = 0x802BDE80; D_802BDE88 = 0x802BDE88; From 724b7be71e09a636b32a2ee5faac746a8fba5d2d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 02:32:53 +0900 Subject: [PATCH 02/12] a snibblet --- .../code_E20110/func_802B7000_E20110.s | 53 +++++ .../code_E20110/func_802B70B4_E201C4.s | 83 ++++++++ .../code_E20110/func_802B71E8_E202F8.s | 159 +++++++++++++++ .../code_E20110/func_802B7450_E20560.s | 117 +++++++++++ .../code_E20110/func_802B75E8_E206F8.s | 87 ++++++++ .../code_E20110/func_802B7728_E20838.s | 187 ++++++++++++++++++ .../code_E20110/func_802B79C8_E20AD8.s | 26 +++ src/code_E20110.c | 15 ++ tools/splat.yaml | 16 +- undefined_syms_auto.txt | 27 ++- 10 files changed, 752 insertions(+), 18 deletions(-) create mode 100644 asm/nonmatchings/code_E20110/func_802B7000_E20110.s create mode 100644 asm/nonmatchings/code_E20110/func_802B70B4_E201C4.s create mode 100644 asm/nonmatchings/code_E20110/func_802B71E8_E202F8.s create mode 100644 asm/nonmatchings/code_E20110/func_802B7450_E20560.s create mode 100644 asm/nonmatchings/code_E20110/func_802B75E8_E206F8.s create mode 100644 asm/nonmatchings/code_E20110/func_802B7728_E20838.s create mode 100644 asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s create mode 100644 src/code_E20110.c diff --git a/asm/nonmatchings/code_E20110/func_802B7000_E20110.s b/asm/nonmatchings/code_E20110/func_802B7000_E20110.s new file mode 100644 index 0000000000..28b81aaa0a --- /dev/null +++ b/asm/nonmatchings/code_E20110/func_802B7000_E20110.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B7000_E20110 +/* E20110 802B7000 3C014387 */ lui $at, 0x4387 +/* E20114 802B7004 44810000 */ mtc1 $at, $f0 +/* E20118 802B7008 00000000 */ nop +/* E2011C 802B700C 460C003E */ c.le.s $f0, $f12 +/* E20120 802B7010 00000000 */ nop +/* E20124 802B7014 45000009 */ bc1f .L802B703C +/* E20128 802B7018 240200FF */ addiu $v0, $zero, 0xff +/* E2012C 802B701C 3C0143B4 */ lui $at, 0x43b4 +/* E20130 802B7020 44810000 */ mtc1 $at, $f0 +/* E20134 802B7024 00000000 */ nop +/* E20138 802B7028 460C0001 */ sub.s $f0, $f0, $f12 +/* E2013C 802B702C 4600010D */ trunc.w.s $f4, $f0 +/* E20140 802B7030 44032000 */ mfc1 $v1, $f4 +/* E20144 802B7034 080ADC2B */ j .L802B70AC +/* E20148 802B7038 00431023 */ subu $v0, $v0, $v1 +.L802B703C: +/* E2014C 802B703C 3C014334 */ lui $at, 0x4334 +/* E20150 802B7040 44811000 */ mtc1 $at, $f2 +/* E20154 802B7044 00000000 */ nop +/* E20158 802B7048 460C103E */ c.le.s $f2, $f12 +/* E2015C 802B704C 00000000 */ nop +/* E20160 802B7050 45000006 */ bc1f .L802B706C +/* E20164 802B7054 00000000 */ nop +/* E20168 802B7058 46026001 */ sub.s $f0, $f12, $f2 +/* E2016C 802B705C 4600010D */ trunc.w.s $f4, $f0 +/* E20170 802B7060 44032000 */ mfc1 $v1, $f4 +/* E20174 802B7064 080ADC2B */ j .L802B70AC +/* E20178 802B7068 00431023 */ subu $v0, $v0, $v1 +.L802B706C: +/* E2017C 802B706C 3C0142B4 */ lui $at, 0x42b4 +/* E20180 802B7070 44810000 */ mtc1 $at, $f0 +/* E20184 802B7074 00000000 */ nop +/* E20188 802B7078 460C003E */ c.le.s $f0, $f12 +/* E2018C 802B707C 00000000 */ nop +/* E20190 802B7080 45000006 */ bc1f .L802B709C +/* E20194 802B7084 240200FF */ addiu $v0, $zero, 0xff +/* E20198 802B7088 460C1001 */ sub.s $f0, $f2, $f12 +/* E2019C 802B708C 4600010D */ trunc.w.s $f4, $f0 +/* E201A0 802B7090 44032000 */ mfc1 $v1, $f4 +/* E201A4 802B7094 080ADC2B */ j .L802B70AC +/* E201A8 802B7098 00431023 */ subu $v0, $v0, $v1 +.L802B709C: +/* E201AC 802B709C 4600610D */ trunc.w.s $f4, $f12 +/* E201B0 802B70A0 44032000 */ mfc1 $v1, $f4 +/* E201B4 802B70A4 00000000 */ nop +/* E201B8 802B70A8 00431023 */ subu $v0, $v0, $v1 +.L802B70AC: +/* E201BC 802B70AC 03E00008 */ jr $ra +/* E201C0 802B70B0 00431023 */ subu $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_E20110/func_802B70B4_E201C4.s b/asm/nonmatchings/code_E20110/func_802B70B4_E201C4.s new file mode 100644 index 0000000000..d0621cdc75 --- /dev/null +++ b/asm/nonmatchings/code_E20110/func_802B70B4_E201C4.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B70B4_E201C4 +/* E201C4 802B70B4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E201C8 802B70B8 AFB10014 */ sw $s1, 0x14($sp) +/* E201CC 802B70BC 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E201D0 802B70C0 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E201D4 802B70C4 AFBF0018 */ sw $ra, 0x18($sp) +/* E201D8 802B70C8 AFB00010 */ sw $s0, 0x10($sp) +/* E201DC 802B70CC 8E220004 */ lw $v0, 4($s1) +/* E201E0 802B70D0 30420010 */ andi $v0, $v0, 0x10 +/* E201E4 802B70D4 1040003F */ beqz $v0, .L802B71D4 +/* E201E8 802B70D8 00000000 */ nop +/* E201EC 802B70DC 3C10802B */ lui $s0, %hi(D_802B7CB8) +/* E201F0 802B70E0 26107CB8 */ addiu $s0, $s0, %lo(D_802B7CB8) +/* E201F4 802B70E4 8E040000 */ lw $a0, ($s0) +/* E201F8 802B70E8 0C00A580 */ jal mem_clear +/* E201FC 802B70EC 24050028 */ addiu $a1, $zero, 0x28 +/* E20200 802B70F0 8E030000 */ lw $v1, ($s0) +/* E20204 802B70F4 C6200028 */ lwc1 $f0, 0x28($s1) +/* E20208 802B70F8 2402FFFF */ addiu $v0, $zero, -1 +/* E2020C 802B70FC 3C018011 */ lui $at, %hi(D_8010C950) +/* E20210 802B7100 AC22C950 */ sw $v0, %lo(D_8010C950)($at) +/* E20214 802B7104 E4600000 */ swc1 $f0, ($v1) +/* E20218 802B7108 862200B0 */ lh $v0, 0xb0($s1) +/* E2021C 802B710C C620002C */ lwc1 $f0, 0x2c($s1) +/* E20220 802B7110 44821000 */ mtc1 $v0, $f2 +/* E20224 802B7114 00000000 */ nop +/* E20228 802B7118 468010A0 */ cvt.s.w $f2, $f2 +/* E2022C 802B711C 8E220004 */ lw $v0, 4($s1) +/* E20230 802B7120 46020080 */ add.s $f2, $f0, $f2 +/* E20234 802B7124 30421000 */ andi $v0, $v0, 0x1000 +/* E20238 802B7128 3C014000 */ lui $at, 0x4000 +/* E2023C 802B712C 44810000 */ mtc1 $at, $f0 +/* E20240 802B7130 14400004 */ bnez $v0, .L802B7144 +/* E20244 802B7134 24630004 */ addiu $v1, $v1, 4 +/* E20248 802B7138 3C014100 */ lui $at, 0x4100 +/* E2024C 802B713C 44810000 */ mtc1 $at, $f0 +/* E20250 802B7140 00000000 */ nop +.L802B7144: +/* E20254 802B7144 46001000 */ add.s $f0, $f2, $f0 +/* E20258 802B7148 3C04802B */ lui $a0, %hi(D_802B7CB8) +/* E2025C 802B714C 24847CB8 */ addiu $a0, $a0, %lo(D_802B7CB8) +/* E20260 802B7150 E4600000 */ swc1 $f0, ($v1) +/* E20264 802B7154 8C820000 */ lw $v0, ($a0) +/* E20268 802B7158 C6200030 */ lwc1 $f0, 0x30($s1) +/* E2026C 802B715C 3C013ECC */ lui $at, 0x3ecc +/* E20270 802B7160 3421CCCD */ ori $at, $at, 0xcccd +/* E20274 802B7164 44811000 */ mtc1 $at, $f2 +/* E20278 802B7168 A0400023 */ sb $zero, 0x23($v0) +/* E2027C 802B716C 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E20280 802B7170 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E20284 802B7174 E4400008 */ swc1 $f0, 8($v0) +/* E20288 802B7178 E4420010 */ swc1 $f2, 0x10($v0) +/* E2028C 802B717C 3C02802B */ lui $v0, %hi(func_802B7728_E20838) +/* E20290 802B7180 24427728 */ addiu $v0, $v0, %lo(func_802B7728_E20838) +/* E20294 802B7184 3C018011 */ lui $at, %hi(D_8010C958) +/* E20298 802B7188 AC22C958 */ sw $v0, %lo(D_8010C958)($at) +/* E2029C 802B718C 00031080 */ sll $v0, $v1, 2 +/* E202A0 802B7190 00431021 */ addu $v0, $v0, $v1 +/* E202A4 802B7194 00021080 */ sll $v0, $v0, 2 +/* E202A8 802B7198 00431023 */ subu $v0, $v0, $v1 +/* E202AC 802B719C 000218C0 */ sll $v1, $v0, 3 +/* E202B0 802B71A0 00431021 */ addu $v0, $v0, $v1 +/* E202B4 802B71A4 000210C0 */ sll $v0, $v0, 3 +/* E202B8 802B71A8 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E202BC 802B71AC 00220821 */ addu $at, $at, $v0 +/* E202C0 802B71B0 C4201DEC */ lwc1 $f0, %lo(D_800B1DEC)($at) +/* E202C4 802B71B4 240200FF */ addiu $v0, $zero, 0xff +/* E202C8 802B71B8 8C830000 */ lw $v1, ($a0) +/* E202CC 802B71BC 46000007 */ neg.s $f0, $f0 +/* E202D0 802B71C0 A0620024 */ sb $v0, 0x24($v1) +/* E202D4 802B71C4 E460000C */ swc1 $f0, 0xc($v1) +/* E202D8 802B71C8 8C830000 */ lw $v1, ($a0) +/* E202DC 802B71CC 240200FF */ addiu $v0, $zero, 0xff +/* E202E0 802B71D0 AC62001C */ sw $v0, 0x1c($v1) +.L802B71D4: +/* E202E4 802B71D4 8FBF0018 */ lw $ra, 0x18($sp) +/* E202E8 802B71D8 8FB10014 */ lw $s1, 0x14($sp) +/* E202EC 802B71DC 8FB00010 */ lw $s0, 0x10($sp) +/* E202F0 802B71E0 03E00008 */ jr $ra +/* E202F4 802B71E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E20110/func_802B71E8_E202F8.s b/asm/nonmatchings/code_E20110/func_802B71E8_E202F8.s new file mode 100644 index 0000000000..a847debe49 --- /dev/null +++ b/asm/nonmatchings/code_E20110/func_802B71E8_E202F8.s @@ -0,0 +1,159 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B71E8_E202F8 +/* E202F8 802B71E8 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) +/* E202FC 802B71EC 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) +/* E20300 802B71F0 27BDFF28 */ addiu $sp, $sp, -0xd8 +/* E20304 802B71F4 AFBF00D0 */ sw $ra, 0xd0($sp) +/* E20308 802B71F8 AFB500CC */ sw $s5, 0xcc($sp) +/* E2030C 802B71FC AFB400C8 */ sw $s4, 0xc8($sp) +/* E20310 802B7200 AFB300C4 */ sw $s3, 0xc4($sp) +/* E20314 802B7204 AFB200C0 */ sw $s2, 0xc0($sp) +/* E20318 802B7208 AFB100BC */ sw $s1, 0xbc($sp) +/* E2031C 802B720C 30420010 */ andi $v0, $v0, 0x10 +/* E20320 802B7210 10400086 */ beqz $v0, .L802B742C +/* E20324 802B7214 AFB000B8 */ sw $s0, 0xb8($sp) +/* E20328 802B7218 27B00038 */ addiu $s0, $sp, 0x38 +/* E2032C 802B721C 3C14802B */ lui $s4, %hi(D_802B7CB8) +/* E20330 802B7220 26947CB8 */ addiu $s4, $s4, %lo(D_802B7CB8) +/* E20334 802B7224 8E820000 */ lw $v0, ($s4) +/* E20338 802B7228 0200202D */ daddu $a0, $s0, $zero +/* E2033C 802B722C 8C450010 */ lw $a1, 0x10($v0) +/* E20340 802B7230 3C150001 */ lui $s5, 1 +/* E20344 802B7234 00A0302D */ daddu $a2, $a1, $zero +/* E20348 802B7238 0C019DF0 */ jal guScaleF +/* E2034C 802B723C 00A0382D */ daddu $a3, $a1, $zero +/* E20350 802B7240 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E20354 802B7244 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E20358 802B7248 27B10078 */ addiu $s1, $sp, 0x78 +/* E2035C 802B724C 00031080 */ sll $v0, $v1, 2 +/* E20360 802B7250 00431021 */ addu $v0, $v0, $v1 +/* E20364 802B7254 00021080 */ sll $v0, $v0, 2 +/* E20368 802B7258 00431023 */ subu $v0, $v0, $v1 +/* E2036C 802B725C 000218C0 */ sll $v1, $v0, 3 +/* E20370 802B7260 00431021 */ addu $v0, $v0, $v1 +/* E20374 802B7264 000210C0 */ sll $v0, $v0, 3 +/* E20378 802B7268 8E830000 */ lw $v1, ($s4) +/* E2037C 802B726C 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E20380 802B7270 00220821 */ addu $at, $at, $v0 +/* E20384 802B7274 C4221DEC */ lwc1 $f2, %lo(D_800B1DEC)($at) +/* E20388 802B7278 C464000C */ lwc1 $f4, 0xc($v1) +/* E2038C 802B727C 44800000 */ mtc1 $zero, $f0 +/* E20390 802B7280 46022101 */ sub.s $f4, $f4, $f2 +/* E20394 802B7284 3C073F80 */ lui $a3, 0x3f80 +/* E20398 802B7288 44060000 */ mfc1 $a2, $f0 +/* E2039C 802B728C 44052000 */ mfc1 $a1, $f4 +/* E203A0 802B7290 0220202D */ daddu $a0, $s1, $zero +/* E203A4 802B7294 0C019EC8 */ jal guRotateF +/* E203A8 802B7298 AFA60010 */ sw $a2, 0x10($sp) +/* E203AC 802B729C 0200202D */ daddu $a0, $s0, $zero +/* E203B0 802B72A0 0220282D */ daddu $a1, $s1, $zero +/* E203B4 802B72A4 0C019D80 */ jal guMtxCatF +/* E203B8 802B72A8 0200302D */ daddu $a2, $s0, $zero +/* E203BC 802B72AC 8E820000 */ lw $v0, ($s4) +/* E203C0 802B72B0 36B51630 */ ori $s5, $s5, 0x1630 +/* E203C4 802B72B4 8C450000 */ lw $a1, ($v0) +/* E203C8 802B72B8 8C460004 */ lw $a2, 4($v0) +/* E203CC 802B72BC 8C470008 */ lw $a3, 8($v0) +/* E203D0 802B72C0 0C019E40 */ jal guTranslateF +/* E203D4 802B72C4 0220202D */ daddu $a0, $s1, $zero +/* E203D8 802B72C8 0200202D */ daddu $a0, $s0, $zero +/* E203DC 802B72CC 0220282D */ daddu $a1, $s1, $zero +/* 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) +/* E203FC 802B72EC 96050000 */ lhu $a1, ($s0) +/* E20400 802B72F0 8E620000 */ lw $v0, ($s3) +/* E20404 802B72F4 00052980 */ sll $a1, $a1, 6 +/* E20408 802B72F8 00B52821 */ addu $a1, $a1, $s5 +/* E2040C 802B72FC 0C019D40 */ jal guMtxF2L +/* E20410 802B7300 00452821 */ addu $a1, $v0, $a1 +/* E20414 802B7304 3C03DA38 */ lui $v1, 0xda38 +/* E20418 802B7308 34630002 */ ori $v1, $v1, 2 +/* 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) +/* E20430 802B7320 0080382D */ daddu $a3, $a0, $zero +/* E20434 802B7324 8E480000 */ lw $t0, ($s2) +/* E20438 802B7328 96020000 */ lhu $v0, ($s0) +/* E2043C 802B732C 0100482D */ daddu $t1, $t0, $zero +/* E20440 802B7330 25080008 */ addiu $t0, $t0, 8 +/* E20444 802B7334 AE480000 */ sw $t0, ($s2) +/* E20448 802B7338 AD230000 */ sw $v1, ($t1) +/* E2044C 802B733C 24430001 */ addiu $v1, $v0, 1 +/* E20450 802B7340 3042FFFF */ andi $v0, $v0, 0xffff +/* E20454 802B7344 00021180 */ sll $v0, $v0, 6 +/* E20458 802B7348 A6030000 */ sh $v1, ($s0) +/* E2045C 802B734C 8E630000 */ lw $v1, ($s3) +/* E20460 802B7350 00551021 */ addu $v0, $v0, $s5 +/* E20464 802B7354 00621821 */ addu $v1, $v1, $v0 +/* E20468 802B7358 25020008 */ addiu $v0, $t0, 8 +/* E2046C 802B735C AD230004 */ sw $v1, 4($t1) +/* E20470 802B7360 AE420000 */ sw $v0, ($s2) +/* E20474 802B7364 3C02DE00 */ lui $v0, 0xde00 +/* E20478 802B7368 AD020000 */ sw $v0, ($t0) +/* E2047C 802B736C 3C02802B */ lui $v0, %hi(D_802B7C40) +/* E20480 802B7370 24427C40 */ addiu $v0, $v0, %lo(D_802B7C40) +/* E20484 802B7374 AD020004 */ sw $v0, 4($t0) +/* E20488 802B7378 3C02802B */ lui $v0, %hi(D_802B7A20) +/* E2048C 802B737C 24427A20 */ addiu $v0, $v0, %lo(D_802B7A20) +/* E20490 802B7380 AFA20020 */ sw $v0, 0x20($sp) +/* E20494 802B7384 3C02802B */ lui $v0, %hi(D_802B7C20) +/* E20498 802B7388 24427C20 */ addiu $v0, $v0, %lo(D_802B7C20) +/* E2049C 802B738C AFA20024 */ sw $v0, 0x24($sp) +/* E204A0 802B7390 24020020 */ addiu $v0, $zero, 0x20 +/* E204A4 802B7394 A7A20028 */ sh $v0, 0x28($sp) +/* E204A8 802B7398 A7A2002A */ sh $v0, 0x2a($sp) +/* E204AC 802B739C 2402FFF0 */ addiu $v0, $zero, -0x10 +/* E204B0 802B73A0 A7A2002C */ sh $v0, 0x2c($sp) +/* E204B4 802B73A4 2402001A */ addiu $v0, $zero, 0x1a +/* E204B8 802B73A8 A7A2002E */ sh $v0, 0x2e($sp) +/* E204BC 802B73AC 240200FF */ addiu $v0, $zero, 0xff +/* E204C0 802B73B0 A3A20030 */ sb $v0, 0x30($sp) +/* E204C4 802B73B4 24020440 */ addiu $v0, $zero, 0x440 +/* E204C8 802B73B8 AFA00010 */ sw $zero, 0x10($sp) +/* E204CC 802B73BC AFA00014 */ sw $zero, 0x14($sp) +/* E204D0 802B73C0 0C04EAA7 */ jal func_8013AA9C +/* E204D4 802B73C4 AFA20018 */ sw $v0, 0x18($sp) +/* E204D8 802B73C8 0000202D */ daddu $a0, $zero, $zero +/* E204DC 802B73CC 8E820000 */ lw $v0, ($s4) +/* E204E0 802B73D0 24050006 */ addiu $a1, $zero, 6 +/* E204E4 802B73D4 90460024 */ lbu $a2, 0x24($v0) +/* E204E8 802B73D8 240200FF */ addiu $v0, $zero, 0xff +/* E204EC 802B73DC AFA20014 */ sw $v0, 0x14($sp) +/* E204F0 802B73E0 24020448 */ addiu $v0, $zero, 0x448 +/* E204F4 802B73E4 AFA20018 */ sw $v0, 0x18($sp) +/* E204F8 802B73E8 00C0382D */ daddu $a3, $a2, $zero +/* E204FC 802B73EC 0C04EAA7 */ jal func_8013AA9C +/* E20500 802B73F0 AFA60010 */ sw $a2, 0x10($sp) +/* E20504 802B73F4 0000202D */ daddu $a0, $zero, $zero +/* E20508 802B73F8 27A50020 */ addiu $a1, $sp, 0x20 +/* E2050C 802B73FC 0080302D */ daddu $a2, $a0, $zero +/* E20510 802B7400 0C04EBDC */ jal func_8013AF70 +/* E20514 802B7404 0220382D */ daddu $a3, $s1, $zero +/* E20518 802B7408 3C04D838 */ lui $a0, 0xd838 +/* E2051C 802B740C 8E420000 */ lw $v0, ($s2) +/* E20520 802B7410 34840002 */ ori $a0, $a0, 2 +/* E20524 802B7414 0040182D */ daddu $v1, $v0, $zero +/* E20528 802B7418 24420008 */ addiu $v0, $v0, 8 +/* E2052C 802B741C AE420000 */ sw $v0, ($s2) +/* E20530 802B7420 24020040 */ addiu $v0, $zero, 0x40 +/* E20534 802B7424 AC640000 */ sw $a0, ($v1) +/* E20538 802B7428 AC620004 */ sw $v0, 4($v1) +.L802B742C: +/* E2053C 802B742C 8FBF00D0 */ lw $ra, 0xd0($sp) +/* E20540 802B7430 8FB500CC */ lw $s5, 0xcc($sp) +/* E20544 802B7434 8FB400C8 */ lw $s4, 0xc8($sp) +/* E20548 802B7438 8FB300C4 */ lw $s3, 0xc4($sp) +/* E2054C 802B743C 8FB200C0 */ lw $s2, 0xc0($sp) +/* E20550 802B7440 8FB100BC */ lw $s1, 0xbc($sp) +/* E20554 802B7444 8FB000B8 */ lw $s0, 0xb8($sp) +/* E20558 802B7448 03E00008 */ jr $ra +/* E2055C 802B744C 27BD00D8 */ addiu $sp, $sp, 0xd8 diff --git a/asm/nonmatchings/code_E20110/func_802B7450_E20560.s b/asm/nonmatchings/code_E20110/func_802B7450_E20560.s new file mode 100644 index 0000000000..4fc23b0ec7 --- /dev/null +++ b/asm/nonmatchings/code_E20110/func_802B7450_E20560.s @@ -0,0 +1,117 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B7450_E20560 +/* E20560 802B7450 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E20564 802B7454 3C028016 */ lui $v0, %hi(gCollisionStatus) +/* E20568 802B7458 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus) +/* E2056C 802B745C AFB10014 */ sw $s1, 0x14($sp) +/* E20570 802B7460 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E20574 802B7464 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E20578 802B7468 AFB20018 */ sw $s2, 0x18($sp) +/* E2057C 802B746C 2412FFFF */ addiu $s2, $zero, -1 +/* E20580 802B7470 AFBF001C */ sw $ra, 0x1c($sp) +/* E20584 802B7474 AFB00010 */ sw $s0, 0x10($sp) +/* E20588 802B7478 84500012 */ lh $s0, 0x12($v0) +/* E2058C 802B747C 8E2500C8 */ lw $a1, 0xc8($s1) +/* E20590 802B7480 56120030 */ bnel $s0, $s2, .L802B7544 +/* E20594 802B7484 32024000 */ andi $v0, $s0, 0x4000 +/* E20598 802B7488 84440002 */ lh $a0, 2($v0) +/* E2059C 802B748C 04800010 */ bltz $a0, .L802B74D0 +/* E205A0 802B7490 30824000 */ andi $v0, $a0, 0x4000 +/* E205A4 802B7494 1040000F */ beqz $v0, .L802B74D4 +/* E205A8 802B7498 3C020200 */ lui $v0, 0x200 +/* E205AC 802B749C 0C0441A9 */ jal get_entity_type +/* E205B0 802B74A0 0080802D */ daddu $s0, $a0, $zero +/* E205B4 802B74A4 2443FFFD */ addiu $v1, $v0, -3 +/* E205B8 802B74A8 2C620031 */ sltiu $v0, $v1, 0x31 +/* E205BC 802B74AC 10400038 */ beqz $v0, .L802B7590 +/* E205C0 802B74B0 00031080 */ sll $v0, $v1, 2 +/* E205C4 802B74B4 3C01802B */ lui $at, %hi(D_802B7CC0) +/* E205C8 802B74B8 00220821 */ addu $at, $at, $v0 +/* E205CC 802B74BC 8C227CC0 */ lw $v0, %lo(D_802B7CC0)($at) +/* E205D0 802B74C0 00400008 */ jr $v0 +/* E205D4 802B74C4 00000000 */ nop +/* E205D8 802B74C8 080ADD64 */ j .L802B7590 +/* E205DC 802B74CC 2410FFFF */ addiu $s0, $zero, -1 +.L802B74D0: +/* E205E0 802B74D0 3C020200 */ lui $v0, 0x200 +.L802B74D4: +/* E205E4 802B74D4 8E230000 */ lw $v1, ($s1) +/* E205E8 802B74D8 34422000 */ ori $v0, $v0, 0x2000 +/* E205EC 802B74DC 00621824 */ and $v1, $v1, $v0 +/* E205F0 802B74E0 3C020200 */ lui $v0, 0x200 +/* E205F4 802B74E4 1462000F */ bne $v1, $v0, .L802B7524 +/* E205F8 802B74E8 3C03F7FF */ lui $v1, 0xf7ff +/* E205FC 802B74EC 10A0000C */ beqz $a1, .L802B7520 +/* E20600 802B74F0 3C031000 */ lui $v1, 0x1000 +/* E20604 802B74F4 8CA20000 */ lw $v0, ($a1) +/* E20608 802B74F8 00431024 */ and $v0, $v0, $v1 +/* E2060C 802B74FC 10400009 */ beqz $v0, .L802B7524 +/* E20610 802B7500 3C03F7FF */ lui $v1, 0xf7ff +/* E20614 802B7504 80A200A4 */ lb $v0, 0xa4($a1) +/* E20618 802B7508 862300C6 */ lh $v1, 0xc6($s1) +/* E2061C 802B750C 34502000 */ ori $s0, $v0, 0x2000 +/* E20620 802B7510 14700029 */ bne $v1, $s0, .L802B75B8 +/* E20624 802B7514 3C03F7FF */ lui $v1, 0xf7ff +/* E20628 802B7518 080ADD74 */ j .L802B75D0 +/* E2062C 802B751C 24020001 */ addiu $v0, $zero, 1 +.L802B7520: +/* E20630 802B7520 3C03F7FF */ lui $v1, 0xf7ff +.L802B7524: +/* E20634 802B7524 3463FFFF */ ori $v1, $v1, 0xffff +/* E20638 802B7528 0000102D */ daddu $v0, $zero, $zero +/* E2063C 802B752C 8E240000 */ lw $a0, ($s1) +/* E20640 802B7530 2405FFFF */ addiu $a1, $zero, -1 +/* E20644 802B7534 A62500C6 */ sh $a1, 0xc6($s1) +/* E20648 802B7538 00832024 */ and $a0, $a0, $v1 +/* E2064C 802B753C 080ADD74 */ j .L802B75D0 +/* E20650 802B7540 AE240000 */ sw $a0, ($s1) +.L802B7544: +/* E20654 802B7544 14400007 */ bnez $v0, .L802B7564 +/* E20658 802B7548 32022000 */ andi $v0, $s0, 0x2000 +/* E2065C 802B754C 14400010 */ bnez $v0, .L802B7590 +/* E20660 802B7550 00000000 */ nop +/* E20664 802B7554 0C05173A */ jal func_80145CE8 +/* E20668 802B7558 0200202D */ daddu $a0, $s0, $zero +/* E2066C 802B755C 080ADD5B */ j .L802B756C +/* E20670 802B7560 00000000 */ nop +.L802B7564: +/* E20674 802B7564 0C0394BE */ jal func_800E52F8 +/* E20678 802B7568 00000000 */ nop +.L802B756C: +/* E2067C 802B756C 14400008 */ bnez $v0, .L802B7590 +/* E20680 802B7570 3C04F7FF */ lui $a0, 0xf7ff +/* E20684 802B7574 3484FFFF */ ori $a0, $a0, 0xffff +/* E20688 802B7578 8E230000 */ lw $v1, ($s1) +/* E2068C 802B757C 0000102D */ daddu $v0, $zero, $zero +/* E20690 802B7580 A63200C6 */ sh $s2, 0xc6($s1) +/* E20694 802B7584 00641824 */ and $v1, $v1, $a0 +/* E20698 802B7588 080ADD74 */ j .L802B75D0 +/* E2069C 802B758C AE230000 */ sw $v1, ($s1) +.L802B7590: +/* E206A0 802B7590 862200C6 */ lh $v0, 0xc6($s1) +/* E206A4 802B7594 14500008 */ bne $v0, $s0, .L802B75B8 +/* E206A8 802B7598 3C03F7FF */ lui $v1, 0xf7ff +/* E206AC 802B759C 8E220000 */ lw $v0, ($s1) +/* E206B0 802B75A0 3C030800 */ lui $v1, 0x800 +/* E206B4 802B75A4 00431024 */ and $v0, $v0, $v1 +/* E206B8 802B75A8 10400007 */ beqz $v0, .L802B75C8 +/* E206BC 802B75AC 0000102D */ daddu $v0, $zero, $zero +/* E206C0 802B75B0 080ADD74 */ j .L802B75D0 +/* E206C4 802B75B4 00000000 */ nop +.L802B75B8: +/* E206C8 802B75B8 8E220000 */ lw $v0, ($s1) +/* E206CC 802B75BC 3463FFFF */ ori $v1, $v1, 0xffff +/* E206D0 802B75C0 00431024 */ and $v0, $v0, $v1 +/* E206D4 802B75C4 AE220000 */ sw $v0, ($s1) +.L802B75C8: +/* E206D8 802B75C8 A63000C6 */ sh $s0, 0xc6($s1) +/* E206DC 802B75CC 24020001 */ addiu $v0, $zero, 1 +.L802B75D0: +/* E206E0 802B75D0 8FBF001C */ lw $ra, 0x1c($sp) +/* E206E4 802B75D4 8FB20018 */ lw $s2, 0x18($sp) +/* E206E8 802B75D8 8FB10014 */ lw $s1, 0x14($sp) +/* E206EC 802B75DC 8FB00010 */ lw $s0, 0x10($sp) +/* E206F0 802B75E0 03E00008 */ jr $ra +/* E206F4 802B75E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E20110/func_802B75E8_E206F8.s b/asm/nonmatchings/code_E20110/func_802B75E8_E206F8.s new file mode 100644 index 0000000000..8b1805286a --- /dev/null +++ b/asm/nonmatchings/code_E20110/func_802B75E8_E206F8.s @@ -0,0 +1,87 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B75E8_E206F8 +/* E206F8 802B75E8 3C05802B */ lui $a1, %hi(D_802B7CB8) +/* E206FC 802B75EC 24A57CB8 */ addiu $a1, $a1, %lo(D_802B7CB8) +/* E20700 802B75F0 8CA30000 */ lw $v1, ($a1) +/* E20704 802B75F4 90620021 */ lbu $v0, 0x21($v1) +/* E20708 802B75F8 90640022 */ lbu $a0, 0x22($v1) +/* E2070C 802B75FC 00441021 */ addu $v0, $v0, $a0 +/* E20710 802B7600 A0620021 */ sb $v0, 0x21($v1) +/* E20714 802B7604 8CA30000 */ lw $v1, ($a1) +/* E20718 802B7608 80620021 */ lb $v0, 0x21($v1) +/* E2071C 802B760C 3C068011 */ lui $a2, %hi(gPlayerStatus) +/* E20720 802B7610 24C6EFC8 */ addiu $a2, $a2, %lo(gPlayerStatus) +/* E20724 802B7614 28420005 */ slti $v0, $v0, 5 +/* E20728 802B7618 14400006 */ bnez $v0, .L802B7634 +/* E2072C 802B761C 2402FFFF */ addiu $v0, $zero, -1 +/* E20730 802B7620 A0620022 */ sb $v0, 0x22($v1) +/* E20734 802B7624 8CA30000 */ lw $v1, ($a1) +/* E20738 802B7628 24020004 */ addiu $v0, $zero, 4 +/* E2073C 802B762C A0620021 */ sb $v0, 0x21($v1) +/* E20740 802B7630 8CA30000 */ lw $v1, ($a1) +.L802B7634: +/* E20744 802B7634 80620021 */ lb $v0, 0x21($v1) +/* E20748 802B7638 2842FFFC */ slti $v0, $v0, -4 +/* E2074C 802B763C 10400005 */ beqz $v0, .L802B7654 +/* E20750 802B7640 24020001 */ addiu $v0, $zero, 1 +/* E20754 802B7644 A0620022 */ sb $v0, 0x22($v1) +/* E20758 802B7648 8CA30000 */ lw $v1, ($a1) +/* E2075C 802B764C 2402FFFC */ addiu $v0, $zero, -4 +/* E20760 802B7650 A0620021 */ sb $v0, 0x21($v1) +.L802B7654: +/* E20764 802B7654 8CA40000 */ lw $a0, ($a1) +/* E20768 802B7658 C4C00028 */ lwc1 $f0, 0x28($a2) +/* E2076C 802B765C C4820000 */ lwc1 $f2, ($a0) +/* E20770 802B7660 46020001 */ sub.s $f0, $f0, $f2 +/* E20774 802B7664 3C013F2A */ lui $at, 0x3f2a +/* E20778 802B7668 34217EFA */ ori $at, $at, 0x7efa +/* E2077C 802B766C 44812000 */ mtc1 $at, $f4 +/* E20780 802B7670 00000000 */ nop +/* E20784 802B7674 46040182 */ mul.s $f6, $f0, $f4 +/* E20788 802B7678 00000000 */ nop +/* E2078C 802B767C 46061080 */ add.s $f2, $f2, $f6 +/* E20790 802B7680 E4820000 */ swc1 $f2, ($a0) +/* E20794 802B7684 C4C00030 */ lwc1 $f0, 0x30($a2) +/* E20798 802B7688 C4820008 */ lwc1 $f2, 8($a0) +/* E2079C 802B768C 46020001 */ sub.s $f0, $f0, $f2 +/* E207A0 802B7690 46040182 */ mul.s $f6, $f0, $f4 +/* E207A4 802B7694 00000000 */ nop +/* E207A8 802B7698 80830021 */ lb $v1, 0x21($a0) +/* E207AC 802B769C 46061080 */ add.s $f2, $f2, $f6 +/* E207B0 802B76A0 C4840004 */ lwc1 $f4, 4($a0) +/* E207B4 802B76A4 44833000 */ mtc1 $v1, $f6 +/* E207B8 802B76A8 00000000 */ nop +/* E207BC 802B76AC 468031A0 */ cvt.s.w $f6, $f6 +/* E207C0 802B76B0 E4820008 */ swc1 $f2, 8($a0) +/* E207C4 802B76B4 84C200B0 */ lh $v0, 0xb0($a2) +/* E207C8 802B76B8 C4C0002C */ lwc1 $f0, 0x2c($a2) +/* E207CC 802B76BC 44821000 */ mtc1 $v0, $f2 +/* E207D0 802B76C0 00000000 */ nop +/* E207D4 802B76C4 468010A0 */ cvt.s.w $f2, $f2 +/* E207D8 802B76C8 8CC20004 */ lw $v0, 4($a2) +/* E207DC 802B76CC 46020080 */ add.s $f2, $f0, $f2 +/* E207E0 802B76D0 30421000 */ andi $v0, $v0, 0x1000 +/* E207E4 802B76D4 3C014000 */ lui $at, 0x4000 +/* E207E8 802B76D8 44810000 */ mtc1 $at, $f0 +/* E207EC 802B76DC 54400005 */ bnel $v0, $zero, .L802B76F4 +/* E207F0 802B76E0 46001000 */ add.s $f0, $f2, $f0 +/* E207F4 802B76E4 3C014100 */ lui $at, 0x4100 +/* E207F8 802B76E8 44810000 */ mtc1 $at, $f0 +/* E207FC 802B76EC 00000000 */ nop +/* E20800 802B76F0 46001000 */ add.s $f0, $f2, $f0 +.L802B76F4: +/* E20804 802B76F4 46060000 */ add.s $f0, $f0, $f6 +/* E20808 802B76F8 46040001 */ sub.s $f0, $f0, $f4 +/* E2080C 802B76FC 3C013E80 */ lui $at, 0x3e80 +/* E20810 802B7700 44811000 */ mtc1 $at, $f2 +/* E20814 802B7704 00000000 */ nop +/* E20818 802B7708 46020182 */ mul.s $f6, $f0, $f2 +/* E2081C 802B770C 00000000 */ nop +/* E20820 802B7710 3C02802B */ lui $v0, %hi(D_802B7CB8) +/* E20824 802B7714 8C427CB8 */ lw $v0, %lo(D_802B7CB8)($v0) +/* E20828 802B7718 C4400004 */ lwc1 $f0, 4($v0) +/* E2082C 802B771C 46060000 */ add.s $f0, $f0, $f6 +/* E20830 802B7720 03E00008 */ jr $ra +/* E20834 802B7724 E4400004 */ swc1 $f0, 4($v0) diff --git a/asm/nonmatchings/code_E20110/func_802B7728_E20838.s b/asm/nonmatchings/code_E20110/func_802B7728_E20838.s new file mode 100644 index 0000000000..f7c2780e9e --- /dev/null +++ b/asm/nonmatchings/code_E20110/func_802B7728_E20838.s @@ -0,0 +1,187 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B7728_E20838 +/* E20838 802B7728 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E2083C 802B772C AFB00010 */ sw $s0, 0x10($sp) +/* E20840 802B7730 241000FF */ addiu $s0, $zero, 0xff +/* E20844 802B7734 AFBF0018 */ sw $ra, 0x18($sp) +/* E20848 802B7738 0C0ADD7A */ jal func_802B75E8_E206F8 +/* E2084C 802B773C AFB10014 */ sw $s1, 0x14($sp) +/* E20850 802B7740 3C03802B */ lui $v1, %hi(D_802B7CB8) +/* E20854 802B7744 24637CB8 */ addiu $v1, $v1, %lo(D_802B7CB8) +/* E20858 802B7748 8C640000 */ lw $a0, ($v1) +/* E2085C 802B774C 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E20860 802B7750 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E20864 802B7754 90850023 */ lbu $a1, 0x23($a0) +/* E20868 802B7758 24020001 */ addiu $v0, $zero, 1 +/* E2086C 802B775C 10A20026 */ beq $a1, $v0, .L802B77F8 +/* E20870 802B7760 28A20002 */ slti $v0, $a1, 2 +/* E20874 802B7764 10400005 */ beqz $v0, .L802B777C +/* E20878 802B7768 24020002 */ addiu $v0, $zero, 2 +/* E2087C 802B776C 10A00009 */ beqz $a1, .L802B7794 +/* E20880 802B7770 00000000 */ nop +/* E20884 802B7774 080ADE4A */ j .L802B7928 +/* E20888 802B7778 00000000 */ nop +.L802B777C: +/* E2088C 802B777C 10A20027 */ beq $a1, $v0, .L802B781C +/* E20890 802B7780 24020003 */ addiu $v0, $zero, 3 +/* E20894 802B7784 10A20033 */ beq $a1, $v0, .L802B7854 +/* E20898 802B7788 00000000 */ nop +/* E2089C 802B778C 080ADE4A */ j .L802B7928 +/* E208A0 802B7790 00000000 */ nop +.L802B7794: +/* E208A4 802B7794 C4800010 */ lwc1 $f0, 0x10($a0) +/* E208A8 802B7798 3C01802B */ lui $at, %hi(D_802B7D88) +/* E208AC 802B779C D4227D88 */ ldc1 $f2, %lo(D_802B7D88)($at) +/* E208B0 802B77A0 3C01802B */ lui $at, %hi(D_802B7D90) +/* E208B4 802B77A4 D4247D90 */ ldc1 $f4, %lo(D_802B7D90)($at) +/* E208B8 802B77A8 46000021 */ cvt.d.s $f0, $f0 +/* E208BC 802B77AC 46220000 */ add.d $f0, $f0, $f2 +/* E208C0 802B77B0 AC80000C */ sw $zero, 0xc($a0) +/* E208C4 802B77B4 46200020 */ cvt.s.d $f0, $f0 +/* E208C8 802B77B8 460000A1 */ cvt.d.s $f2, $f0 +/* E208CC 802B77BC 4622203E */ c.le.d $f4, $f2 +/* E208D0 802B77C0 00000000 */ nop +/* E208D4 802B77C4 45000058 */ bc1f .L802B7928 +/* E208D8 802B77C8 E4800010 */ swc1 $f0, 0x10($a0) +/* E208DC 802B77CC 90820023 */ lbu $v0, 0x23($a0) +/* E208E0 802B77D0 3C013F0C */ lui $at, 0x3f0c +/* E208E4 802B77D4 3421CCCD */ ori $at, $at, 0xcccd +/* E208E8 802B77D8 44810000 */ mtc1 $at, $f0 +/* E208EC 802B77DC 24420001 */ addiu $v0, $v0, 1 +/* E208F0 802B77E0 E4800010 */ swc1 $f0, 0x10($a0) +/* E208F4 802B77E4 A0820023 */ sb $v0, 0x23($a0) +/* E208F8 802B77E8 8C630000 */ lw $v1, ($v1) +/* E208FC 802B77EC 2402000C */ addiu $v0, $zero, 0xc +/* E20900 802B77F0 080ADE4A */ j .L802B7928 +/* E20904 802B77F4 AC620014 */ sw $v0, 0x14($v1) +.L802B77F8: +/* E20908 802B77F8 8C820014 */ lw $v0, 0x14($a0) +/* E2090C 802B77FC AC80000C */ sw $zero, 0xc($a0) +/* E20910 802B7800 2442FFFF */ addiu $v0, $v0, -1 +/* E20914 802B7804 1C400048 */ bgtz $v0, .L802B7928 +/* E20918 802B7808 AC820014 */ sw $v0, 0x14($a0) +/* E2091C 802B780C 90820023 */ lbu $v0, 0x23($a0) +/* E20920 802B7810 24420001 */ addiu $v0, $v0, 1 +/* E20924 802B7814 080ADE4A */ j .L802B7928 +/* E20928 802B7818 A0820023 */ sb $v0, 0x23($a0) +.L802B781C: +/* E2092C 802B781C C48C000C */ lwc1 $f12, 0xc($a0) +/* E20930 802B7820 3C014120 */ lui $at, 0x4120 +/* E20934 802B7824 44810000 */ mtc1 $at, $f0 +/* E20938 802B7828 00000000 */ nop +/* E2093C 802B782C 46006300 */ add.s $f12, $f12, $f0 +/* E20940 802B7830 3C0143B4 */ lui $at, 0x43b4 +/* E20944 802B7834 44810000 */ mtc1 $at, $f0 +/* E20948 802B7838 00000000 */ nop +/* E2094C 802B783C 460C003E */ c.le.s $f0, $f12 +/* E20950 802B7840 00000000 */ nop +/* E20954 802B7844 45030001 */ bc1tl .L802B784C +/* E20958 802B7848 46006301 */ sub.s $f12, $f12, $f0 +.L802B784C: +/* E2095C 802B784C 080ADE47 */ j .L802B791C +/* E20960 802B7850 E48C000C */ swc1 $f12, 0xc($a0) +.L802B7854: +/* E20964 802B7854 C48C000C */ lwc1 $f12, 0xc($a0) +/* E20968 802B7858 3C0141C8 */ lui $at, 0x41c8 +/* E2096C 802B785C 44810000 */ mtc1 $at, $f0 +/* E20970 802B7860 00000000 */ nop +/* E20974 802B7864 46006300 */ add.s $f12, $f12, $f0 +/* E20978 802B7868 3C0143B4 */ lui $at, 0x43b4 +/* E2097C 802B786C 44810000 */ mtc1 $at, $f0 +/* E20980 802B7870 00000000 */ nop +/* E20984 802B7874 460C003E */ c.le.s $f0, $f12 +/* E20988 802B7878 00000000 */ nop +/* E2098C 802B787C 45030001 */ bc1tl .L802B7884 +/* E20990 802B7880 46006301 */ sub.s $f12, $f12, $f0 +.L802B7884: +/* E20994 802B7884 8C82001C */ lw $v0, 0x1c($a0) +/* E20998 802B7888 E48C000C */ swc1 $f12, 0xc($a0) +/* E2099C 802B788C 2442FFE7 */ addiu $v0, $v0, -0x19 +/* E209A0 802B7890 04410002 */ bgez $v0, .L802B789C +/* E209A4 802B7894 AC82001C */ sw $v0, 0x1c($a0) +/* E209A8 802B7898 AC80001C */ sw $zero, 0x1c($a0) +.L802B789C: +/* E209AC 802B789C 3C01428C */ lui $at, 0x428c +/* E209B0 802B78A0 44810000 */ mtc1 $at, $f0 +/* E209B4 802B78A4 00000000 */ nop +/* E209B8 802B78A8 460C003E */ c.le.s $f0, $f12 +/* E209BC 802B78AC 00000000 */ nop +/* E209C0 802B78B0 45000008 */ bc1f .L802B78D4 +/* E209C4 802B78B4 00000000 */ nop +/* E209C8 802B78B8 3C0142DC */ lui $at, 0x42dc +/* E209CC 802B78BC 44810000 */ mtc1 $at, $f0 +/* E209D0 802B78C0 00000000 */ nop +/* E209D4 802B78C4 4600603E */ c.le.s $f12, $f0 +/* E209D8 802B78C8 00000000 */ nop +/* E209DC 802B78CC 4501000F */ bc1t .L802B790C +/* E209E0 802B78D0 00000000 */ nop +.L802B78D4: +/* E209E4 802B78D4 3C01437A */ lui $at, 0x437a +/* E209E8 802B78D8 44810000 */ mtc1 $at, $f0 +/* E209EC 802B78DC 00000000 */ nop +/* E209F0 802B78E0 460C003E */ c.le.s $f0, $f12 +/* E209F4 802B78E4 00000000 */ nop +/* E209F8 802B78E8 4500000C */ bc1f .L802B791C +/* E209FC 802B78EC 00000000 */ nop +/* E20A00 802B78F0 3C014391 */ lui $at, 0x4391 +/* E20A04 802B78F4 44810000 */ mtc1 $at, $f0 +/* E20A08 802B78F8 00000000 */ nop +/* E20A0C 802B78FC 4600603E */ c.le.s $f12, $f0 +/* E20A10 802B7900 00000000 */ nop +/* E20A14 802B7904 45000005 */ bc1f .L802B791C +/* E20A18 802B7908 00000000 */ nop +.L802B790C: +/* E20A1C 802B790C 3C02802B */ lui $v0, %hi(func_802B79C8_E20AD8) +/* E20A20 802B7910 244279C8 */ addiu $v0, $v0, %lo(func_802B79C8_E20AD8) +/* E20A24 802B7914 3C018011 */ lui $at, %hi(D_8010C958) +/* E20A28 802B7918 AC22C958 */ sw $v0, %lo(D_8010C958)($at) +.L802B791C: +/* E20A2C 802B791C 0C0ADC00 */ jal func_802B7000_E20110 +/* E20A30 802B7920 00000000 */ nop +/* E20A34 802B7924 0040802D */ daddu $s0, $v0, $zero +.L802B7928: +/* E20A38 802B7928 3C02802B */ lui $v0, %hi(D_802B7CB8) +/* E20A3C 802B792C 8C427CB8 */ lw $v0, %lo(D_802B7CB8)($v0) +/* E20A40 802B7930 A0500024 */ sb $s0, 0x24($v0) +/* E20A44 802B7934 0C0ADD14 */ jal func_802B7450_E20560 +/* E20A48 802B7938 823000B4 */ lb $s0, 0xb4($s1) +/* E20A4C 802B793C 1040000A */ beqz $v0, .L802B7968 +/* E20A50 802B7940 00000000 */ nop +/* E20A54 802B7944 82220015 */ lb $v0, 0x15($s1) +/* E20A58 802B7948 14400007 */ bnez $v0, .L802B7968 +/* E20A5C 802B794C 00000000 */ nop +/* E20A60 802B7950 8E220000 */ lw $v0, ($s1) +/* E20A64 802B7954 30420020 */ andi $v0, $v0, 0x20 +/* E20A68 802B7958 14400003 */ bnez $v0, .L802B7968 +/* E20A6C 802B795C 2E020003 */ sltiu $v0, $s0, 3 +/* E20A70 802B7960 14400005 */ bnez $v0, .L802B7978 +/* E20A74 802B7964 00000000 */ nop +.L802B7968: +/* E20A78 802B7968 3C03802B */ lui $v1, %hi(D_802B7CB8) +/* E20A7C 802B796C 8C637CB8 */ lw $v1, %lo(D_802B7CB8)($v1) +/* E20A80 802B7970 24020003 */ addiu $v0, $zero, 3 +/* E20A84 802B7974 A0620023 */ sb $v0, 0x23($v1) +.L802B7978: +/* E20A88 802B7978 862400C6 */ lh $a0, 0xc6($s1) +/* E20A8C 802B797C 962200C6 */ lhu $v0, 0xc6($s1) +/* E20A90 802B7980 0480000C */ bltz $a0, .L802B79B4 +/* E20A94 802B7984 30424000 */ andi $v0, $v0, 0x4000 +/* E20A98 802B7988 1040000A */ beqz $v0, .L802B79B4 +/* E20A9C 802B798C 00000000 */ nop +/* E20AA0 802B7990 0C04417A */ jal get_entity_by_index +/* E20AA4 802B7994 00000000 */ nop +/* E20AA8 802B7998 8C420000 */ lw $v0, ($v0) +/* E20AAC 802B799C 30421000 */ andi $v0, $v0, 0x1000 +/* E20AB0 802B79A0 14400004 */ bnez $v0, .L802B79B4 +/* E20AB4 802B79A4 24020003 */ addiu $v0, $zero, 3 +/* E20AB8 802B79A8 3C03802B */ lui $v1, %hi(D_802B7CB8) +/* E20ABC 802B79AC 8C637CB8 */ lw $v1, %lo(D_802B7CB8)($v1) +/* E20AC0 802B79B0 A0620023 */ sb $v0, 0x23($v1) +.L802B79B4: +/* E20AC4 802B79B4 8FBF0018 */ lw $ra, 0x18($sp) +/* E20AC8 802B79B8 8FB10014 */ lw $s1, 0x14($sp) +/* E20ACC 802B79BC 8FB00010 */ lw $s0, 0x10($sp) +/* E20AD0 802B79C0 03E00008 */ jr $ra +/* E20AD4 802B79C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s b/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s new file mode 100644 index 0000000000..30482426d3 --- /dev/null +++ b/asm/nonmatchings/code_E20110/func_802B79C8_E20AD8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802B79C8_E20AD8 +/* E20AD8 802B79C8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E20ADC 802B79CC AFBF0010 */ sw $ra, 0x10($sp) +/* E20AE0 802B79D0 0C0ADD7A */ jal func_802B75E8_E206F8 +/* E20AE4 802B79D4 00000000 */ nop +/* E20AE8 802B79D8 3C04800F */ lui $a0, %hi(gPlayerStatusPtr) +/* E20AEC 802B79DC 8C847B30 */ lw $a0, %lo(gPlayerStatusPtr)($a0) +/* E20AF0 802B79E0 2402FFFF */ addiu $v0, $zero, -1 +/* E20AF4 802B79E4 A48200C6 */ sh $v0, 0xc6($a0) +/* E20AF8 802B79E8 8C820004 */ lw $v0, 4($a0) +/* E20AFC 802B79EC 2403FFEF */ addiu $v1, $zero, -0x11 +/* E20B00 802B79F0 3C018011 */ lui $at, %hi(D_8010C958) +/* E20B04 802B79F4 AC20C958 */ sw $zero, %lo(D_8010C958)($at) +/* E20B08 802B79F8 AC8000C8 */ sw $zero, 0xc8($a0) +/* E20B0C 802B79FC 00431024 */ and $v0, $v0, $v1 +/* E20B10 802B7A00 AC820004 */ sw $v0, 4($a0) +/* E20B14 802B7A04 0C03BCF5 */ jal func_800EF3D4 +/* E20B18 802B7A08 0000202D */ daddu $a0, $zero, $zero +/* E20B1C 802B7A0C 0C03BCE9 */ jal func_800EF3A4 +/* E20B20 802B7A10 00000000 */ nop +/* E20B24 802B7A14 8FBF0010 */ lw $ra, 0x10($sp) +/* E20B28 802B7A18 03E00008 */ jr $ra +/* E20B2C 802B7A1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/code_E20110.c b/src/code_E20110.c new file mode 100644 index 0000000000..a77be08fed --- /dev/null +++ b/src/code_E20110.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E20110", func_802B7000_E20110); + +INCLUDE_ASM(s32, "code_E20110", func_802B70B4_E201C4); + +INCLUDE_ASM(s32, "code_E20110", func_802B71E8_E202F8); + +INCLUDE_ASM(s32, "code_E20110", func_802B7450_E20560); + +INCLUDE_ASM(s32, "code_E20110", func_802B75E8_E206F8); + +INCLUDE_ASM(s32, "code_E20110", func_802B7728_E20838); + +INCLUDE_ASM(s32, "code_E20110", func_802B79C8_E20AD8); diff --git a/tools/splat.yaml b/tools/splat.yaml index b13da7226f..d8ef183779 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -8270,14 +8270,13 @@ segments: files: - [0xE1E460, c] - [0xE1EC20, bin] - - [0xE20110, bin] # replace with following commented out section once vram is discovered - # - type: code - # overlay: True - # start: 0xE20110 - # vram: 0 # unknown - # files: - # - [0xE20110, c] - # - [0xE20B30, bin] # may or may not be part of this overlay, perhaps split further + - type: code + overlay: True + start: 0xE20110 + vram: 0x802B7000 # this is a guess, may be wrong + files: + - [0xE20110, c] + - [0xE20B30, bin] - type: code overlay: True start: 0xE20EB0 @@ -8421,6 +8420,7 @@ segments: files: - [0xE2A6B0, c] - [0xE2B420, bin] + - [0xE2B530, bin] - [0xEA0900, bin] - [0xF007C0, bin, Battle_Fanfare_02] # BGM start - [0xF02160, bin, Hey_You_03] diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index 7eb31c1366..b59522050f 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -934,10 +934,10 @@ D_8010F250 = 0x8010F250; gPlayerData = 0x8010F290; D_8010F6B8 = 0x8010F6B8; update_entities = 0x8010F6D0; -D_80147474 = 0x80147474; func_80147474 = 0x80147474; -func_80147574 = 0x80147574; +D_80147474 = 0x80147474; D_80147574 = 0x80147574; +func_80147574 = 0x80147574; func_80147650 = 0x80147650; D_8014B7F0 = 0x8014B7F0; D_8014C248 = 0x8014C248; @@ -1779,8 +1779,8 @@ D_8024161C = 0x8024161C; func_8024162C_9F606C = 0x8024162C; D_80241650 = 0x80241650; func_80241658_8B16C8 = 0x80241658; -func_80241680_8537F0 = 0x80241680; func_80241680_BE0410 = 0x80241680; +func_80241680_8537F0 = 0x80241680; D_80241684 = 0x80241684; D_80241688 = 0x80241688; D_8024168B = 0x8024168B; @@ -1803,8 +1803,8 @@ D_802417D8 = 0x802417D8; D_802417E4 = 0x802417E4; D_802417E8 = 0x802417E8; func_802417EC_C5BF2C = 0x802417EC; -D_80241800 = 0x80241800; func_80241800_8B1870 = 0x80241800; +D_80241800 = 0x80241800; D_80241810 = 0x80241810; D_80241820 = 0x80241820; func_80241850_A2BA90 = 0x80241850; @@ -1820,8 +1820,8 @@ D_80241A00 = 0x80241A00; func_80241A78_BA61F8 = 0x80241A78; func_80241AC8_D2D7F8 = 0x80241AC8; func_80241AD4_B4C544 = 0x80241AD4; -func_80241AE0_9F6520 = 0x80241AE0; func_80241AE0_DCE7B0 = 0x80241AE0; +func_80241AE0_9F6520 = 0x80241AE0; D_80241AE8 = 0x80241AE8; func_80241AEC_80236C = 0x80241AEC; func_80241AF0_A6FED0 = 0x80241AF0; @@ -1900,8 +1900,8 @@ func_80242000_C48BE0 = 0x80242000; D_80242000 = 0x80242000; D_80242008 = 0x80242008; D_80242010 = 0x80242010; -D_80242030 = 0x80242030; func_80242030_8EDE50 = 0x80242030; +D_80242030 = 0x80242030; D_80242038 = 0x80242038; func_80242040_8B20B0 = 0x80242040; D_80242048 = 0x80242048; @@ -1966,8 +1966,8 @@ D_80242518 = 0x80242518; D_80242520 = 0x80242520; D_80242528 = 0x80242528; D_80242530 = 0x80242530; -D_80242538 = 0x80242538; func_80242538_D223C8 = 0x80242538; +D_80242538 = 0x80242538; D_8024253C = 0x8024253C; func_80242540_A09440 = 0x80242540; func_80242558_A1D658 = 0x80242558; @@ -1980,15 +1980,15 @@ D_802425E4 = 0x802425E4; D_802425E8 = 0x802425E8; D_80242610 = 0x80242610; D_80242614 = 0x80242614; -func_80242618_A18838 = 0x80242618; D_80242618 = 0x80242618; +func_80242618_A18838 = 0x80242618; D_80242630 = 0x80242630; D_8024264C = 0x8024264C; D_80242670 = 0x80242670; D_80242678 = 0x80242678; func_80242680_802F00 = 0x80242680; -D_80242688 = 0x80242688; func_80242688_C79368 = 0x80242688; +D_80242688 = 0x80242688; D_802426B0 = 0x802426B0; D_802426B8 = 0x802426B8; func_802426C8_7ED3D8 = 0x802426C8; @@ -2048,8 +2048,8 @@ D_80242BF8 = 0x80242BF8; func_80242C00_BB0540 = 0x80242C00; D_80242C08 = 0x80242C08; D_80242C0E = 0x80242C0E; -func_80242C30_B37800 = 0x80242C30; D_80242C30 = 0x80242C30; +func_80242C30_B37800 = 0x80242C30; D_80242C38 = 0x80242C38; D_80242C40 = 0x80242C40; func_80242C48_9122F8 = 0x80242C48; @@ -4646,16 +4646,23 @@ D_802B7930 = 0x802B7930; D_802B79A8 = 0x802B79A8; D_802B79B0 = 0x802B79B0; D_802B79B8 = 0x802B79B8; +D_802B7A20 = 0x802B7A20; D_802B7BA0 = 0x802B7BA0; D_802B7BC0 = 0x802B7BC0; D_802B7BE0 = 0x802B7BE0; D_802B7C00 = 0x802B7C00; +D_802B7C20 = 0x802B7C20; +D_802B7C40 = 0x802B7C40; D_802B7C60 = 0x802B7C60; D_802B7C78 = 0x802B7C78; D_802B7C80 = 0x802B7C80; D_802B7CA0 = 0x802B7CA0; +D_802B7CB8 = 0x802B7CB8; +D_802B7CC0 = 0x802B7CC0; D_802B7D18 = 0x802B7D18; D_802B7D20 = 0x802B7D20; +D_802B7D88 = 0x802B7D88; +D_802B7D90 = 0x802B7D90; D_802B9E00 = 0x802B9E00; D_802BCE30 = 0x802BCE30; D_802BCE32 = 0x802BCE32; From f069c3296790b0a50e734f02eb0384fe2bd337bf Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 02:59:12 +0900 Subject: [PATCH 03/12] manual splitting of a remaining blob --- tools/splat.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/splat.yaml b/tools/splat.yaml index d8ef183779..1eac9f00e0 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -8420,7 +8420,14 @@ segments: files: - [0xE2A6B0, c] - [0xE2B420, bin] - - [0xE2B530, bin] + - [0xE2B530, bin] # code + - [0xE2BE40, bin] # code + - [0xE2C930, bin] # code + - [0xE2D410, bin] # data + - [0xE2D730, bin] # code + - [0xE2E5F0, bin] # code + - [0xE2EDE0, bin] # code + - [0xE31380, bin] # data - [0xEA0900, bin] - [0xF007C0, bin, Battle_Fanfare_02] # BGM start - [0xF02160, bin, Hey_You_03] From f9a786bf6980800890316275bfad6af880635ebb Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 02:59:50 +0900 Subject: [PATCH 04/12] remove temp file --- tools/somedata.txt | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 tools/somedata.txt diff --git a/tools/somedata.txt b/tools/somedata.txt deleted file mode 100644 index bf71fb88f3..0000000000 --- a/tools/somedata.txt +++ /dev/null @@ -1,31 +0,0 @@ -0x802B6000, 0x00E23260, 0x00E236E0, 0x01000000, -0x802B6000, 0x00E236E0, 0x00E24040, 0x01000000, -0x802B6288, 0x00E236E0, 0x00E24040, 0x01000000, -0x802B60B4, 0x00E24040, 0x00E245D0, 0x01000000, -0x802B6198, 0x00E24040, 0x00E245D0, 0x00000000, -0x802B6294, 0x00E24040, 0x00E245D0, 0x01000000, -0x802B6348, 0x00E24040, 0x00E245D0, 0x01000000, -0x802B6000, 0x00E24920, 0x00E24ED0, 0x01000000, -0x802B61C0, 0x00E24920, 0x00E24ED0, 0x01000000, -0x802B6638, 0x00E28A30, 0x00E291A0, 0x01000000, -0x802B6000, 0x00E26DE0, 0x00E27510, 0x00000000, -0x802B6000, 0x00E26710, 0x00E26DE0, 0x00000000, -0x802B6060, 0x00E27510, 0x00E27C90, 0x00000000, -0x802B66A8, 0x00E24ED0, 0x00E25D60, 0x00000000, -0x802B6350, 0x00E28A30, 0x00E291A0, 0x01000000, -0x802B6508, 0x00E28A30, 0x00E291A0, 0x00000000, -0x802B6000, 0x00E27C90, 0x00E27F40, 0x00000000, -0x802B6000, 0x00E287F0, 0x00E28A30, 0x00000000, -0x802B6000, 0x00E27F40, 0x00E287F0, 0x00000000, -0x802B6230, 0x00E245D0, 0x00E24920, 0x01000000, -0x802B6120, 0x00E2A6B0, 0x00E2B530, 0x01000000, -0x802B6000, 0x00E25D60, 0x00E26710, 0x00000000, -0x802B63D4, 0x00E28A30, 0x00E291A0, 0x00000000, -0x802B6478, 0x00E28A30, 0x00E291A0, 0x00000000, -0x802B60A4, 0x00E29470, 0x00E2A340, 0x00000000, -0x802B6000, 0x00E291A0, 0x00E29470, 0x00000000, -0x802B6000, 0x00E2A340, 0x00E2A6B0, 0x00000000, -0x802B6000, 0x00E28A30, 0x00E291A0, 0x00000000, -0x802B6000, 0x00E245D0, 0x00E24920, 0x01000000, -0x802B609C, 0x00E28A30, 0x00E291A0, 0x00000000, -0x802B6350, 0x00E236E0, 0x00E24040, 0x00000000, From 42768fc40b029de653799fad47c1a6236bf28add Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 12:52:08 +0900 Subject: [PATCH 05/12] gfx syms (thanks :four_leaf_clover:) --- asm/data/code_1000_len_60.data.s | 4 +- .../area_hos/47F0D0/func_802184C0_47F570.s | 4 +- .../area_hos/47F0D0/func_802186B8_47F768.s | 22 +- .../area_hos/47F0D0/func_802189D0_47FA80.s | 22 +- .../area_hos/47F0D0/func_80218CEC_47FD9C.s | 26 +- .../448E20/func_80219A40_448E80.s | 4 +- .../area_kzn2/59E6E0/func_8021835C_59EA3C.s | 58 +- .../area_pra2/660750/func_802186C0_660E10.s | 4 +- .../area_sam/6253E0/func_80219BB0_625750.s | 4 +- .../area_sam/6253E0/func_80219ED0_625A70.s | 4 +- .../area_sam/6253E0/func_8021A1F0_625D90.s | 4 +- .../area_sam/6253E0/func_8021A510_6260B0.s | 4 +- .../area_sam/6253E0/func_8021A830_6263D0.s | 4 +- .../area_sam/6253E0/func_8021AB50_6266F0.s | 4 +- .../area_sam2/63D9F0/func_80218B80_63DD60.s | 4 +- .../area_sam2/63D9F0/func_80218EA0_63E080.s | 4 +- .../area_sam2/63D9F0/func_802191C0_63E3A0.s | 4 +- .../area_sam2/63D9F0/func_802194E0_63E6C0.s | 4 +- .../area_sam2/63D9F0/func_80219800_63E9E0.s | 4 +- .../area_sam2/63D9F0/func_80219B20_63ED00.s | 4 +- .../code_102610_len_2330/func_802E0DE0.s | 18 +- .../code_102610_len_2330/func_802E2BA4.s | 42 +- .../code_104940_len_dc0/func_802E30C0.s | 10 +- .../code_105700_len_2130/func_802E455C.s | 10 +- .../code_105700_len_2130/func_802E4730.s | 36 +- .../code_105700_len_2130/func_802E586C.s | 44 +- .../code_107830_len_e70/func_802E61B0.s | 22 +- .../code_1086a0_len_fc0/func_802E6ED8.s | 14 +- .../code_109660_len_1270/func_802E854C.s | 40 +- .../code_109660_len_1270/push_entity_matrix.s | 12 +- .../code_121f0_len_1290/func_80037638.s | 20 +- .../code_121f0_len_1290/func_80037994.s | 12 +- .../code_121f0_len_1290/func_80037BC8.s | 4 +- .../code_121f0_len_1290/func_80037E14.s | 20 +- .../code_135EE0/pause_draw_rect.s | 20 +- .../code_135EE0/pause_textbox_draw_contents.s | 32 +- .../pause_tutorial_draw_contents.s | 60 +-- .../code_1370_len_7d0/func_80026164.s | 28 +- .../code_138CC0/pause_badges_draw_contents.s | 186 +++---- .../code_13CAF0/pause_items_draw_contents.s | 94 ++-- .../pause_partners_draw_contents.s | 138 ++--- .../code_13FD40/pause_spirits_draw_contents.s | 78 +-- .../code_140C70/pause_map_draw_contents.s | 86 +-- .../code_1421C0/pause_draw_menu_label.s | 6 +- asm/nonmatchings/code_163400/func_80243CCC.s | 6 +- asm/nonmatchings/code_163400/func_80243EEC.s | 4 +- asm/nonmatchings/code_163400/func_802440BC.s | 44 +- .../code_163400/pause_set_cursor_opacity.s | 20 +- asm/nonmatchings/code_168590/func_8024830C.s | 90 ++-- asm/nonmatchings/code_169BE0/func_80249380.s | 26 +- asm/nonmatchings/code_16c8e0/func_8023F088.s | 76 +-- asm/nonmatchings/code_17D6A0/func_8024F768.s | 4 +- asm/nonmatchings/code_190B20/func_8026787C.s | 8 +- .../code_1b40_len_20b0/func_800269EC.s | 24 +- .../code_1b40_len_20b0/func_800271A0.s | 4 +- .../code_1b40_len_20b0/func_80027BAC.s | 4 +- .../code_1b40_len_20b0/func_80027E10.s | 44 +- .../code_1b40_len_20b0/gfx_draw_frame.s | 92 ++-- .../code_20ec0_len_5040/func_800465E0.s | 110 ++-- asm/nonmatchings/code_325AD0/func_E02000AC.s | 8 +- asm/nonmatchings/code_3278F0/func_E0002300.s | 36 +- asm/nonmatchings/code_328110/func_E000C798.s | 42 +- asm/nonmatchings/code_32C110/func_E000E288.s | 28 +- asm/nonmatchings/code_32C7A0/func_E0010510.s | 22 +- asm/nonmatchings/code_32DD10/func_E0012564.s | 18 +- asm/nonmatchings/code_32E490/func_E00144E0.s | 20 +- asm/nonmatchings/code_32EE30/func_E0016454.s | 18 +- asm/nonmatchings/code_32F580/func_E00183D8.s | 18 +- asm/nonmatchings/code_32FE30/func_E001A440.s | 14 +- asm/nonmatchings/code_330910/func_E001C30C.s | 16 +- asm/nonmatchings/code_331940/func_E001E730.s | 42 +- asm/nonmatchings/code_333EC0/func_E00205D0.s | 40 +- asm/nonmatchings/code_337240/func_E0022998.s | 22 +- asm/nonmatchings/code_339250/func_E0024454.s | 88 ++-- asm/nonmatchings/code_33B180/func_E00264F4.s | 40 +- asm/nonmatchings/code_33CDF0/func_E002852C.s | 16 +- asm/nonmatchings/code_33E8C0/func_E002A3C4.s | 16 +- asm/nonmatchings/code_33FE80/func_E002C414.s | 26 +- asm/nonmatchings/code_3419E0/func_E002E368.s | 28 +- asm/nonmatchings/code_342140/func_E0030A68.s | 28 +- asm/nonmatchings/code_343680/func_E003245C.s | 24 +- asm/nonmatchings/code_344A10/func_E0034310.s | 26 +- asm/nonmatchings/code_3454E0/func_E0036224.s | 24 +- asm/nonmatchings/code_34DD20/func_E0038748.s | 18 +- asm/nonmatchings/code_34EC80/func_E003A354.s | 44 +- asm/nonmatchings/code_34F4C0/func_E003C498.s | 36 +- asm/nonmatchings/code_352440/func_E003E638.s | 16 +- asm/nonmatchings/code_353300/func_E0040348.s | 48 +- asm/nonmatchings/code_3547A0/func_E00423B8.s | 30 +- asm/nonmatchings/code_354F60/func_E004491C.s | 48 +- asm/nonmatchings/code_355EE0/func_E00462C0.s | 24 +- asm/nonmatchings/code_356980/func_E0048218.s | 148 +++--- asm/nonmatchings/code_3584C0/func_E004A78C.s | 42 +- asm/nonmatchings/code_359F20/func_E004C3A8.s | 18 +- asm/nonmatchings/code_35B9D0/func_E004E214.s | 26 +- asm/nonmatchings/code_35BFD0/func_E0050308.s | 20 +- asm/nonmatchings/code_35CA80/func_E0052460.s | 28 +- asm/nonmatchings/code_35DA00/func_E0056BD0.s | 18 +- asm/nonmatchings/code_35E920/func_E00584D4.s | 12 +- asm/nonmatchings/code_3602C0/func_E005A3F4.s | 22 +- asm/nonmatchings/code_360F40/func_E005C2F8.s | 34 +- asm/nonmatchings/code_3625C0/func_E005E334.s | 16 +- asm/nonmatchings/code_363160/func_E0060450.s | 14 +- asm/nonmatchings/code_364300/func_E00624EC.s | 22 +- asm/nonmatchings/code_364F10/func_E0064414.s | 40 +- asm/nonmatchings/code_366030/func_E0066770.s | 26 +- asm/nonmatchings/code_36A8D0/func_E0068234.s | 20 +- asm/nonmatchings/code_36D020/func_E006A85C.s | 12 +- asm/nonmatchings/code_36D020/func_E006A94C.s | 34 +- asm/nonmatchings/code_36E1D0/func_E006C5E8.s | 52 +- asm/nonmatchings/code_372790/func_E006E764.s | 30 +- asm/nonmatchings/code_3740B0/func_E0070740.s | 34 +- asm/nonmatchings/code_374E50/func_E00723D4.s | 22 +- asm/nonmatchings/code_376460/func_E00745E0.s | 34 +- asm/nonmatchings/code_377070/func_E007685C.s | 58 +- asm/nonmatchings/code_37A3F0/func_E007827C.s | 62 +-- asm/nonmatchings/code_37C540/func_E007A88C.s | 18 +- asm/nonmatchings/code_37D490/func_E007C1F4.s | 30 +- asm/nonmatchings/code_37F720/func_E007E54C.s | 34 +- asm/nonmatchings/code_3812C0/func_E0080448.s | 40 +- asm/nonmatchings/code_385640/func_E0082580.s | 12 +- asm/nonmatchings/code_385640/func_E00826C4.s | 12 +- asm/nonmatchings/code_385640/func_E00828B4.s | 10 +- asm/nonmatchings/code_385640/func_E0082A84.s | 14 +- asm/nonmatchings/code_3889D0/func_E0084928.s | 56 +- asm/nonmatchings/code_389850/func_E00863B4.s | 54 +- asm/nonmatchings/code_38ADF0/func_E00887E0.s | 32 +- asm/nonmatchings/code_38C5F0/func_E008A728.s | 16 +- asm/nonmatchings/code_38DE00/func_E008C6FC.s | 24 +- asm/nonmatchings/code_38EE60/func_E008E4E0.s | 24 +- asm/nonmatchings/code_38F900/func_E0090444.s | 66 +-- asm/nonmatchings/code_391D30/func_E00922A0.s | 26 +- asm/nonmatchings/code_3928D0/func_E00942FC.s | 40 +- asm/nonmatchings/code_394280/func_E00961BC.s | 14 +- asm/nonmatchings/code_395BB0/func_E00982EC.s | 22 +- asm/nonmatchings/code_3965B0/func_E009A3E0.s | 94 ++-- asm/nonmatchings/code_3981F0/func_E009C220.s | 26 +- asm/nonmatchings/code_39FF20/func_E009E424.s | 34 +- asm/nonmatchings/code_3A2290/func_E00A0000.s | 10 +- asm/nonmatchings/code_3A2990/func_E00A223C.s | 56 +- asm/nonmatchings/code_3A37E0/func_E00A4650.s | 18 +- asm/nonmatchings/code_3A5550/func_E00A63A4.s | 20 +- asm/nonmatchings/code_3A70F0/func_E00A8320.s | 20 +- asm/nonmatchings/code_3AA920/func_E00AA404.s | 22 +- asm/nonmatchings/code_3AEE20/func_E00AC2A4.s | 38 +- asm/nonmatchings/code_3B2350/func_E00AE54C.s | 30 +- asm/nonmatchings/code_3B3EB0/func_E00B0234.s | 56 +- asm/nonmatchings/code_3B4790/func_E00B24B0.s | 76 +-- asm/nonmatchings/code_3B5CF0/func_E00B457C.s | 94 ++-- asm/nonmatchings/code_3B7160/func_E00B62E0.s | 34 +- asm/nonmatchings/code_3B7B80/func_E00B8208.s | 56 +- asm/nonmatchings/code_3B8BD0/func_E00BA620.s | 30 +- asm/nonmatchings/code_3BA030/func_E00BC374.s | 116 ++-- asm/nonmatchings/code_3BBF60/func_E00BE5BC.s | 20 +- asm/nonmatchings/code_3BCD60/func_E00C0760.s | 14 +- asm/nonmatchings/code_3C11D0/func_E00C221C.s | 52 +- asm/nonmatchings/code_3CADF0/func_E00C4308.s | 62 +-- asm/nonmatchings/code_3CC9E0/func_E00C67B0.s | 28 +- asm/nonmatchings/code_3CF3A0/func_E00C8454.s | 24 +- asm/nonmatchings/code_3D0500/func_E00CA4CC.s | 90 ++-- asm/nonmatchings/code_3D1690/func_E00CC9D0.s | 18 +- asm/nonmatchings/code_3D2AC0/func_E00CE478.s | 104 ++-- asm/nonmatchings/code_3D3E20/func_E00D048C.s | 50 +- asm/nonmatchings/code_3D4970/func_E00D2284.s | 16 +- asm/nonmatchings/code_3D5020/func_E00D6980.s | 24 +- asm/nonmatchings/code_3D67C0/func_E00D8288.s | 4 +- asm/nonmatchings/code_3D67C0/func_E00D8334.s | 24 +- asm/nonmatchings/code_3D67C0/func_E00D8630.s | 24 +- asm/nonmatchings/code_3D7240/func_E00DA230.s | 18 +- asm/nonmatchings/code_3D7A70/func_E00DC304.s | 20 +- asm/nonmatchings/code_3D8720/func_E00DE2A8.s | 64 +-- asm/nonmatchings/code_3DB460/func_E00E0600.s | 24 +- asm/nonmatchings/code_3DC310/func_E00E2218.s | 72 +-- asm/nonmatchings/code_3DE000/func_E00E495C.s | 30 +- asm/nonmatchings/code_3E0930/func_E00E6524.s | 22 +- asm/nonmatchings/code_3E1690/func_E00E83BC.s | 18 +- asm/nonmatchings/code_3E1EE0/func_E00EA66C.s | 24 +- asm/nonmatchings/code_3E43A0/func_E010A4E8.s | 124 ++--- asm/nonmatchings/code_3E54C0/func_E010C39C.s | 40 +- asm/nonmatchings/code_3EB4E0/func_E010E000.s | 56 +- asm/nonmatchings/code_3EB4E0/func_E010E558.s | 16 +- asm/nonmatchings/code_3F83F0/func_E01103EC.s | 34 +- asm/nonmatchings/code_3F9E50/func_E0112330.s | 14 +- asm/nonmatchings/code_3F9E50/func_E01124CC.s | 6 +- asm/nonmatchings/code_3FEAE0/func_E0114388.s | 18 +- asm/nonmatchings/code_402640/func_E01166E8.s | 14 +- asm/nonmatchings/code_402640/func_E0116884.s | 30 +- asm/nonmatchings/code_403400/func_E011849C.s | 18 +- asm/nonmatchings/code_404220/func_E011A3BC.s | 8 +- asm/nonmatchings/code_404220/func_E011A48C.s | 32 +- asm/nonmatchings/code_404220/func_E011A700.s | 66 +-- asm/nonmatchings/code_406B40/func_E011C1C4.s | 22 +- asm/nonmatchings/code_409990/func_E011E578.s | 16 +- asm/nonmatchings/code_40B3F0/func_E01203E4.s | 28 +- asm/nonmatchings/code_40C5A0/func_E012270C.s | 34 +- asm/nonmatchings/code_412730/func_E01244C4.s | 38 +- asm/nonmatchings/code_413360/func_E01264EC.s | 50 +- asm/nonmatchings/code_414BA0/func_E01281E0.s | 12 +- asm/nonmatchings/code_415D90/func_802A3C98.s | 72 +-- asm/nonmatchings/code_415D90/func_802A5290.s | 42 +- .../code_42e0_len_1f60/func_8002A904.s | 8 +- .../code_6e40_len_500/render_curtains.s | 46 +- .../code_72C5B0/func_802A123C_72C7EC.s | 4 +- .../code_731300/func_802A123C_73153C.s | 4 +- .../code_80850_len_3060/update_status_menu.s | 112 ++-- asm/nonmatchings/code_8560/render_frame.s | 84 +-- asm/nonmatchings/code_8560/update_cameras.s | 38 +- .../code_8a160_len_700/func_800F102C.s | 26 +- .../code_8a860_len_3f30/func_800F3680.s | 168 +++--- .../code_8e790_len_2850/draw_box.s | 154 +++--- .../code_B9D60/_draw_message_box.s | 36 +- .../code_B9D60/appendGfx_item_entity.s | 64 +-- .../code_B9D60/draw_coin_sparkles.s | 18 +- asm/nonmatchings/code_B9D60/draw_digit.s | 4 +- asm/nonmatchings/code_B9D60/draw_number.s | 26 +- asm/nonmatchings/code_B9D60/func_80126790.s | 52 +- asm/nonmatchings/code_B9D60/func_80126F78.s | 52 +- asm/nonmatchings/code_B9D60/func_80127D90.s | 498 +++++++++--------- asm/nonmatchings/code_B9D60/func_8012C2E0.s | 4 +- asm/nonmatchings/code_B9D60/func_8012C324.s | 50 +- asm/nonmatchings/code_B9D60/func_8012CA08.s | 12 +- asm/nonmatchings/code_B9D60/func_8012D3DC.s | 102 ++-- asm/nonmatchings/code_B9D60/func_8012DB58.s | 40 +- asm/nonmatchings/code_B9D60/func_8012E9A0.s | 16 +- asm/nonmatchings/code_B9D60/func_8012EC94.s | 10 +- asm/nonmatchings/code_B9D60/func_8012F500.s | 78 +-- asm/nonmatchings/code_B9D60/func_8012FE78.s | 90 ++-- .../code_B9D60/render_item_entities.s | 38 +- asm/nonmatchings/code_B9D60/render_messages.s | 10 +- .../code_E20110/func_802B71E8_E202F8.s | 12 +- .../code_E225B0/func_802B7000_E225B0.s | 18 +- asm/nonmatchings/code_F5750/func_802D2D30.s | 8 +- .../code_a5dd0_len_114e0/appendGfx_model.s | 140 ++--- .../code_a5dd0_len_114e0/func_8010FD98.s | 8 +- .../code_a5dd0_len_114e0/func_8010FE68.s | 4 +- .../code_a5dd0_len_114e0/func_80116698.s | 46 +- .../code_a5dd0_len_114e0/func_80117E74.s | 26 +- .../code_a5dd0_len_114e0/func_8011800C.s | 4 +- .../code_a5dd0_len_114e0/func_8011BCEC.s | 8 +- .../code_a5dd0_len_114e0/func_8011C80C.s | 104 ++-- .../code_a5dd0_len_114e0/func_8011CFBC.s | 96 ++-- .../code_a5dd0_len_114e0/func_8011D72C.s | 4 +- .../code_a5dd0_len_114e0/func_8011D9B8.s | 26 +- .../code_a5dd0_len_114e0/func_8011F4D4.s | 98 ++-- .../code_a5dd0_len_114e0/func_8011FA54.s | 34 +- .../code_b72b0_len_15ed0/func_80121184.s | 162 +++--- .../code_b72b0_len_15ed0/func_80122288.s | 160 +++--- .../code_cd180_len_38f0/func_80136A80.s | 164 +++--- .../code_cd180_len_38f0/func_80138740.s | 18 +- .../code_cd180_len_38f0/func_80138E54.s | 154 +++--- .../code_cd180_len_38f0/func_80139F10.s | 80 +-- .../code_d0a70_len_4fe0/func_8013A37C.s | 4 +- .../code_d0a70_len_4fe0/func_8013A4D0.s | 12 +- .../code_d0a70_len_4fe0/func_8013B1B0.s | 120 ++--- .../code_d0a70_len_4fe0/func_8013C3F0.s | 212 ++++---- .../code_d0a70_len_4fe0/func_8013CFA8.s | 16 +- .../code_d0a70_len_4fe0/func_8013DAB4.s | 14 +- .../code_d0a70_len_4fe0/func_8013E2F0.s | 40 +- .../code_d0a70_len_4fe0/func_8013E904.s | 32 +- .../code_d5a50_len_5fd0/draw_menu_icon.s | 30 +- .../code_d5a50_len_5fd0/func_8013F704.s | 96 ++-- .../code_d5a50_len_5fd0/func_80142210.s | 28 +- .../code_d5a50_len_5fd0/func_8014271C.s | 26 +- .../code_d5a50_len_5fd0/func_80143C48.s | 16 +- .../code_d5a50_len_5fd0/render_menu_icon.s | 76 +-- .../code_d5a50_len_5fd0/render_menu_icons.s | 12 +- .../code_dc470_len_14c0/func_80145EC0.s | 96 ++-- .../code_ddaf0_len_c50/func_80147AC4.s | 4 +- .../code_de740_len_23f0/func_801489B8.s | 134 ++--- .../code_de740_len_23f0/func_801491E4.s | 6 +- .../code_f270_len_1190/func_800343A4.s | 22 +- .../code_fee30_len_2d60/func_802DC008.s | 52 +- .../spr_appendMDL_component.s | 32 +- .../dro_02/9694C0/func_8024190C_96AACC.s | 50 +- .../end_00/DF6A20/func_80240020_DF6A20.s | 22 +- .../end_00/DF6A20/func_80240270_DF6C70.s | 22 +- .../end_00/DF6A20/func_80240540_DF6F40.s | 28 +- .../end_00/DF6A20/func_8024081C_DF721C.s | 28 +- .../end_00/DF6A20/func_80240AE8_DF74E8.s | 32 +- .../end_00/DF6A20/func_80240FEC_DF79EC.s | 16 +- .../end_00/DF6A20/func_80241294_DF7C94.s | 20 +- .../end_00/DF6A20/func_802414CC_DF7ECC.s | 20 +- .../end_00/DF6A20/func_80241768_DF8168.s | 20 +- .../end_00/DF6A20/func_802421D8_DF8BD8.s | 8 +- .../end_01/E05390/func_80240030_E05390.s | 22 +- .../end_01/E05390/func_80240280_E055E0.s | 22 +- .../end_01/E05390/func_80240550_E058B0.s | 28 +- .../end_01/E05390/func_8024082C_E05B8C.s | 28 +- .../end_01/E05390/func_80240AF8_E05E58.s | 32 +- .../end_01/E05390/func_80240FFC_E0635C.s | 16 +- .../end_01/E05390/func_802412A4_E06604.s | 20 +- .../end_01/E05390/func_802414DC_E0683C.s | 20 +- .../end_01/E05390/func_80241778_E06AD8.s | 20 +- .../end_01/E05390/func_802421E8_E07548.s | 8 +- .../end_01/E07C20/func_80242C94_E07FF4.s | 10 +- .../flo_10/CB96B0/func_802404B0_CB96B0.s | 24 +- .../flo_10/CB96B0/func_80240A98_CB9C98.s | 98 ++-- .../flo_14/CCB310/func_80240504_CCB814.s | 56 +- .../flo_14/CCB310/func_802407D4_CCBAE4.s | 54 +- .../hos_00/A0C930/func_80240C40_A0C930.s | 10 +- .../hos_01/A11020/func_80240BB8_A11438.s | 4 +- .../hos_01/A11020/func_80240C34_A114B4.s | 4 +- .../hos_02/A16220/func_8024030C_A1652C.s | 20 +- .../hos_02/A16220/func_80240434_A16654.s | 4 +- .../hos_02/A16220/func_80240610_A16830.s | 22 +- .../hos_02/A16220/func_80240904_A16B24.s | 22 +- .../hos_02/A16220/func_80240BFC_A16E1C.s | 22 +- .../hos_03/A1B130/func_8024033C_A1B43C.s | 22 +- .../hos_03/A1B130/func_8024060C_A1B70C.s | 4 +- .../hos_03/A1B130/func_802407E8_A1B8E8.s | 4 +- .../hos_03/A1B130/func_80240928_A1BA28.s | 20 +- .../hos_04/A26ED0/func_80240000_A26ED0.s | 24 +- .../hos_04/A26ED0/func_80240154_A27024.s | 26 +- .../hos_05/A2AAC0/func_80243164_A2D3A4.s | 34 +- .../hos_05/A2AAC0/func_80243758_A2D998.s | 20 +- .../hos_05/A2AAC0/func_80243CC0_A2DF00.s | 12 +- .../hos_05/A2EF00/func_8024564C_A2F88C.s | 4 +- .../hos_05/A2EF00/func_802456C8_A2F908.s | 4 +- .../hos_05/A2EF00/func_80245744_A2F984.s | 4 +- .../isk_05/97DAD0/func_80241610_97F0E0.s | 16 +- .../isk_13/98F7E0/func_80241610_990DF0.s | 20 +- .../isk_14/992730/func_80241610_993D40.s | 16 +- .../iwa_01/90F6B0/func_80240000_90F6B0.s | 40 +- .../jan_00/B216E0/func_802415B0_B21AF0.s | 4 +- .../jan_00/B216E0/func_80241654_B21B94.s | 4 +- .../jan_13/B767B0/func_80240000_B767B0.s | 28 +- .../kgr_01/8A9B70/func_80240354_8A9D64.s | 4 +- .../kgr_02/8AA5B0/func_80240160_8AA5B0.s | 22 +- .../kkj_14/ADAEF0/func_802403F8_ADB298.s | 4 +- .../kkj_25/B06D10/func_80240310_B06D10.s | 20 +- .../kkj_27/B14080/func_80240448_B141B8.s | 6 +- .../kmr_06/8D2A10/func_80241500_8D2A10.s | 20 +- .../kmr_20/8EDFC0/func_802421A0_8EDFC0.s | 24 +- .../kmr_21/8FEE90/func_80240010_8FEE90.s | 8 +- .../kmr_22/8FF8B0/func_8024056C_8FFBDC.s | 58 +- .../kmr_23/907A40/func_80240DA4_9087D4.s | 58 +- .../kmr_30/90B9E0/func_80240488_90BB58.s | 8 +- .../kzn_19/C8DBB0/func_80240E2C_C8E9DC.s | 58 +- .../mac_00/7ECFD0/func_802423F0_7ED100.s | 6 +- .../mac_01/800C40/func_802403C0_800C40.s | 8 +- .../mac_01/800C40/func_802405E8_800E68.s | 4 +- .../mac_01/800C40/func_80240628_800EA8.s | 78 +-- .../mac_01/8017D0/func_80242FA4_803824.s | 20 +- .../mac_01/8017D0/func_802454B4_805D34.s | 4 +- .../8017D0/pause_tabs_draw_stats_805418.s | 4 +- .../mac_05/855560/func_80243800_855970.s | 4 +- .../mac_05/855560/func_802438A4_855A14.s | 4 +- .../mac_05/855F20/func_80243F0C_85607C.s | 34 +- .../mac_06/865000/func_802408D0_865410.s | 4 +- .../mac_06/865000/func_80240974_8654B4.s | 4 +- .../mgm_00/E0F980/func_802411E0_E0F980.s | 20 +- .../mim_04/B9D9D0/func_80240070_B9D9D0.s | 4 +- .../mim_07/BAA1B0/func_802400D8_BAA218.s | 4 +- .../nok_04/9EDBF0/func_80240814_9EE404.s | 72 +-- .../obk_08/BD3870/func_80240000_BD3870.s | 20 +- .../pra_29/D7CB70/func_802410B0_D7DC00.s | 8 +- .../trd_05/9AE700/func_80240020_9AE720.s | 16 +- .../trd_06/9B1AA0/func_80240310_9B1AA0.s | 20 +- .../tst_13/B1D760/func_8024013C_B1D89C.s | 24 +- asm/nonmatchings/world/world/func_80059F94.s | 34 +- include/common_structs.h | 10 +- include/variables.h | 6 + src/code_1b40_len_20b0.c | 11 +- src/code_8a160_len_700.c | 73 --- src/code_e79b0_len_1920.c | 18 +- tools/symbol_addrs.txt | 4 + undefined_syms_auto.txt | 4 +- 367 files changed, 6375 insertions(+), 6431 deletions(-) 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; From 74350fd1456d3271010f9d06929c1823020da1c4 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 13:10:31 +0900 Subject: [PATCH 06/12] more splitting of stuff --- tools/splat.yaml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/splat.yaml b/tools/splat.yaml index 1eac9f00e0..aeeee39da9 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -8423,12 +8423,25 @@ segments: - [0xE2B530, bin] # code - [0xE2BE40, bin] # code - [0xE2C930, bin] # code - - [0xE2D410, bin] # data + - [0xE2D410, bin] # data ___ - [0xE2D730, bin] # code - [0xE2E5F0, bin] # code - [0xE2EDE0, bin] # code - - [0xE31380, bin] # data - - [0xEA0900, bin] + - [0xE31380, bin] # data ___ + - [0xEA0900, bin] # code + - [0xEA0C10, bin] # code + - [0xEA36E0, bin] # code + - [0xEA3A80, bin] # data ___ + - [0xEA6FD0, bin] # code + - [0xEA7010, bin] # code + - [0xEA7320, bin] # code + - [0xEA7390, bin] # data ___ + - [0xEA8AE0, bin] # code + - [0xEAA810, bin] # data ___ + - [0xEB0E60, bin] # code + - [0xEB1170, bin] # code + - [0xEB1920, bin] # data ___ + - [0xEB5130, bin] # code - [0xF007C0, bin, Battle_Fanfare_02] # BGM start - [0xF02160, bin, Hey_You_03] - [0xF03740, bin, The_Goomba_King_s_Decree_07] From 8a29eaabcc1ed38e3cf1468a12b8963cf092c9b9 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 15:03:45 +0900 Subject: [PATCH 07/12] split everything up --- tools/splat.yaml | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tools/splat.yaml b/tools/splat.yaml index aeeee39da9..777307eee9 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -8442,6 +8442,68 @@ segments: - [0xEB1170, bin] # code - [0xEB1920, bin] # data ___ - [0xEB5130, bin] # code + - [0xEB5470, bin] # code + - [0xEB54C0, bin] # data ___ + - [0xEB7230, bin] # code + - [0xEB7540, bin] # code + - [0xEB7850, bin] # data ___ + - [0xEB8E50, bin] # code + - [0xEB8E90, bin] # code + - [0xEB9D90, bin] # code + - [0xEBA260, bin] # data ___ + - [0xEC2200, bin] # code + - [0xEC2240, bin] # code + - [0xEC2610, bin] # code + - [0xEC2850, bin] # data ___ + - [0xEC71B0, bin] # code + - [0xEC7590, bin] # code + - [0xEC78F0, bin] # data ___ + - [0xEC9D00, bin] # code + - [0xECAA40, bin] # code + - [0xECAA80, bin] # code + - [0xECB930, bin] # code + - [0xECBB70, bin] # code + - [0xECBC10, bin] # data ___ + - [0xECFFF0, bin] # code + - [0xED0030, bin] # code + - [0xED00D0, bin] # code + - [0xED0310, bin] # code + - [0xED1840, bin] # data ___ + - [0xED4220, bin] # code + - [0xED4260, bin] # code + - [0xED42A0, bin] # code + - [0xED46D0, bin] # code + - [0xED5540, bin] # code + - [0xED5780, bin] # data ___ + - [0xED8E20, bin] # code + - [0xED9170, bin] # data ___ + - [0xEDBFE0, bin] # code + - [0xEDC020, bin] # code + - [0xEDC6D0, bin] # data ___ + - [0xEDE9C0, bin] # code + - [0xEDEA00, bin] # code + - [0xEE2040, bin] # code + - [0xEE20E0, bin] # data ___ + - [0xEE65B0, bin] # code + - [0xEE70C0, bin] # code + - [0xEE8940, bin] # code + - [0xEE8970, bin] # data ___ + - [0xEED100, bin] # code + - [0xEED140, bin] # code + - [0xEED1E0, bin] # code + - [0xEEDF50, bin] # code + - [0xEEFAA0, bin] # code + - [0xEEFAD0, bin] # data ___ + - [0xEF2610, bin] # code + - [0xEF2650, bin] # code + - [0xEF2680, bin] # code + - [0xEF58E0, bin] # data ___ + - [0xEF7A80, bin] # code + - [0xEF7FB0, bin] # code + - [0xEF8010, bin] # code + - [0xEF8250, bin] # data ___ + - [0xEFEB00, bin] # code + - [0xEFF440, bin] # data ___ - [0xF007C0, bin, Battle_Fanfare_02] # BGM start - [0xF02160, bin, Hey_You_03] - [0xF03740, bin, The_Goomba_King_s_Decree_07] From 3bf7788bc4f198d8832181a069a178597f629312 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 15:58:17 +0900 Subject: [PATCH 08/12] some new :fish: --- .../code_102610_len_2330/func_802E0DE0.s | 2 +- .../code_102610_len_2330/func_802E2BA4.s | 14 +- .../code_104940_len_dc0/func_802E30C0.s | 2 +- .../code_105700_len_2130/func_802E455C.s | 2 +- .../code_107830_len_e70/func_802E61B0.s | 6 +- .../code_1086a0_len_fc0/func_802E6ED8.s | 2 +- .../code_109660_len_1270/func_802E854C.s | 12 +- .../code_121f0_len_1290/func_80037638.s | 16 +- .../code_121f0_len_1290/func_80037994.s | 4 +- .../code_121f0_len_1290/func_80037E14.s | 8 +- .../code_135EE0/pause_draw_rect.s | 8 +- .../code_135EE0/pause_textbox_draw_contents.s | 28 +- .../pause_tutorial_draw_contents.s | 32 +- .../code_138CC0/pause_badges_draw_contents.s | 114 ++-- .../code_13CAF0/pause_items_draw_contents.s | 86 +-- .../pause_partners_draw_contents.s | 114 ++-- .../code_13FD40/pause_spirits_draw_contents.s | 58 +-- .../code_140C70/pause_map_draw_contents.s | 70 +-- .../code_1421C0/pause_draw_menu_label.s | 2 +- asm/nonmatchings/code_163400/func_80243CCC.s | 2 +- asm/nonmatchings/code_163400/func_802440BC.s | 32 +- .../code_163400/pause_set_cursor_opacity.s | 8 +- asm/nonmatchings/code_168590/func_8024830C.s | 82 +-- asm/nonmatchings/code_169BE0/func_80249380.s | 6 +- asm/nonmatchings/code_16c8e0/func_8023F088.s | 56 +- .../code_1b40_len_20b0/func_800269EC.s | 4 +- .../code_1b40_len_20b0/func_80027E10.s | 16 +- .../code_1b40_len_20b0/gfx_draw_frame.s | 56 +- asm/nonmatchings/code_325AD0/func_E02000AC.s | 4 +- asm/nonmatchings/code_3278F0/func_E0002300.s | 20 +- asm/nonmatchings/code_328110/func_E000C798.s | 6 +- asm/nonmatchings/code_32C110/func_E000E288.s | 8 +- asm/nonmatchings/code_32C7A0/func_E0010510.s | 6 +- asm/nonmatchings/code_32DD10/func_E0012564.s | 2 +- asm/nonmatchings/code_32E490/func_E00144E0.s | 4 +- asm/nonmatchings/code_32EE30/func_E0016454.s | 2 +- asm/nonmatchings/code_32F580/func_E00183D8.s | 2 +- asm/nonmatchings/code_32FE30/func_E001A440.s | 2 +- asm/nonmatchings/code_330910/func_E001C30C.s | 4 +- asm/nonmatchings/code_331940/func_E001E730.s | 10 +- asm/nonmatchings/code_333EC0/func_E00205D0.s | 8 +- asm/nonmatchings/code_337240/func_E0022998.s | 2 +- asm/nonmatchings/code_339250/func_E0024454.s | 36 +- asm/nonmatchings/code_33B180/func_E00264F4.s | 8 +- asm/nonmatchings/code_33CDF0/func_E002852C.s | 4 +- asm/nonmatchings/code_33E8C0/func_E002A3C4.s | 4 +- asm/nonmatchings/code_33FE80/func_E002C414.s | 2 +- asm/nonmatchings/code_342140/func_E0030A68.s | 4 +- asm/nonmatchings/code_344A10/func_E0034310.s | 6 +- asm/nonmatchings/code_3454E0/func_E0036224.s | 4 +- asm/nonmatchings/code_34DD20/func_E0038748.s | 6 +- asm/nonmatchings/code_34EC80/func_E003A354.s | 12 +- asm/nonmatchings/code_34F4C0/func_E003C498.s | 8 +- asm/nonmatchings/code_352440/func_E003E638.s | 4 +- asm/nonmatchings/code_353300/func_E0040348.s | 36 +- asm/nonmatchings/code_3547A0/func_E00423B8.s | 6 +- asm/nonmatchings/code_354F60/func_E004491C.s | 20 +- asm/nonmatchings/code_355EE0/func_E00462C0.s | 4 +- asm/nonmatchings/code_356980/func_E0048218.s | 108 ++-- asm/nonmatchings/code_3584C0/func_E004A78C.s | 18 +- asm/nonmatchings/code_359F20/func_E004C3A8.s | 6 +- asm/nonmatchings/code_35B9D0/func_E004E214.s | 10 +- asm/nonmatchings/code_35BFD0/func_E0050308.s | 4 +- asm/nonmatchings/code_35CA80/func_E0052460.s | 8 +- asm/nonmatchings/code_35DA00/func_E0056BD0.s | 6 +- asm/nonmatchings/code_3602C0/func_E005A3F4.s | 6 +- asm/nonmatchings/code_360F40/func_E005C2F8.s | 6 +- asm/nonmatchings/code_363160/func_E0060450.s | 2 +- asm/nonmatchings/code_364300/func_E00624EC.s | 6 +- asm/nonmatchings/code_364F10/func_E0064414.s | 16 +- asm/nonmatchings/code_366030/func_E0066770.s | 6 +- asm/nonmatchings/code_36A8D0/func_E0068234.s | 4 +- asm/nonmatchings/code_36D020/func_E006A85C.s | 8 +- asm/nonmatchings/code_36D020/func_E006A94C.s | 14 +- asm/nonmatchings/code_36E1D0/func_E006C5E8.s | 20 +- asm/nonmatchings/code_372790/func_E006E764.s | 10 +- asm/nonmatchings/code_3740B0/func_E0070740.s | 10 +- asm/nonmatchings/code_374E50/func_E00723D4.s | 10 +- asm/nonmatchings/code_376460/func_E00745E0.s | 10 +- asm/nonmatchings/code_377070/func_E007685C.s | 30 +- asm/nonmatchings/code_37A3F0/func_E007827C.s | 58 +-- asm/nonmatchings/code_37C540/func_E007A88C.s | 2 +- asm/nonmatchings/code_37D490/func_E007C1F4.s | 14 +- asm/nonmatchings/code_37F720/func_E007E54C.s | 6 +- asm/nonmatchings/code_3812C0/func_E0080448.s | 8 +- asm/nonmatchings/code_385640/func_E00828B4.s | 2 +- asm/nonmatchings/code_385640/func_E0082A84.s | 6 +- asm/nonmatchings/code_3889D0/func_E0084928.s | 8 +- asm/nonmatchings/code_389850/func_E00863B4.s | 14 +- asm/nonmatchings/code_38DE00/func_E008C6FC.s | 8 +- asm/nonmatchings/code_38EE60/func_E008E4E0.s | 8 +- asm/nonmatchings/code_38F900/func_E0090444.s | 42 +- asm/nonmatchings/code_391D30/func_E00922A0.s | 10 +- asm/nonmatchings/code_3928D0/func_E00942FC.s | 8 +- asm/nonmatchings/code_394280/func_E00961BC.s | 2 +- asm/nonmatchings/code_395BB0/func_E00982EC.s | 6 +- asm/nonmatchings/code_3965B0/func_E009A3E0.s | 58 +-- asm/nonmatchings/code_3981F0/func_E009C220.s | 14 +- asm/nonmatchings/code_39FF20/func_E009E424.s | 18 +- asm/nonmatchings/code_3A2290/func_E00A0000.s | 2 +- asm/nonmatchings/code_3A2990/func_E00A223C.s | 52 +- asm/nonmatchings/code_3A37E0/func_E00A4650.s | 2 +- asm/nonmatchings/code_3A5550/func_E00A63A4.s | 8 +- asm/nonmatchings/code_3A70F0/func_E00A8320.s | 4 +- asm/nonmatchings/code_3AA920/func_E00AA404.s | 10 +- asm/nonmatchings/code_3AEE20/func_E00AC2A4.s | 10 +- asm/nonmatchings/code_3B2350/func_E00AE54C.s | 6 +- asm/nonmatchings/code_3B3EB0/func_E00B0234.s | 16 +- asm/nonmatchings/code_3B4790/func_E00B24B0.s | 56 +- asm/nonmatchings/code_3B5CF0/func_E00B457C.s | 62 +-- asm/nonmatchings/code_3B7160/func_E00B62E0.s | 14 +- asm/nonmatchings/code_3B7B80/func_E00B8208.s | 16 +- asm/nonmatchings/code_3B8BD0/func_E00BA620.s | 6 +- asm/nonmatchings/code_3BA030/func_E00BC374.s | 92 ++-- asm/nonmatchings/code_3BBF60/func_E00BE5BC.s | 4 +- asm/nonmatchings/code_3BCD60/func_E00C0760.s | 2 +- asm/nonmatchings/code_3C11D0/func_E00C221C.s | 36 +- asm/nonmatchings/code_3CADF0/func_E00C4308.s | 22 +- asm/nonmatchings/code_3CC9E0/func_E00C67B0.s | 16 +- asm/nonmatchings/code_3CF3A0/func_E00C8454.s | 12 +- asm/nonmatchings/code_3D0500/func_E00CA4CC.s | 70 +-- asm/nonmatchings/code_3D1690/func_E00CC9D0.s | 2 +- asm/nonmatchings/code_3D2AC0/func_E00CE478.s | 52 +- asm/nonmatchings/code_3D3E20/func_E00D048C.s | 26 +- asm/nonmatchings/code_3D4970/func_E00D2284.s | 4 +- asm/nonmatchings/code_3D5020/func_E00D6980.s | 8 +- asm/nonmatchings/code_3D67C0/func_E00D8334.s | 20 +- asm/nonmatchings/code_3D67C0/func_E00D8630.s | 16 +- asm/nonmatchings/code_3D7240/func_E00DA230.s | 6 +- asm/nonmatchings/code_3D7A70/func_E00DC304.s | 8 +- asm/nonmatchings/code_3D8720/func_E00DE2A8.s | 32 +- asm/nonmatchings/code_3DB460/func_E00E0600.s | 8 +- asm/nonmatchings/code_3DC310/func_E00E2218.s | 20 +- asm/nonmatchings/code_3DE000/func_E00E495C.s | 18 +- asm/nonmatchings/code_3E0930/func_E00E6524.s | 6 +- asm/nonmatchings/code_3E1690/func_E00E83BC.s | 6 +- asm/nonmatchings/code_3E1EE0/func_E00EA66C.s | 12 +- asm/nonmatchings/code_3E43A0/func_E010A4E8.s | 116 ++--- asm/nonmatchings/code_3E54C0/func_E010C39C.s | 16 +- asm/nonmatchings/code_3EB4E0/func_E010E000.s | 48 +- asm/nonmatchings/code_3EB4E0/func_E010E558.s | 8 +- asm/nonmatchings/code_3F83F0/func_E01103EC.s | 18 +- asm/nonmatchings/code_3F9E50/func_E0112330.s | 2 +- asm/nonmatchings/code_3F9E50/func_E01124CC.s | 2 +- asm/nonmatchings/code_3FEAE0/func_E0114388.s | 6 +- asm/nonmatchings/code_402640/func_E01166E8.s | 2 +- asm/nonmatchings/code_402640/func_E0116884.s | 26 +- asm/nonmatchings/code_403400/func_E011849C.s | 2 +- asm/nonmatchings/code_404220/func_E011A48C.s | 16 +- asm/nonmatchings/code_404220/func_E011A700.s | 54 +- asm/nonmatchings/code_406B40/func_E011C1C4.s | 6 +- asm/nonmatchings/code_409990/func_E011E578.s | 4 +- asm/nonmatchings/code_40B3F0/func_E01203E4.s | 4 +- asm/nonmatchings/code_40C5A0/func_E012270C.s | 10 +- asm/nonmatchings/code_412730/func_E01244C4.s | 18 +- asm/nonmatchings/code_413360/func_E01264EC.s | 6 +- asm/nonmatchings/code_415D90/func_802A3C98.s | 68 +-- asm/nonmatchings/code_415D90/func_802A5290.s | 38 +- .../code_6e40_len_500/render_curtains.s | 38 +- .../code_80850_len_3060/update_status_menu.s | 108 ++-- asm/nonmatchings/code_8560/render_frame.s | 56 +- asm/nonmatchings/code_8560/update_cameras.s | 34 +- .../code_8a160_len_700/func_800F102C.s | 10 +- .../code_8a860_len_3f30/func_800F3680.s | 144 ++--- .../code_8e790_len_2850/draw_box.s | 74 +-- .../code_B9D60/_draw_message_box.s | 12 +- .../code_B9D60/appendGfx_item_entity.s | 20 +- .../code_B9D60/draw_coin_sparkles.s | 6 +- asm/nonmatchings/code_B9D60/draw_number.s | 2 +- asm/nonmatchings/code_B9D60/func_80126790.s | 32 +- asm/nonmatchings/code_B9D60/func_80126F78.s | 48 +- asm/nonmatchings/code_B9D60/func_80127D90.s | 490 +++++++++--------- asm/nonmatchings/code_B9D60/func_8012C324.s | 30 +- asm/nonmatchings/code_B9D60/func_8012D3DC.s | 86 +-- asm/nonmatchings/code_B9D60/func_8012DB58.s | 4 +- asm/nonmatchings/code_B9D60/func_8012EC94.s | 6 +- asm/nonmatchings/code_B9D60/func_8012F500.s | 74 +-- asm/nonmatchings/code_B9D60/func_8012FE78.s | 86 +-- .../code_B9D60/render_item_entities.s | 18 +- asm/nonmatchings/code_B9D60/render_messages.s | 2 +- .../code_E225B0/func_802B7000_E225B0.s | 2 +- .../code_E2B530/func_802BAE00_E2B530.s | 149 ++++++ .../code_E2B530/func_802BB044_E2B774.s | 114 ++++ .../code_E2B530/func_802BB1E8_E2B918.s | 284 ++++++++++ .../code_E2B530/func_802BB62C_E2BD5C.s | 18 + .../code_E2B530/func_802BB664_E2BD94.s | 18 + .../code_E2B530/func_802BB69C_E2BDCC.s | 18 + .../code_E2B530/func_802BB6D4_E2BE04.s | 19 + .../code_E2BE40/func_802BB710_E2BE40.s | 94 ++++ .../code_E2BE40/func_802BB870_E2BFA0.s | 17 + .../code_E2BE40/func_802BB8A4_E2BFD4.s | 382 ++++++++++++++ .../code_E2BE40/func_802BBE3C_E2C56C.s | 202 ++++++++ .../code_E2BE40/func_802BC148_E2C878.s | 30 ++ .../code_E2BE40/func_802BC1A8_E2C8D8.s | 27 + .../code_E2C930/func_802BC200_E2C930.s | 114 ++++ .../code_E2C930/func_802BC3A8_E2CAD8.s | 17 + .../code_E2C930/func_802BC3DC_E2CB0C.s | 382 ++++++++++++++ .../code_E2C930/func_802BC974_E2D0A4.s | 202 ++++++++ .../code_E2C930/func_802BCC80_E2D3B0.s | 29 ++ .../code_E2D730/func_802BAE00_E2D730.s | 133 +++++ .../code_E2D730/func_802BB000_E2D930.s | 46 ++ .../code_E2D730/func_802BB0A0_E2D9D0.s | 107 ++++ .../code_E2D730/func_802BB228_E2DB58.s | 33 ++ .../code_E2D730/func_802BB298_E2DBC8.s | 36 ++ .../code_E2D730/func_802BB314_E2DC44.s | 18 + .../code_E2D730/func_802BB34C_E2DC7C.s | 14 + .../code_E2D730/func_802BB374_E2DCA4.s | 185 +++++++ .../code_E2D730/func_802BB648_E2DF78.s | 43 ++ .../code_E2D730/func_802BB6E0_E2E010.s | 42 ++ .../code_E2D730/func_802BB778_E2E0A8.s | 9 + .../code_E2D730/func_802BB78C_E2E0BC.s | 92 ++++ .../code_E2D730/func_802BB8D4_E2E204.s | 50 ++ .../code_E2D730/func_802BB98C_E2E2BC.s | 25 + .../code_E2D730/func_802BB9E0_E2E310.s | 193 +++++++ .../code_E2E5F0/func_802BBCC0_E2E5F0.s | 28 + .../code_E2E5F0/func_802BBD1C_E2E64C.s | 28 + .../code_E2E5F0/func_802BBD78_E2E6A8.s | 73 +++ .../code_E2E5F0/func_802BBE8C_E2E7BC.s | 101 ++++ .../code_E2E5F0/func_802BC00C_E2E93C.s | 21 + .../code_E2E5F0/func_802BC050_E2E980.s | 31 ++ .../code_E2E5F0/func_802BC0B8_E2E9E8.s | 18 + .../code_E2E5F0/func_802BC0F0_E2EA20.s | 39 ++ .../code_E2E5F0/func_802BC17C_E2EAAC.s | 25 + .../code_E2E5F0/func_802BC1D0_E2EB00.s | 24 + .../code_E2E5F0/func_802BC220_E2EB50.s | 16 + .../code_E2E5F0/func_802BC250_E2EB80.s | 13 + .../code_E2E5F0/func_802BC274_E2EBA4.s | 20 + .../code_E2E5F0/func_802BC2B4_E2EBE4.s | 25 + .../code_E2E5F0/func_802BC308_E2EC38.s | 13 + .../code_E2E5F0/func_802BC32C_E2EC5C.s | 15 + .../code_E2E5F0/func_802BC358_E2EC88.s | 13 + .../code_E2E5F0/func_802BC37C_E2ECAC.s | 13 + .../code_E2E5F0/func_802BC3A0_E2ECD0.s | 15 + .../code_E2E5F0/func_802BC3CC_E2ECFC.s | 10 + .../code_E2E5F0/func_802BC3E4_E2ED14.s | 57 ++ .../code_E2EDE0/func_802BC4B0_E2EDE0.s | 98 ++++ .../code_E2EDE0/func_802BC628_E2EF58.s | 6 + .../code_E2EDE0/func_802BC630_E2EF60.s | 14 + .../code_E2EDE0/func_802BC658_E2EF88.s | 23 + .../code_E2F750/func_802BAE00_E2F750.s | 102 ++++ .../code_E2F750/func_802BAF84_E2F8D4.s | 102 ++++ .../code_E2F750/func_802BB108_E2FA58.s | 176 +++++++ .../code_E2F750/func_802BB3B8_E2FD08.s | 215 ++++++++ .../code_E2F750/func_802BB704_E30054.s | 32 ++ .../code_E2F750/func_802BB76C_E300BC.s | 35 ++ .../code_E2F750/func_802BB7E0_E30130.s | 75 +++ .../code_E2F750/func_802BB8E4_E30234.s | 103 ++++ .../code_E2F750/func_802BBA60_E303B0.s | 230 ++++++++ .../code_E2F750/func_802BBDB8_E30708.s | 28 + .../code_E2F750/func_802BBE14_E30764.s | 27 + .../code_E2F750/func_802BBE70_E307C0.s | 279 ++++++++++ .../code_E2F750/func_802BC2BC_E30C0C.s | 137 +++++ .../code_E2F750/func_802BC4B8_E30E08.s | 28 + .../code_E2F750/func_802BC514_E30E64.s | 22 + .../code_E2F750/func_802BC558_E30EA8.s | 10 + .../code_E2F750/func_802BC570_E30EC0.s | 279 ++++++++++ .../code_E2F750/func_802BC99C_E312EC.s | 17 + .../code_E2F750/func_802BC9CC_E3131C.s | 17 + .../code_E2F750/func_802BC9FC_E3134C.s | 17 + .../code_a5dd0_len_114e0/appendGfx_model.s | 56 +- .../code_a5dd0_len_114e0/func_80116698.s | 22 +- .../code_a5dd0_len_114e0/func_80117E74.s | 22 +- .../code_a5dd0_len_114e0/func_8011C80C.s | 100 ++-- .../code_a5dd0_len_114e0/func_8011CFBC.s | 92 ++-- .../code_a5dd0_len_114e0/func_8011D9B8.s | 10 +- .../code_a5dd0_len_114e0/func_8011F4D4.s | 10 +- .../code_a5dd0_len_114e0/func_8011FA54.s | 10 +- .../code_b72b0_len_15ed0/func_80121184.s | 14 +- .../code_b72b0_len_15ed0/func_80122288.s | 12 +- .../code_cd180_len_38f0/func_80136A80.s | 60 +-- .../code_cd180_len_38f0/func_80138740.s | 6 +- .../code_cd180_len_38f0/func_80138E54.s | 110 ++-- .../code_cd180_len_38f0/func_80139F10.s | 68 +-- .../code_d0a70_len_4fe0/func_8013A4D0.s | 8 +- .../code_d0a70_len_4fe0/func_8013B1B0.s | 44 +- .../code_d0a70_len_4fe0/func_8013C3F0.s | 208 ++++---- .../code_d0a70_len_4fe0/func_8013CFA8.s | 8 +- .../code_d0a70_len_4fe0/func_8013DAB4.s | 6 +- .../code_d0a70_len_4fe0/func_8013E2F0.s | 8 +- .../code_d0a70_len_4fe0/func_8013E904.s | 16 +- .../code_d5a50_len_5fd0/draw_menu_icon.s | 22 +- .../code_d5a50_len_5fd0/func_8013F704.s | 56 +- .../code_d5a50_len_5fd0/func_80142210.s | 24 +- .../code_d5a50_len_5fd0/func_8014271C.s | 22 +- .../code_d5a50_len_5fd0/func_80143C48.s | 8 +- .../code_d5a50_len_5fd0/render_menu_icon.s | 40 +- .../code_d5a50_len_5fd0/render_menu_icons.s | 4 +- .../code_dc470_len_14c0/func_80145EC0.s | 76 +-- .../code_de740_len_23f0/func_801489B8.s | 126 ++--- .../code_de740_len_23f0/func_801491E4.s | 2 +- .../code_f270_len_1190/func_800343A4.s | 6 +- .../code_fee30_len_2d60/func_802DC008.s | 4 +- .../spr_appendMDL_component.s | 16 +- src/code_E2B530.c | 15 + src/code_E2BE40.c | 13 + src/code_E2C930.c | 11 + src/code_E2D730.c | 31 ++ src/code_E2E5F0.c | 43 ++ src/code_E2EDE0.c | 9 + src/code_E2F750.c | 41 ++ tools/splat.yaml | 36 +- tools/symbol_addrs.txt | 2 +- undefined_syms_auto.txt | 62 ++- 303 files changed, 8859 insertions(+), 2822 deletions(-) create mode 100644 asm/nonmatchings/code_E2B530/func_802BAE00_E2B530.s create mode 100644 asm/nonmatchings/code_E2B530/func_802BB044_E2B774.s create mode 100644 asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s create mode 100644 asm/nonmatchings/code_E2B530/func_802BB62C_E2BD5C.s create mode 100644 asm/nonmatchings/code_E2B530/func_802BB664_E2BD94.s create mode 100644 asm/nonmatchings/code_E2B530/func_802BB69C_E2BDCC.s create mode 100644 asm/nonmatchings/code_E2B530/func_802BB6D4_E2BE04.s create mode 100644 asm/nonmatchings/code_E2BE40/func_802BB710_E2BE40.s create mode 100644 asm/nonmatchings/code_E2BE40/func_802BB870_E2BFA0.s create mode 100644 asm/nonmatchings/code_E2BE40/func_802BB8A4_E2BFD4.s create mode 100644 asm/nonmatchings/code_E2BE40/func_802BBE3C_E2C56C.s create mode 100644 asm/nonmatchings/code_E2BE40/func_802BC148_E2C878.s create mode 100644 asm/nonmatchings/code_E2BE40/func_802BC1A8_E2C8D8.s create mode 100644 asm/nonmatchings/code_E2C930/func_802BC200_E2C930.s create mode 100644 asm/nonmatchings/code_E2C930/func_802BC3A8_E2CAD8.s create mode 100644 asm/nonmatchings/code_E2C930/func_802BC3DC_E2CB0C.s create mode 100644 asm/nonmatchings/code_E2C930/func_802BC974_E2D0A4.s create mode 100644 asm/nonmatchings/code_E2C930/func_802BCC80_E2D3B0.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BAE00_E2D730.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB0A0_E2D9D0.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB228_E2DB58.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB298_E2DBC8.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB314_E2DC44.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB34C_E2DC7C.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB374_E2DCA4.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB648_E2DF78.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB6E0_E2E010.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB778_E2E0A8.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB78C_E2E0BC.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB8D4_E2E204.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB98C_E2E2BC.s create mode 100644 asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BBCC0_E2E5F0.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BBD1C_E2E64C.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BBD78_E2E6A8.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BBE8C_E2E7BC.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC00C_E2E93C.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC050_E2E980.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC0B8_E2E9E8.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC0F0_E2EA20.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC17C_E2EAAC.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC1D0_E2EB00.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC220_E2EB50.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC250_E2EB80.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC274_E2EBA4.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC2B4_E2EBE4.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC308_E2EC38.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC32C_E2EC5C.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC358_E2EC88.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC37C_E2ECAC.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC3A0_E2ECD0.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC3CC_E2ECFC.s create mode 100644 asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s create mode 100644 asm/nonmatchings/code_E2EDE0/func_802BC4B0_E2EDE0.s create mode 100644 asm/nonmatchings/code_E2EDE0/func_802BC628_E2EF58.s create mode 100644 asm/nonmatchings/code_E2EDE0/func_802BC630_E2EF60.s create mode 100644 asm/nonmatchings/code_E2EDE0/func_802BC658_E2EF88.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BAE00_E2F750.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BAF84_E2F8D4.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BB108_E2FA58.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BB3B8_E2FD08.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BB704_E30054.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BB76C_E300BC.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BB7E0_E30130.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BB8E4_E30234.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BBDB8_E30708.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BBE14_E30764.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BBE70_E307C0.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BC2BC_E30C0C.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BC4B8_E30E08.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BC514_E30E64.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BC558_E30EA8.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BC99C_E312EC.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BC9CC_E3131C.s create mode 100644 asm/nonmatchings/code_E2F750/func_802BC9FC_E3134C.s create mode 100644 src/code_E2B530.c create mode 100644 src/code_E2BE40.c create mode 100644 src/code_E2C930.c create mode 100644 src/code_E2D730.c create mode 100644 src/code_E2E5F0.c create mode 100644 src/code_E2EDE0.c create mode 100644 src/code_E2F750.c diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s b/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s index 2060e46a0a..4d0d02c248 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s @@ -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 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s b/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s index f55f1b92fb..8ba2741900 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E2BA4.s @@ -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 @@ -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 b278b9f0b3..93a7ee397d 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s @@ -8,7 +8,7 @@ glabel func_802E30C0 /* 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 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E455C.s b/asm/nonmatchings/code_105700_len_2130/func_802E455C.s index cfc43b3f29..c429a469b2 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E455C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E455C.s @@ -8,7 +8,7 @@ glabel func_802E455C /* 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 diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s b/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s index eacbfc76dd..ff1974e290 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 @@ -92,7 +92,7 @@ glabel func_802E61B0 /* 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 602c0e3700..fee39308f6 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s @@ -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 diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E854C.s b/asm/nonmatchings/code_109660_len_1270/func_802E854C.s index 8319a5a00d..28f5e45f2a 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E854C.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E854C.s @@ -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 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037638.s b/asm/nonmatchings/code_121f0_len_1290/func_80037638.s index b3ef050284..0e672b1160 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,15 +48,15 @@ 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 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037994.s b/asm/nonmatchings/code_121f0_len_1290/func_80037994.s index ba7fe6188b..df0de7233c 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037994.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037994.s @@ -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 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s b/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s index e17aa96af1..bfc8f95315 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s @@ -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) @@ -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 6dc62c141e..c7369c62ac 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,7 +22,7 @@ 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 +/* 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) @@ -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 3480a14fba..6460e8f5dc 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,7 +48,7 @@ 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(gMasterGfxPos) @@ -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 5cb39cd61b..26b7cce4e0 100644 --- a/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s @@ -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 @@ -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_138CC0/pause_badges_draw_contents.s b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s index e08e8bc379..40c329876b 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 @@ -127,10 +127,10 @@ glabel pause_badges_draw_contents /* 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 @@ -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 @@ -765,9 +765,9 @@ 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 @@ -818,7 +818,7 @@ 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(gMasterGfxPos) /* 13B468 80248128 8C42A66C */ lw $v0, %lo(gMasterGfxPos)($v0) @@ -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 @@ -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) @@ -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 @@ -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 bf12d4f582..3b6a3f20f1 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 @@ -111,10 +111,10 @@ glabel pause_items_draw_contents /* 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) @@ -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 52ab98e1ba..3296dca062 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s +++ b/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s @@ -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 @@ -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(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 @@ -747,10 +747,10 @@ glabel pause_partners_draw_contents /* 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 910c6f3683..40d3a91714 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s @@ -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 @@ -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 1c36e963a6..912d5c1fa7 100644 --- a/asm/nonmatchings/code_140C70/pause_map_draw_contents.s +++ b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s @@ -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 @@ -187,12 +187,12 @@ glabel pause_map_draw_contents /* 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,7 +444,7 @@ 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 +/* 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 @@ -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 @@ -583,10 +583,10 @@ glabel pause_map_draw_contents /* 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 07edf96df2..bfd2f1e35d 100644 --- a/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s +++ b/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s @@ -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 9b018c4370..8fb9f1c8fe 100644 --- a/asm/nonmatchings/code_163400/func_80243CCC.s +++ b/asm/nonmatchings/code_163400/func_80243CCC.s @@ -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_802440BC.s b/asm/nonmatchings/code_163400/func_802440BC.s index fd7ed13784..5c87aeb3c0 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 diff --git a/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s b/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s index 315205be0b..a78cbd6abc 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,7 +22,7 @@ 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 +/* 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) @@ -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 04f845603b..28b82d3335 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 @@ -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(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 2809dd9be5..dec5f4afdb 100644 --- a/asm/nonmatchings/code_169BE0/func_80249380.s +++ b/asm/nonmatchings/code_169BE0/func_80249380.s @@ -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 @@ -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 452ac0cc6b..d73aa716d5 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) @@ -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 @@ -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) diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s b/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s index ef6c89865e..aa9d609b97 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s @@ -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,7 +54,7 @@ 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 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s index 25f79c3a57..68d2f80265 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s @@ -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 @@ -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) @@ -521,7 +521,7 @@ 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 @@ -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 f6aedcc8eb..bb1f6de537 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s +++ b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s @@ -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,59 +83,59 @@ 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 @@ -153,7 +153,7 @@ 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(gMasterGfxPos) diff --git a/asm/nonmatchings/code_325AD0/func_E02000AC.s b/asm/nonmatchings/code_325AD0/func_E02000AC.s index 43180f5cda..3856c32c6c 100644 --- a/asm/nonmatchings/code_325AD0/func_E02000AC.s +++ b/asm/nonmatchings/code_325AD0/func_E02000AC.s @@ -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 3a342952ee..4f02fa7d29 100644 --- a/asm/nonmatchings/code_3278F0/func_E0002300.s +++ b/asm/nonmatchings/code_3278F0/func_E0002300.s @@ -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) diff --git a/asm/nonmatchings/code_328110/func_E000C798.s b/asm/nonmatchings/code_328110/func_E000C798.s index 8206bdb1be..717fb8b36d 100644 --- a/asm/nonmatchings/code_328110/func_E000C798.s +++ b/asm/nonmatchings/code_328110/func_E000C798.s @@ -195,7 +195,7 @@ 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 +/* 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) @@ -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 14122355b5..6e30e654f0 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 @@ -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 a5a636d8be..7e64d8a0ec 100644 --- a/asm/nonmatchings/code_32C7A0/func_E0010510.s +++ b/asm/nonmatchings/code_32C7A0/func_E0010510.s @@ -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 ee99137c64..3b330df785 100644 --- a/asm/nonmatchings/code_32DD10/func_E0012564.s +++ b/asm/nonmatchings/code_32DD10/func_E0012564.s @@ -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 d6c433c04b..65a7da9137 100644 --- a/asm/nonmatchings/code_32E490/func_E00144E0.s +++ b/asm/nonmatchings/code_32E490/func_E00144E0.s @@ -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 fb40b27857..d113fb2aeb 100644 --- a/asm/nonmatchings/code_32EE30/func_E0016454.s +++ b/asm/nonmatchings/code_32EE30/func_E0016454.s @@ -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 c2a3a117a1..448be0b915 100644 --- a/asm/nonmatchings/code_32F580/func_E00183D8.s +++ b/asm/nonmatchings/code_32F580/func_E00183D8.s @@ -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 c7936fae69..5f933d86c1 100644 --- a/asm/nonmatchings/code_32FE30/func_E001A440.s +++ b/asm/nonmatchings/code_32FE30/func_E001A440.s @@ -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 216f4ad6e3..9a8496620f 100644 --- a/asm/nonmatchings/code_330910/func_E001C30C.s +++ b/asm/nonmatchings/code_330910/func_E001C30C.s @@ -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 be5b4db071..8a29f110c3 100644 --- a/asm/nonmatchings/code_331940/func_E001E730.s +++ b/asm/nonmatchings/code_331940/func_E001E730.s @@ -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 @@ -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 @@ -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 106c761202..9f1b1584e3 100644 --- a/asm/nonmatchings/code_333EC0/func_E00205D0.s +++ b/asm/nonmatchings/code_333EC0/func_E00205D0.s @@ -261,7 +261,7 @@ 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(gMasterGfxPos) @@ -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,7 +379,7 @@ glabel func_E00205D0 /* 334A44 E0020B84 AFA900A0 */ sw $t1, 0xa0($sp) .LE0020B88: /* 334A48 E0020B88 10E0000A */ beqz $a3, .LE0020BB4 -/* 334A4C E0020B8C 00000000 */ nop +/* 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) diff --git a/asm/nonmatchings/code_337240/func_E0022998.s b/asm/nonmatchings/code_337240/func_E0022998.s index 05084da748..dcb61d705f 100644 --- a/asm/nonmatchings/code_337240/func_E0022998.s +++ b/asm/nonmatchings/code_337240/func_E0022998.s @@ -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 7aab9ecad4..0f039c63a6 100644 --- a/asm/nonmatchings/code_339250/func_E0024454.s +++ b/asm/nonmatchings/code_339250/func_E0024454.s @@ -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,14 +92,14 @@ 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(gMatrixListPos) @@ -112,13 +112,13 @@ glabel func_E0024454 /* 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: @@ -207,11 +207,11 @@ glabel func_E0024454 /* 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 @@ -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 @@ -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) @@ -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) @@ -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 ee7170d8df..530bb34491 100644 --- a/asm/nonmatchings/code_33B180/func_E00264F4.s +++ b/asm/nonmatchings/code_33B180/func_E00264F4.s @@ -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 @@ -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 @@ -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 f6824e27e1..b7fc9b716c 100644 --- a/asm/nonmatchings/code_33CDF0/func_E002852C.s +++ b/asm/nonmatchings/code_33CDF0/func_E002852C.s @@ -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 bd5bd54a7a..ec018c5c47 100644 --- a/asm/nonmatchings/code_33E8C0/func_E002A3C4.s +++ b/asm/nonmatchings/code_33E8C0/func_E002A3C4.s @@ -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 010923fdb0..462c55b9b2 100644 --- a/asm/nonmatchings/code_33FE80/func_E002C414.s +++ b/asm/nonmatchings/code_33FE80/func_E002C414.s @@ -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_342140/func_E0030A68.s b/asm/nonmatchings/code_342140/func_E0030A68.s index b4d1994293..ab9f29403d 100644 --- a/asm/nonmatchings/code_342140/func_E0030A68.s +++ b/asm/nonmatchings/code_342140/func_E0030A68.s @@ -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_344A10/func_E0034310.s b/asm/nonmatchings/code_344A10/func_E0034310.s index 9ca9184c63..c2ce51fa6a 100644 --- a/asm/nonmatchings/code_344A10/func_E0034310.s +++ b/asm/nonmatchings/code_344A10/func_E0034310.s @@ -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 7701491fca..63280ca9e7 100644 --- a/asm/nonmatchings/code_3454E0/func_E0036224.s +++ b/asm/nonmatchings/code_3454E0/func_E0036224.s @@ -21,7 +21,7 @@ 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(gMasterGfxPos) @@ -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 diff --git a/asm/nonmatchings/code_34DD20/func_E0038748.s b/asm/nonmatchings/code_34DD20/func_E0038748.s index e370db410a..7016fbc1f5 100644 --- a/asm/nonmatchings/code_34DD20/func_E0038748.s +++ b/asm/nonmatchings/code_34DD20/func_E0038748.s @@ -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 9c20c1bf55..52043d657a 100644 --- a/asm/nonmatchings/code_34EC80/func_E003A354.s +++ b/asm/nonmatchings/code_34EC80/func_E003A354.s @@ -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) @@ -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 8d0f1ad144..1cf711f0c2 100644 --- a/asm/nonmatchings/code_34F4C0/func_E003C498.s +++ b/asm/nonmatchings/code_34F4C0/func_E003C498.s @@ -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) @@ -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 1de085138a..f63b7a1d3a 100644 --- a/asm/nonmatchings/code_352440/func_E003E638.s +++ b/asm/nonmatchings/code_352440/func_E003E638.s @@ -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 171557c167..361fc39e7a 100644 --- a/asm/nonmatchings/code_353300/func_E0040348.s +++ b/asm/nonmatchings/code_353300/func_E0040348.s @@ -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 @@ -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 d924682276..09d91d79c0 100644 --- a/asm/nonmatchings/code_3547A0/func_E00423B8.s +++ b/asm/nonmatchings/code_3547A0/func_E00423B8.s @@ -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 2299244f48..aff1252c22 100644 --- a/asm/nonmatchings/code_354F60/func_E004491C.s +++ b/asm/nonmatchings/code_354F60/func_E004491C.s @@ -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 @@ -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) @@ -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 diff --git a/asm/nonmatchings/code_355EE0/func_E00462C0.s b/asm/nonmatchings/code_355EE0/func_E00462C0.s index 4fb63c88ca..2243967ef3 100644 --- a/asm/nonmatchings/code_355EE0/func_E00462C0.s +++ b/asm/nonmatchings/code_355EE0/func_E00462C0.s @@ -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 @@ -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 diff --git a/asm/nonmatchings/code_356980/func_E0048218.s b/asm/nonmatchings/code_356980/func_E0048218.s index 43b36282ef..4ba4a220d3 100644 --- a/asm/nonmatchings/code_356980/func_E0048218.s +++ b/asm/nonmatchings/code_356980/func_E0048218.s @@ -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) @@ -138,15 +138,15 @@ 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: @@ -160,74 +160,74 @@ 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(gMasterGfxPos) @@ -244,74 +244,74 @@ 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(gMasterGfxPos) @@ -330,24 +330,24 @@ 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(gMasterGfxPos) @@ -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,7 +404,7 @@ 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: @@ -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 2c3c7fdd7d..ea3bda4133 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A78C.s +++ b/asm/nonmatchings/code_3584C0/func_E004A78C.s @@ -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 @@ -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,7 +273,7 @@ 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) @@ -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 @@ -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 06fe0ff96d..d8be8a601c 100644 --- a/asm/nonmatchings/code_359F20/func_E004C3A8.s +++ b/asm/nonmatchings/code_359F20/func_E004C3A8.s @@ -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 646d8810c7..d9698154b5 100644 --- a/asm/nonmatchings/code_35B9D0/func_E004E214.s +++ b/asm/nonmatchings/code_35B9D0/func_E004E214.s @@ -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) @@ -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 85de0aa212..ec4cac4714 100644 --- a/asm/nonmatchings/code_35BFD0/func_E0050308.s +++ b/asm/nonmatchings/code_35BFD0/func_E0050308.s @@ -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 @@ -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 87feea8984..8484bc716c 100644 --- a/asm/nonmatchings/code_35CA80/func_E0052460.s +++ b/asm/nonmatchings/code_35CA80/func_E0052460.s @@ -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 988302f678..bb345c3d0a 100644 --- a/asm/nonmatchings/code_35DA00/func_E0056BD0.s +++ b/asm/nonmatchings/code_35DA00/func_E0056BD0.s @@ -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_3602C0/func_E005A3F4.s b/asm/nonmatchings/code_3602C0/func_E005A3F4.s index 3196ddc813..fc74035f74 100644 --- a/asm/nonmatchings/code_3602C0/func_E005A3F4.s +++ b/asm/nonmatchings/code_3602C0/func_E005A3F4.s @@ -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 6329f13885..23ef011713 100644 --- a/asm/nonmatchings/code_360F40/func_E005C2F8.s +++ b/asm/nonmatchings/code_360F40/func_E005C2F8.s @@ -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) diff --git a/asm/nonmatchings/code_363160/func_E0060450.s b/asm/nonmatchings/code_363160/func_E0060450.s index 2182aba9e0..f1fe7b83ca 100644 --- a/asm/nonmatchings/code_363160/func_E0060450.s +++ b/asm/nonmatchings/code_363160/func_E0060450.s @@ -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 3ccfae4cb4..06ff4c36f8 100644 --- a/asm/nonmatchings/code_364300/func_E00624EC.s +++ b/asm/nonmatchings/code_364300/func_E00624EC.s @@ -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 307e24f52c..ce58648b02 100644 --- a/asm/nonmatchings/code_364F10/func_E0064414.s +++ b/asm/nonmatchings/code_364F10/func_E0064414.s @@ -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 @@ -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,7 +253,7 @@ 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) @@ -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 diff --git a/asm/nonmatchings/code_366030/func_E0066770.s b/asm/nonmatchings/code_366030/func_E0066770.s index 9d95f44e00..f4a571ce8d 100644 --- a/asm/nonmatchings/code_366030/func_E0066770.s +++ b/asm/nonmatchings/code_366030/func_E0066770.s @@ -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) @@ -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 30215914a9..b576b689e2 100644 --- a/asm/nonmatchings/code_36A8D0/func_E0068234.s +++ b/asm/nonmatchings/code_36A8D0/func_E0068234.s @@ -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 @@ -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 0d90c0aaf8..d6d5148a90 100644 --- a/asm/nonmatchings/code_36D020/func_E006A85C.s +++ b/asm/nonmatchings/code_36D020/func_E006A85C.s @@ -9,13 +9,13 @@ glabel func_E006A85C /* 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 5378c8a629..21d6f90448 100644 --- a/asm/nonmatchings/code_36D020/func_E006A94C.s +++ b/asm/nonmatchings/code_36D020/func_E006A94C.s @@ -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 @@ -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 2815ec0d86..bbde3be5b5 100644 --- a/asm/nonmatchings/code_36E1D0/func_E006C5E8.s +++ b/asm/nonmatchings/code_36E1D0/func_E006C5E8.s @@ -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 @@ -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 50c374cae1..35dfa32531 100644 --- a/asm/nonmatchings/code_372790/func_E006E764.s +++ b/asm/nonmatchings/code_372790/func_E006E764.s @@ -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) @@ -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 98cffbd592..019ccfba9f 100644 --- a/asm/nonmatchings/code_3740B0/func_E0070740.s +++ b/asm/nonmatchings/code_3740B0/func_E0070740.s @@ -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: diff --git a/asm/nonmatchings/code_374E50/func_E00723D4.s b/asm/nonmatchings/code_374E50/func_E00723D4.s index 5290b0e34f..fdc2facfc7 100644 --- a/asm/nonmatchings/code_374E50/func_E00723D4.s +++ b/asm/nonmatchings/code_374E50/func_E00723D4.s @@ -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) @@ -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 a8f09dca5e..9a4903a092 100644 --- a/asm/nonmatchings/code_376460/func_E00745E0.s +++ b/asm/nonmatchings/code_376460/func_E00745E0.s @@ -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: diff --git a/asm/nonmatchings/code_377070/func_E007685C.s b/asm/nonmatchings/code_377070/func_E007685C.s index c15255f068..6a675c21a0 100644 --- a/asm/nonmatchings/code_377070/func_E007685C.s +++ b/asm/nonmatchings/code_377070/func_E007685C.s @@ -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 @@ -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 @@ -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 1befedd7c2..9a5d184ff1 100644 --- a/asm/nonmatchings/code_37A3F0/func_E007827C.s +++ b/asm/nonmatchings/code_37A3F0/func_E007827C.s @@ -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 ed9185eb2b..5bf84d4f36 100644 --- a/asm/nonmatchings/code_37C540/func_E007A88C.s +++ b/asm/nonmatchings/code_37C540/func_E007A88C.s @@ -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 2e15e65b22..8387e7f246 100644 --- a/asm/nonmatchings/code_37D490/func_E007C1F4.s +++ b/asm/nonmatchings/code_37D490/func_E007C1F4.s @@ -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) @@ -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) @@ -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 8603b1e255..6f50a4c982 100644 --- a/asm/nonmatchings/code_37F720/func_E007E54C.s +++ b/asm/nonmatchings/code_37F720/func_E007E54C.s @@ -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 cca9656bd4..5ad74dd732 100644 --- a/asm/nonmatchings/code_3812C0/func_E0080448.s +++ b/asm/nonmatchings/code_3812C0/func_E0080448.s @@ -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 @@ -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_E00828B4.s b/asm/nonmatchings/code_385640/func_E00828B4.s index 08c0686ba4..edcba3d1d0 100644 --- a/asm/nonmatchings/code_385640/func_E00828B4.s +++ b/asm/nonmatchings/code_385640/func_E00828B4.s @@ -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 diff --git a/asm/nonmatchings/code_385640/func_E0082A84.s b/asm/nonmatchings/code_385640/func_E0082A84.s index a6d7629c40..8932e8afaf 100644 --- a/asm/nonmatchings/code_385640/func_E0082A84.s +++ b/asm/nonmatchings/code_385640/func_E0082A84.s @@ -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 cde66dc5b3..876b556e71 100644 --- a/asm/nonmatchings/code_3889D0/func_E0084928.s +++ b/asm/nonmatchings/code_3889D0/func_E0084928.s @@ -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 @@ -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 85ceaf1272..0853674dbb 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) @@ -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 @@ -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_38DE00/func_E008C6FC.s b/asm/nonmatchings/code_38DE00/func_E008C6FC.s index e4328ef37a..fbdb19b0ec 100644 --- a/asm/nonmatchings/code_38DE00/func_E008C6FC.s +++ b/asm/nonmatchings/code_38DE00/func_E008C6FC.s @@ -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 diff --git a/asm/nonmatchings/code_38EE60/func_E008E4E0.s b/asm/nonmatchings/code_38EE60/func_E008E4E0.s index fb59f8c806..43a2d0268f 100644 --- a/asm/nonmatchings/code_38EE60/func_E008E4E0.s +++ b/asm/nonmatchings/code_38EE60/func_E008E4E0.s @@ -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 @@ -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 fade004c45..78cce009ea 100644 --- a/asm/nonmatchings/code_38F900/func_E0090444.s +++ b/asm/nonmatchings/code_38F900/func_E0090444.s @@ -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,13 +285,13 @@ 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 @@ -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 @@ -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 abbaaae837..fe13130e0e 100644 --- a/asm/nonmatchings/code_391D30/func_E00922A0.s +++ b/asm/nonmatchings/code_391D30/func_E00922A0.s @@ -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 @@ -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 d6a273668a..d2504ded88 100644 --- a/asm/nonmatchings/code_3928D0/func_E00942FC.s +++ b/asm/nonmatchings/code_3928D0/func_E00942FC.s @@ -195,7 +195,7 @@ 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 +/* 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) @@ -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 @@ -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 8153f51eb1..de3cfac2df 100644 --- a/asm/nonmatchings/code_394280/func_E00961BC.s +++ b/asm/nonmatchings/code_394280/func_E00961BC.s @@ -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 6160638926..727459a023 100644 --- a/asm/nonmatchings/code_395BB0/func_E00982EC.s +++ b/asm/nonmatchings/code_395BB0/func_E00982EC.s @@ -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 9968ed28d7..268db749de 100644 --- a/asm/nonmatchings/code_3965B0/func_E009A3E0.s +++ b/asm/nonmatchings/code_3965B0/func_E009A3E0.s @@ -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 @@ -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: @@ -235,7 +235,7 @@ glabel func_E009A3E0 /* 396D18 E009A768 AC82000C */ sw $v0, 0xc($a0) .LE009A76C: /* 396D1C E009A76C 1860000D */ blez $v1, .LE009A7A4 -/* 396D20 E009A770 00000000 */ nop +/* 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) @@ -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 @@ -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: @@ -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 f3b52f99e0..ec49c03f29 100644 --- a/asm/nonmatchings/code_3981F0/func_E009C220.s +++ b/asm/nonmatchings/code_3981F0/func_E009C220.s @@ -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 e56e0e48b2..2d0c06a19d 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: @@ -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 diff --git a/asm/nonmatchings/code_3A2290/func_E00A0000.s b/asm/nonmatchings/code_3A2290/func_E00A0000.s index d93775e2e1..d922a23712 100644 --- a/asm/nonmatchings/code_3A2290/func_E00A0000.s +++ b/asm/nonmatchings/code_3A2290/func_E00A0000.s @@ -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 5fb4f82cf8..21ef439904 100644 --- a/asm/nonmatchings/code_3A2990/func_E00A223C.s +++ b/asm/nonmatchings/code_3A2990/func_E00A223C.s @@ -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 84d47a6232..24eee77f3a 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A4650.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A4650.s @@ -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 diff --git a/asm/nonmatchings/code_3A5550/func_E00A63A4.s b/asm/nonmatchings/code_3A5550/func_E00A63A4.s index 3de8ce0256..09228ebf6a 100644 --- a/asm/nonmatchings/code_3A5550/func_E00A63A4.s +++ b/asm/nonmatchings/code_3A5550/func_E00A63A4.s @@ -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 10ba53ce0d..7eb7a629c0 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A8320.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A8320.s @@ -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 bc0420b343..8046155ca1 100644 --- a/asm/nonmatchings/code_3AA920/func_E00AA404.s +++ b/asm/nonmatchings/code_3AA920/func_E00AA404.s @@ -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) @@ -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 9875ad2602..5aa6b702af 100644 --- a/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s +++ b/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s @@ -21,12 +21,12 @@ 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 @@ -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 73048171f8..c1e99705fd 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE54C.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE54C.s @@ -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 @@ -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 e6c0422530..672078f5f5 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B0234.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B0234.s @@ -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 @@ -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) @@ -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 b171e4cbcf..ffd96a6088 100644 --- a/asm/nonmatchings/code_3B4790/func_E00B24B0.s +++ b/asm/nonmatchings/code_3B4790/func_E00B24B0.s @@ -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,14 +316,14 @@ 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 @@ -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: @@ -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 df019e3662..52a7e84630 100644 --- a/asm/nonmatchings/code_3B5CF0/func_E00B457C.s +++ b/asm/nonmatchings/code_3B5CF0/func_E00B457C.s @@ -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) @@ -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: diff --git a/asm/nonmatchings/code_3B7160/func_E00B62E0.s b/asm/nonmatchings/code_3B7160/func_E00B62E0.s index 423152a353..71590a5225 100644 --- a/asm/nonmatchings/code_3B7160/func_E00B62E0.s +++ b/asm/nonmatchings/code_3B7160/func_E00B62E0.s @@ -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) @@ -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,14 +177,14 @@ 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 @@ -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: @@ -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 ed95b82e31..0fd8a66f2a 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B8208.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B8208.s @@ -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 diff --git a/asm/nonmatchings/code_3B8BD0/func_E00BA620.s b/asm/nonmatchings/code_3B8BD0/func_E00BA620.s index 53c84c70c4..acf0bc2dd9 100644 --- a/asm/nonmatchings/code_3B8BD0/func_E00BA620.s +++ b/asm/nonmatchings/code_3B8BD0/func_E00BA620.s @@ -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 e2c7c2680f..e0accab943 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC374.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC374.s @@ -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 @@ -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 @@ -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 d96bd5e56a..074f98ef10 100644 --- a/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s +++ b/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s @@ -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 @@ -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 80b0ffe71d..3011920e72 100644 --- a/asm/nonmatchings/code_3BCD60/func_E00C0760.s +++ b/asm/nonmatchings/code_3BCD60/func_E00C0760.s @@ -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 ab6c733804..8ae5b56c7f 100644 --- a/asm/nonmatchings/code_3C11D0/func_E00C221C.s +++ b/asm/nonmatchings/code_3C11D0/func_E00C221C.s @@ -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 @@ -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 410162e790..b9050d755a 100644 --- a/asm/nonmatchings/code_3CADF0/func_E00C4308.s +++ b/asm/nonmatchings/code_3CADF0/func_E00C4308.s @@ -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) @@ -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: @@ -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) diff --git a/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s b/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s index f7e5e9f87b..e09843073c 100644 --- a/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s +++ b/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s @@ -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 f6d8a02e89..5891dc2192 100644 --- a/asm/nonmatchings/code_3CF3A0/func_E00C8454.s +++ b/asm/nonmatchings/code_3CF3A0/func_E00C8454.s @@ -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 @@ -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 21826cb24b..abcc568a51 100644 --- a/asm/nonmatchings/code_3D0500/func_E00CA4CC.s +++ b/asm/nonmatchings/code_3D0500/func_E00CA4CC.s @@ -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,7 +465,7 @@ 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 @@ -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 88569005f9..d665e51801 100644 --- a/asm/nonmatchings/code_3D1690/func_E00CC9D0.s +++ b/asm/nonmatchings/code_3D1690/func_E00CC9D0.s @@ -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 2c6c117e02..7bdb101a3b 100644 --- a/asm/nonmatchings/code_3D2AC0/func_E00CE478.s +++ b/asm/nonmatchings/code_3D2AC0/func_E00CE478.s @@ -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) @@ -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,14 +154,14 @@ 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 @@ -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 @@ -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 @@ -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 906b269763..5811277bfb 100644 --- a/asm/nonmatchings/code_3D3E20/func_E00D048C.s +++ b/asm/nonmatchings/code_3D3E20/func_E00D048C.s @@ -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) @@ -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 @@ -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,7 +263,7 @@ 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) @@ -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 @@ -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 1ad90556d7..d18295ff41 100644 --- a/asm/nonmatchings/code_3D4970/func_E00D2284.s +++ b/asm/nonmatchings/code_3D4970/func_E00D2284.s @@ -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) @@ -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 1a7be8f4f8..d6c9fe6869 100644 --- a/asm/nonmatchings/code_3D5020/func_E00D6980.s +++ b/asm/nonmatchings/code_3D5020/func_E00D6980.s @@ -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) @@ -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 @@ -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_E00D8334.s b/asm/nonmatchings/code_3D67C0/func_E00D8334.s index 9a08671171..a1dc0e7238 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 @@ -64,7 +64,7 @@ glabel func_E00D8334 /* 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 9836bd14a1..8f7564d391 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8630.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8630.s @@ -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: @@ -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 7a4ada5403..4fa85c608d 100644 --- a/asm/nonmatchings/code_3D7240/func_E00DA230.s +++ b/asm/nonmatchings/code_3D7240/func_E00DA230.s @@ -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) @@ -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 c37eb39a80..13fbd89f1b 100644 --- a/asm/nonmatchings/code_3D7A70/func_E00DC304.s +++ b/asm/nonmatchings/code_3D7A70/func_E00DC304.s @@ -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) @@ -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 075a25c135..b162709755 100644 --- a/asm/nonmatchings/code_3D8720/func_E00DE2A8.s +++ b/asm/nonmatchings/code_3D8720/func_E00DE2A8.s @@ -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 @@ -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,17 +191,17 @@ 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 @@ -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 @@ -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 9c40bf44bf..d95ed137d8 100644 --- a/asm/nonmatchings/code_3DB460/func_E00E0600.s +++ b/asm/nonmatchings/code_3DB460/func_E00E0600.s @@ -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 diff --git a/asm/nonmatchings/code_3DC310/func_E00E2218.s b/asm/nonmatchings/code_3DC310/func_E00E2218.s index 76eef0d4f4..fea19a9f22 100644 --- a/asm/nonmatchings/code_3DC310/func_E00E2218.s +++ b/asm/nonmatchings/code_3DC310/func_E00E2218.s @@ -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 @@ -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 @@ -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: @@ -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 @@ -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 ca4da6531f..13b4e00c4a 100644 --- a/asm/nonmatchings/code_3DE000/func_E00E495C.s +++ b/asm/nonmatchings/code_3DE000/func_E00E495C.s @@ -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) @@ -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 f01ac5cd49..bab6d8354b 100644 --- a/asm/nonmatchings/code_3E0930/func_E00E6524.s +++ b/asm/nonmatchings/code_3E0930/func_E00E6524.s @@ -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 cce4d9e646..844513c696 100644 --- a/asm/nonmatchings/code_3E1690/func_E00E83BC.s +++ b/asm/nonmatchings/code_3E1690/func_E00E83BC.s @@ -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 2e1eb35ed9..6a01528c06 100644 --- a/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s +++ b/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s @@ -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) @@ -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 fb6f41cf9c..3d6492fc96 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 @@ -199,7 +199,7 @@ glabel func_E010A4E8 .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 d9101d41d5..7640f4b6a4 100644 --- a/asm/nonmatchings/code_3E54C0/func_E010C39C.s +++ b/asm/nonmatchings/code_3E54C0/func_E010C39C.s @@ -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 @@ -203,7 +203,7 @@ glabel func_E010C39C /* 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 @@ -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 7b1621f16c..ae6e3fc224 100644 --- a/asm/nonmatchings/code_3EB4E0/func_E010E000.s +++ b/asm/nonmatchings/code_3EB4E0/func_E010E000.s @@ -12,7 +12,7 @@ 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 @@ -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 @@ -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 88e3080a08..c7c8bfc7f1 100644 --- a/asm/nonmatchings/code_3EB4E0/func_E010E558.s +++ b/asm/nonmatchings/code_3EB4E0/func_E010E558.s @@ -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) @@ -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 2352bcd090..01c91bda56 100644 --- a/asm/nonmatchings/code_3F83F0/func_E01103EC.s +++ b/asm/nonmatchings/code_3F83F0/func_E01103EC.s @@ -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 @@ -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 382ad9d47b..2b3e68ccce 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: diff --git a/asm/nonmatchings/code_3F9E50/func_E01124CC.s b/asm/nonmatchings/code_3F9E50/func_E01124CC.s index b5995cb8bd..fa5d55926d 100644 --- a/asm/nonmatchings/code_3F9E50/func_E01124CC.s +++ b/asm/nonmatchings/code_3F9E50/func_E01124CC.s @@ -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 ae7a1d2110..80fb6c8215 100644 --- a/asm/nonmatchings/code_3FEAE0/func_E0114388.s +++ b/asm/nonmatchings/code_3FEAE0/func_E0114388.s @@ -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 b3d3255df0..96e16575b3 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: diff --git a/asm/nonmatchings/code_402640/func_E0116884.s b/asm/nonmatchings/code_402640/func_E0116884.s index ef61ca727b..8ee013d740 100644 --- a/asm/nonmatchings/code_402640/func_E0116884.s +++ b/asm/nonmatchings/code_402640/func_E0116884.s @@ -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 fe4a1b33c2..dcde70a27d 100644 --- a/asm/nonmatchings/code_403400/func_E011849C.s +++ b/asm/nonmatchings/code_403400/func_E011849C.s @@ -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 diff --git a/asm/nonmatchings/code_404220/func_E011A48C.s b/asm/nonmatchings/code_404220/func_E011A48C.s index 6540bd2118..ee4e34ccfb 100644 --- a/asm/nonmatchings/code_404220/func_E011A48C.s +++ b/asm/nonmatchings/code_404220/func_E011A48C.s @@ -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 @@ -130,38 +130,38 @@ 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(gMasterGfxPos) diff --git a/asm/nonmatchings/code_404220/func_E011A700.s b/asm/nonmatchings/code_404220/func_E011A700.s index 4b0ae8a795..83185cf098 100644 --- a/asm/nonmatchings/code_404220/func_E011A700.s +++ b/asm/nonmatchings/code_404220/func_E011A700.s @@ -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 @@ -266,27 +266,27 @@ glabel func_E011A700 /* 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 7070463de5..9c1eab9e60 100644 --- a/asm/nonmatchings/code_406B40/func_E011C1C4.s +++ b/asm/nonmatchings/code_406B40/func_E011C1C4.s @@ -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 @@ -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 e01309d0f7..e89e536852 100644 --- a/asm/nonmatchings/code_409990/func_E011E578.s +++ b/asm/nonmatchings/code_409990/func_E011E578.s @@ -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 ca980b694a..ed888022c0 100644 --- a/asm/nonmatchings/code_40B3F0/func_E01203E4.s +++ b/asm/nonmatchings/code_40B3F0/func_E01203E4.s @@ -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 diff --git a/asm/nonmatchings/code_40C5A0/func_E012270C.s b/asm/nonmatchings/code_40C5A0/func_E012270C.s index de7c2d8c94..7653aee1f9 100644 --- a/asm/nonmatchings/code_40C5A0/func_E012270C.s +++ b/asm/nonmatchings/code_40C5A0/func_E012270C.s @@ -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) @@ -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 @@ -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 0f6ced915a..1d15f4be4e 100644 --- a/asm/nonmatchings/code_412730/func_E01244C4.s +++ b/asm/nonmatchings/code_412730/func_E01244C4.s @@ -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) @@ -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 @@ -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 5b70a6b86d..fd766c823a 100644 --- a/asm/nonmatchings/code_413360/func_E01264EC.s +++ b/asm/nonmatchings/code_413360/func_E01264EC.s @@ -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 @@ -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 @@ -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_415D90/func_802A3C98.s b/asm/nonmatchings/code_415D90/func_802A3C98.s index 43efe023cb..304db3232c 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,13 +42,13 @@ 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 @@ -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 d6b8652784..017da6edf1 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,20 +42,20 @@ 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 @@ -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_6e40_len_500/render_curtains.s b/asm/nonmatchings/code_6e40_len_500/render_curtains.s index 7d1c437295..57742f6699 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,7 +56,7 @@ 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 @@ -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) 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 f1d78477d7..82056a4cf5 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: @@ -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 a92a3e3806..9792bc8253 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 @@ -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 @@ -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 @@ -453,14 +453,14 @@ glabel render_frame /* 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 70abac3647..19cbbd72f1 100644 --- a/asm/nonmatchings/code_8560/update_cameras.s +++ b/asm/nonmatchings/code_8560/update_cameras.s @@ -40,31 +40,31 @@ 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 @@ -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 068038ff45..2a317953ef 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s @@ -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 eb9b0634a4..1449ca7287 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,25 +135,25 @@ 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 +/* 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(gMasterGfxPos) @@ -161,19 +161,19 @@ glabel func_800F3680 /* 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(gMasterGfxPos) @@ -181,52 +181,52 @@ glabel func_800F3680 /* 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: @@ -294,37 +294,37 @@ glabel func_800F3680 /* 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,25 +895,25 @@ 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 +/* 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(gMasterGfxPos) @@ -921,52 +921,52 @@ glabel func_800F3680 /* 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 5e01c54421..812166faaa 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 @@ -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 @@ -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) @@ -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 @@ -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,7 +2463,7 @@ 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 @@ -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) @@ -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 4d5911bb63..b8b40fd238 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 diff --git a/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s b/asm/nonmatchings/code_B9D60/appendGfx_item_entity.s index 71e3d3d6b0..7dd4deb56b 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) @@ -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) @@ -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 @@ -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 @@ -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 2422bca40b..1e875a9e83 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 diff --git a/asm/nonmatchings/code_B9D60/draw_number.s b/asm/nonmatchings/code_B9D60/draw_number.s index 7a0eab5850..51df663067 100644 --- a/asm/nonmatchings/code_B9D60/draw_number.s +++ b/asm/nonmatchings/code_B9D60/draw_number.s @@ -131,7 +131,7 @@ 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(gMasterGfxPos) diff --git a/asm/nonmatchings/code_B9D60/func_80126790.s b/asm/nonmatchings/code_B9D60/func_80126790.s index 924e04ef04..4b3082eba8 100644 --- a/asm/nonmatchings/code_B9D60/func_80126790.s +++ b/asm/nonmatchings/code_B9D60/func_80126790.s @@ -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 @@ -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 diff --git a/asm/nonmatchings/code_B9D60/func_80126F78.s b/asm/nonmatchings/code_B9D60/func_80126F78.s index e3a7a47747..7ab4602284 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: diff --git a/asm/nonmatchings/code_B9D60/func_80127D90.s b/asm/nonmatchings/code_B9D60/func_80127D90.s index 87c7d78ba2..111369a23a 100644 --- a/asm/nonmatchings/code_B9D60/func_80127D90.s +++ b/asm/nonmatchings/code_B9D60/func_80127D90.s @@ -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 diff --git a/asm/nonmatchings/code_B9D60/func_8012C324.s b/asm/nonmatchings/code_B9D60/func_8012C324.s index 0d1c80e926..bca4edd2b8 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 @@ -189,7 +189,7 @@ 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 @@ -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 diff --git a/asm/nonmatchings/code_B9D60/func_8012D3DC.s b/asm/nonmatchings/code_B9D60/func_8012D3DC.s index f9c6884741..5302a72169 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 @@ -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 @@ -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 diff --git a/asm/nonmatchings/code_B9D60/func_8012DB58.s b/asm/nonmatchings/code_B9D60/func_8012DB58.s index 7e49a687e8..110615eade 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 @@ -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) diff --git a/asm/nonmatchings/code_B9D60/func_8012EC94.s b/asm/nonmatchings/code_B9D60/func_8012EC94.s index aacb5f7bdd..3e206d9e7c 100644 --- a/asm/nonmatchings/code_B9D60/func_8012EC94.s +++ b/asm/nonmatchings/code_B9D60/func_8012EC94.s @@ -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 f83d3a9182..08f5540b59 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) @@ -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 7849eedfd4..18b423b03a 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: @@ -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 520e905e7d..fc3371c68e 100644 --- a/asm/nonmatchings/code_B9D60/render_item_entities.s +++ b/asm/nonmatchings/code_B9D60/render_item_entities.s @@ -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 @@ -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 f382f19add..c6827c8335 100644 --- a/asm/nonmatchings/code_B9D60/render_messages.s +++ b/asm/nonmatchings/code_B9D60/render_messages.s @@ -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_E225B0/func_802B7000_E225B0.s b/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s index f83dcf18e2..a270f27e0e 100644 --- a/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s +++ b/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s @@ -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 diff --git a/asm/nonmatchings/code_E2B530/func_802BAE00_E2B530.s b/asm/nonmatchings/code_E2B530/func_802BAE00_E2B530.s new file mode 100644 index 0000000000..3ddaf80f6f --- /dev/null +++ b/asm/nonmatchings/code_E2B530/func_802BAE00_E2B530.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BAE00_E2B530 +/* E2B530 802BAE00 27BDFEB8 */ addiu $sp, $sp, -0x148 +/* E2B534 802BAE04 AFBF0130 */ sw $ra, 0x130($sp) +/* E2B538 802BAE08 AFB5012C */ sw $s5, 0x12c($sp) +/* E2B53C 802BAE0C AFB40128 */ sw $s4, 0x128($sp) +/* E2B540 802BAE10 AFB30124 */ sw $s3, 0x124($sp) +/* E2B544 802BAE14 AFB20120 */ sw $s2, 0x120($sp) +/* E2B548 802BAE18 AFB1011C */ sw $s1, 0x11c($sp) +/* E2B54C 802BAE1C AFB00118 */ sw $s0, 0x118($sp) +/* E2B550 802BAE20 F7B60140 */ sdc1 $f22, 0x140($sp) +/* E2B554 802BAE24 F7B40138 */ sdc1 $f20, 0x138($sp) +/* E2B558 802BAE28 0C04417A */ jal get_entity_by_index +/* E2B55C 802BAE2C 3C150001 */ lui $s5, 1 +/* E2B560 802BAE30 27B30058 */ addiu $s3, $sp, 0x58 +/* E2B564 802BAE34 0040882D */ daddu $s1, $v0, $zero +/* E2B568 802BAE38 8E340040 */ lw $s4, 0x40($s1) +/* E2B56C 802BAE3C 0C019D28 */ jal guMtxIdentF +/* E2B570 802BAE40 0260202D */ daddu $a0, $s3, $zero +/* E2B574 802BAE44 27B20098 */ addiu $s2, $sp, 0x98 +/* E2B578 802BAE48 8E850014 */ lw $a1, 0x14($s4) +/* E2B57C 802BAE4C 0C019D60 */ jal guMtxL2F +/* E2B580 802BAE50 0240202D */ daddu $a0, $s2, $zero +/* E2B584 802BAE54 0260202D */ daddu $a0, $s3, $zero +/* E2B588 802BAE58 0240282D */ daddu $a1, $s2, $zero +/* E2B58C 802BAE5C 0C019D80 */ jal guMtxCatF +/* E2B590 802BAE60 0240302D */ daddu $a2, $s2, $zero +/* E2B594 802BAE64 3C06BF80 */ lui $a2, 0xbf80 +/* E2B598 802BAE68 C7A000C8 */ lwc1 $f0, 0xc8($sp) +/* E2B59C 802BAE6C C6820004 */ lwc1 $f2, 4($s4) +/* E2B5A0 802BAE70 4480A000 */ mtc1 $zero, $f20 +/* E2B5A4 802BAE74 46020000 */ add.s $f0, $f0, $f2 +/* E2B5A8 802BAE78 4407A000 */ mfc1 $a3, $f20 +/* E2B5AC 802BAE7C 27B000D8 */ addiu $s0, $sp, 0xd8 +/* E2B5B0 802BAE80 E7A000C8 */ swc1 $f0, 0xc8($sp) +/* E2B5B4 802BAE84 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2B5B8 802BAE88 8E250060 */ lw $a1, 0x60($s1) +/* E2B5BC 802BAE8C 0C019EC8 */ jal guRotateF +/* E2B5C0 802BAE90 0200202D */ daddu $a0, $s0, $zero +/* E2B5C4 802BAE94 0200202D */ daddu $a0, $s0, $zero +/* E2B5C8 802BAE98 0240282D */ daddu $a1, $s2, $zero +/* E2B5CC 802BAE9C 0C019D80 */ jal guMtxCatF +/* E2B5D0 802BAEA0 0240302D */ daddu $a2, $s2, $zero +/* E2B5D4 802BAEA4 3C013F80 */ lui $at, 0x3f80 +/* E2B5D8 802BAEA8 4481B000 */ mtc1 $at, $f22 +/* E2B5DC 802BAEAC 4406A000 */ mfc1 $a2, $f20 +/* E2B5E0 802BAEB0 4407A000 */ mfc1 $a3, $f20 +/* E2B5E4 802BAEB4 36B51630 */ ori $s5, $s5, 0x1630 +/* E2B5E8 802BAEB8 E7B60010 */ swc1 $f22, 0x10($sp) +/* E2B5EC 802BAEBC 8E250068 */ lw $a1, 0x68($s1) +/* E2B5F0 802BAEC0 0C019EC8 */ jal guRotateF +/* E2B5F4 802BAEC4 0200202D */ daddu $a0, $s0, $zero +/* E2B5F8 802BAEC8 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2B5FC 802BAECC 8E250060 */ lw $a1, 0x60($s1) +/* E2B600 802BAED0 4406B000 */ mfc1 $a2, $f22 +/* E2B604 802BAED4 4407A000 */ mfc1 $a3, $f20 +/* E2B608 802BAED8 0C019EC8 */ jal guRotateF +/* E2B60C 802BAEDC 27A40018 */ addiu $a0, $sp, 0x18 +/* E2B610 802BAEE0 0200202D */ daddu $a0, $s0, $zero +/* E2B614 802BAEE4 27A50018 */ addiu $a1, $sp, 0x18 +/* E2B618 802BAEE8 0C019D80 */ jal guMtxCatF +/* E2B61C 802BAEEC 00A0302D */ daddu $a2, $a1, $zero +/* E2B620 802BAEF0 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2B624 802BAEF4 8E250064 */ lw $a1, 0x64($s1) +/* E2B628 802BAEF8 4406A000 */ mfc1 $a2, $f20 +/* E2B62C 802BAEFC 4407B000 */ mfc1 $a3, $f22 +/* E2B630 802BAF00 0C019EC8 */ jal guRotateF +/* E2B634 802BAF04 0200202D */ daddu $a0, $s0, $zero +/* E2B638 802BAF08 27A40018 */ addiu $a0, $sp, 0x18 +/* E2B63C 802BAF0C 0200282D */ daddu $a1, $s0, $zero +/* E2B640 802BAF10 0C019D80 */ jal guMtxCatF +/* E2B644 802BAF14 0200302D */ daddu $a2, $s0, $zero +/* E2B648 802BAF18 0240202D */ daddu $a0, $s2, $zero +/* E2B64C 802BAF1C 0200282D */ daddu $a1, $s0, $zero +/* E2B650 802BAF20 0C019D80 */ jal guMtxCatF +/* E2B654 802BAF24 0240302D */ daddu $a2, $s2, $zero +/* E2B658 802BAF28 8E250054 */ lw $a1, 0x54($s1) +/* E2B65C 802BAF2C 8E260058 */ lw $a2, 0x58($s1) +/* E2B660 802BAF30 8E27005C */ lw $a3, 0x5c($s1) +/* E2B664 802BAF34 0C019DF0 */ jal guScaleF +/* E2B668 802BAF38 27A40018 */ addiu $a0, $sp, 0x18 +/* E2B66C 802BAF3C 0240202D */ daddu $a0, $s2, $zero +/* E2B670 802BAF40 27A50018 */ addiu $a1, $sp, 0x18 +/* E2B674 802BAF44 0C019D80 */ jal guMtxCatF +/* E2B678 802BAF48 00A0302D */ daddu $a2, $a1, $zero +/* E2B67C 802BAF4C 8E250048 */ lw $a1, 0x48($s1) +/* E2B680 802BAF50 8E26004C */ lw $a2, 0x4c($s1) +/* E2B684 802BAF54 8E270050 */ lw $a3, 0x50($s1) +/* E2B688 802BAF58 0C019E40 */ jal guTranslateF +/* E2B68C 802BAF5C 0260202D */ daddu $a0, $s3, $zero +/* E2B690 802BAF60 27A40018 */ addiu $a0, $sp, 0x18 +/* E2B694 802BAF64 0260282D */ daddu $a1, $s3, $zero +/* E2B698 802BAF68 0C019D80 */ jal guMtxCatF +/* E2B69C 802BAF6C 0260302D */ daddu $a2, $s3, $zero +/* E2B6A0 802BAF70 0260202D */ daddu $a0, $s3, $zero +/* E2B6A4 802BAF74 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* E2B6A8 802BAF78 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* E2B6AC 802BAF7C 3C11800A */ lui $s1, %hi(gDisplayContext) +/* E2B6B0 802BAF80 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) +/* E2B6B4 802BAF84 96050000 */ lhu $a1, ($s0) +/* E2B6B8 802BAF88 8E220000 */ lw $v0, ($s1) +/* E2B6BC 802BAF8C 00052980 */ sll $a1, $a1, 6 +/* E2B6C0 802BAF90 00B52821 */ addu $a1, $a1, $s5 +/* E2B6C4 802BAF94 0C019D40 */ jal guMtxF2L +/* E2B6C8 802BAF98 00452821 */ addu $a1, $v0, $a1 +/* E2B6CC 802BAF9C 3C03DA38 */ lui $v1, 0xda38 +/* E2B6D0 802BAFA0 34630002 */ ori $v1, $v1, 2 +/* E2B6D4 802BAFA4 3C07D838 */ lui $a3, 0xd838 +/* E2B6D8 802BAFA8 3C05800A */ lui $a1, %hi(gMasterGfxPos) +/* E2B6DC 802BAFAC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) +/* E2B6E0 802BAFB0 34E70002 */ ori $a3, $a3, 2 +/* E2B6E4 802BAFB4 8CA40000 */ lw $a0, ($a1) +/* E2B6E8 802BAFB8 96020000 */ lhu $v0, ($s0) +/* E2B6EC 802BAFBC 0080302D */ daddu $a2, $a0, $zero +/* E2B6F0 802BAFC0 24840008 */ addiu $a0, $a0, 8 +/* E2B6F4 802BAFC4 ACA40000 */ sw $a0, ($a1) +/* E2B6F8 802BAFC8 ACC30000 */ sw $v1, ($a2) +/* E2B6FC 802BAFCC 24430001 */ addiu $v1, $v0, 1 +/* E2B700 802BAFD0 3042FFFF */ andi $v0, $v0, 0xffff +/* E2B704 802BAFD4 00021180 */ sll $v0, $v0, 6 +/* E2B708 802BAFD8 A6030000 */ sh $v1, ($s0) +/* E2B70C 802BAFDC 8E230000 */ lw $v1, ($s1) +/* E2B710 802BAFE0 00551021 */ addu $v0, $v0, $s5 +/* E2B714 802BAFE4 00621821 */ addu $v1, $v1, $v0 +/* E2B718 802BAFE8 24820008 */ addiu $v0, $a0, 8 +/* E2B71C 802BAFEC ACC30004 */ sw $v1, 4($a2) +/* E2B720 802BAFF0 ACA20000 */ sw $v0, ($a1) +/* E2B724 802BAFF4 3C02DE00 */ lui $v0, 0xde00 +/* E2B728 802BAFF8 AC820000 */ sw $v0, ($a0) +/* E2B72C 802BAFFC 8E830018 */ lw $v1, 0x18($s4) +/* E2B730 802BB000 24820010 */ addiu $v0, $a0, 0x10 +/* E2B734 802BB004 ACA20000 */ sw $v0, ($a1) +/* E2B738 802BB008 24020040 */ addiu $v0, $zero, 0x40 +/* E2B73C 802BB00C AC870008 */ sw $a3, 8($a0) +/* E2B740 802BB010 AC82000C */ sw $v0, 0xc($a0) +/* E2B744 802BB014 AC830004 */ sw $v1, 4($a0) +/* E2B748 802BB018 8FBF0130 */ lw $ra, 0x130($sp) +/* E2B74C 802BB01C 8FB5012C */ lw $s5, 0x12c($sp) +/* E2B750 802BB020 8FB40128 */ lw $s4, 0x128($sp) +/* E2B754 802BB024 8FB30124 */ lw $s3, 0x124($sp) +/* E2B758 802BB028 8FB20120 */ lw $s2, 0x120($sp) +/* E2B75C 802BB02C 8FB1011C */ lw $s1, 0x11c($sp) +/* E2B760 802BB030 8FB00118 */ lw $s0, 0x118($sp) +/* E2B764 802BB034 D7B60140 */ ldc1 $f22, 0x140($sp) +/* E2B768 802BB038 D7B40138 */ ldc1 $f20, 0x138($sp) +/* E2B76C 802BB03C 03E00008 */ jr $ra +/* E2B770 802BB040 27BD0148 */ addiu $sp, $sp, 0x148 diff --git a/asm/nonmatchings/code_E2B530/func_802BB044_E2B774.s b/asm/nonmatchings/code_E2B530/func_802BB044_E2B774.s new file mode 100644 index 0000000000..ef1dc5c195 --- /dev/null +++ b/asm/nonmatchings/code_E2B530/func_802BB044_E2B774.s @@ -0,0 +1,114 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB044_E2B774 +/* E2B774 802BB044 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* E2B778 802BB048 AFB10014 */ sw $s1, 0x14($sp) +/* E2B77C 802BB04C 0080882D */ daddu $s1, $a0, $zero +/* E2B780 802BB050 AFB20018 */ sw $s2, 0x18($sp) +/* E2B784 802BB054 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* E2B788 802BB058 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* E2B78C 802BB05C AFBF001C */ sw $ra, 0x1c($sp) +/* E2B790 802BB060 AFB00010 */ sw $s0, 0x10($sp) +/* E2B794 802BB064 F7B80030 */ sdc1 $f24, 0x30($sp) +/* E2B798 802BB068 F7B60028 */ sdc1 $f22, 0x28($sp) +/* E2B79C 802BB06C F7B40020 */ sdc1 $f20, 0x20($sp) +/* E2B7A0 802BB070 C640002C */ lwc1 $f0, 0x2c($s2) +/* E2B7A4 802BB074 C622004C */ lwc1 $f2, 0x4c($s1) +/* E2B7A8 802BB078 864200B0 */ lh $v0, 0xb0($s2) +/* E2B7AC 802BB07C 46020001 */ sub.s $f0, $f0, $f2 +/* E2B7B0 802BB080 8E300040 */ lw $s0, 0x40($s1) +/* E2B7B4 802BB084 44821000 */ mtc1 $v0, $f2 +/* E2B7B8 802BB088 00000000 */ nop +/* E2B7BC 802BB08C 468010A1 */ cvt.d.w $f2, $f2 +/* E2B7C0 802BB090 46000021 */ cvt.d.s $f0, $f0 +/* E2B7C4 802BB094 46200005 */ abs.d $f0, $f0 +/* E2B7C8 802BB098 4620103C */ c.lt.d $f2, $f0 +/* E2B7CC 802BB09C 00000000 */ nop +/* E2B7D0 802BB0A0 45000004 */ bc1f .L802BB0B4 +/* E2B7D4 802BB0A4 2403FFDF */ addiu $v1, $zero, -0x21 +/* E2B7D8 802BB0A8 8E220000 */ lw $v0, ($s1) +/* E2B7DC 802BB0AC 080AEC2F */ j .L802BB0BC +/* E2B7E0 802BB0B0 34420020 */ ori $v0, $v0, 0x20 +.L802BB0B4: +/* E2B7E4 802BB0B4 8E220000 */ lw $v0, ($s1) +/* E2B7E8 802BB0B8 00431024 */ and $v0, $v0, $v1 +.L802BB0BC: +/* E2B7EC 802BB0BC AE220000 */ sw $v0, ($s1) +/* E2B7F0 802BB0C0 92220006 */ lbu $v0, 6($s1) +/* E2B7F4 802BB0C4 30420001 */ andi $v0, $v0, 1 +/* E2B7F8 802BB0C8 5040003E */ beql $v0, $zero, .L802BB1C4 +/* E2B7FC 802BB0CC AE000000 */ sw $zero, ($s0) +/* E2B800 802BB0D0 C6020000 */ lwc1 $f2, ($s0) +/* E2B804 802BB0D4 44800000 */ mtc1 $zero, $f0 +/* E2B808 802BB0D8 00000000 */ nop +/* E2B80C 802BB0DC 46001032 */ c.eq.s $f2, $f0 +/* E2B810 802BB0E0 00000000 */ nop +/* E2B814 802BB0E4 45000003 */ bc1f .L802BB0F4 +/* E2B818 802BB0E8 3C040001 */ lui $a0, 1 +/* E2B81C 802BB0EC 0C037FBF */ jal func_800DFEFC +/* E2B820 802BB0F0 34840005 */ ori $a0, $a0, 5 +.L802BB0F4: +/* E2B824 802BB0F4 C6000000 */ lwc1 $f0, ($s0) +/* E2B828 802BB0F8 3C013FE0 */ lui $at, 0x3fe0 +/* E2B82C 802BB0FC 44811800 */ mtc1 $at, $f3 +/* E2B830 802BB100 44801000 */ mtc1 $zero, $f2 +/* E2B834 802BB104 46000021 */ cvt.d.s $f0, $f0 +/* E2B838 802BB108 46220000 */ add.d $f0, $f0, $f2 +/* E2B83C 802BB10C 3C014004 */ lui $at, 0x4004 +/* E2B840 802BB110 44812800 */ mtc1 $at, $f5 +/* E2B844 802BB114 44802000 */ mtc1 $zero, $f4 +/* E2B848 802BB118 46200020 */ cvt.s.d $f0, $f0 +/* E2B84C 802BB11C 460000A1 */ cvt.d.s $f2, $f0 +/* E2B850 802BB120 4622203E */ c.le.d $f4, $f2 +/* E2B854 802BB124 00000000 */ nop +/* E2B858 802BB128 45000005 */ bc1f .L802BB140 +/* E2B85C 802BB12C E6000000 */ swc1 $f0, ($s0) +/* E2B860 802BB130 3C014020 */ lui $at, 0x4020 +/* E2B864 802BB134 44810000 */ mtc1 $at, $f0 +/* E2B868 802BB138 00000000 */ nop +/* E2B86C 802BB13C E6000000 */ swc1 $f0, ($s0) +.L802BB140: +/* E2B870 802BB140 C62C0064 */ lwc1 $f12, 0x64($s1) +/* E2B874 802BB144 3C014334 */ lui $at, 0x4334 +/* E2B878 802BB148 4481A000 */ mtc1 $at, $f20 +/* E2B87C 802BB14C 00000000 */ nop +/* E2B880 802BB150 460CA301 */ sub.s $f12, $f20, $f12 +/* E2B884 802BB154 3C0140C9 */ lui $at, 0x40c9 +/* E2B888 802BB158 34210FD0 */ ori $at, $at, 0xfd0 +/* E2B88C 802BB15C 4481B000 */ mtc1 $at, $f22 +/* E2B890 802BB160 00000000 */ nop +/* E2B894 802BB164 46166302 */ mul.s $f12, $f12, $f22 +/* E2B898 802BB168 00000000 */ nop +/* E2B89C 802BB16C 3C0143B4 */ lui $at, 0x43b4 +/* E2B8A0 802BB170 4481C000 */ mtc1 $at, $f24 +/* E2B8A4 802BB174 0C00A85B */ jal sin_rad +/* E2B8A8 802BB178 46186303 */ div.s $f12, $f12, $f24 +/* E2B8AC 802BB17C C6220064 */ lwc1 $f2, 0x64($s1) +/* E2B8B0 802BB180 4602A501 */ sub.s $f20, $f20, $f2 +/* E2B8B4 802BB184 4616A502 */ mul.s $f20, $f20, $f22 +/* E2B8B8 802BB188 00000000 */ nop +/* E2B8BC 802BB18C C6160000 */ lwc1 $f22, ($s0) +/* E2B8C0 802BB190 4600B582 */ mul.s $f22, $f22, $f0 +/* E2B8C4 802BB194 00000000 */ nop +/* E2B8C8 802BB198 0C00A874 */ jal cos_rad +/* E2B8CC 802BB19C 4618A303 */ div.s $f12, $f20, $f24 +/* E2B8D0 802BB1A0 C6040000 */ lwc1 $f4, ($s0) +/* E2B8D4 802BB1A4 46002102 */ mul.s $f4, $f4, $f0 +/* E2B8D8 802BB1A8 00000000 */ nop +/* E2B8DC 802BB1AC C6420028 */ lwc1 $f2, 0x28($s2) +/* E2B8E0 802BB1B0 46161080 */ add.s $f2, $f2, $f22 +/* E2B8E4 802BB1B4 C6400030 */ lwc1 $f0, 0x30($s2) +/* E2B8E8 802BB1B8 46040001 */ sub.s $f0, $f0, $f4 +/* E2B8EC 802BB1BC E6420028 */ swc1 $f2, 0x28($s2) +/* E2B8F0 802BB1C0 E6400030 */ swc1 $f0, 0x30($s2) +.L802BB1C4: +/* E2B8F4 802BB1C4 8FBF001C */ lw $ra, 0x1c($sp) +/* E2B8F8 802BB1C8 8FB20018 */ lw $s2, 0x18($sp) +/* E2B8FC 802BB1CC 8FB10014 */ lw $s1, 0x14($sp) +/* E2B900 802BB1D0 8FB00010 */ lw $s0, 0x10($sp) +/* E2B904 802BB1D4 D7B80030 */ ldc1 $f24, 0x30($sp) +/* E2B908 802BB1D8 D7B60028 */ ldc1 $f22, 0x28($sp) +/* E2B90C 802BB1DC D7B40020 */ ldc1 $f20, 0x20($sp) +/* E2B910 802BB1E0 03E00008 */ jr $ra +/* E2B914 802BB1E4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s b/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s new file mode 100644 index 0000000000..5e238bb4da --- /dev/null +++ b/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s @@ -0,0 +1,284 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB1E8_E2B918 +/* E2B918 802BB1E8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E2B91C 802BB1EC AFB1001C */ sw $s1, 0x1c($sp) +/* E2B920 802BB1F0 0080882D */ daddu $s1, $a0, $zero +/* E2B924 802BB1F4 AFBF0020 */ sw $ra, 0x20($sp) +/* E2B928 802BB1F8 AFB00018 */ sw $s0, 0x18($sp) +/* E2B92C 802BB1FC 8E300040 */ lw $s0, 0x40($s1) +/* E2B930 802BB200 82030012 */ lb $v1, 0x12($s0) +/* E2B934 802BB204 2C620009 */ sltiu $v0, $v1, 9 +/* E2B938 802BB208 104000F2 */ beqz $v0, .L802BB5D4 +/* E2B93C 802BB20C 00031080 */ sll $v0, $v1, 2 +/* E2B940 802BB210 3C01802C */ lui $at, %hi(D_802BCF50) +/* E2B944 802BB214 00220821 */ addu $at, $at, $v0 +/* E2B948 802BB218 8C22CF50 */ lw $v0, %lo(D_802BCF50)($at) +/* E2B94C 802BB21C 00400008 */ jr $v0 +/* E2B950 802BB220 00000000 */ nop +/* E2B954 802BB224 0C0AEC11 */ jal func_802BB044_E2B774 +/* E2B958 802BB228 0220202D */ daddu $a0, $s1, $zero +/* E2B95C 802BB22C 8E220000 */ lw $v0, ($s1) +/* E2B960 802BB230 3C030010 */ lui $v1, 0x10 +/* E2B964 802BB234 00431024 */ and $v0, $v0, $v1 +/* E2B968 802BB238 104000E6 */ beqz $v0, .L802BB5D4 +/* E2B96C 802BB23C 24040269 */ addiu $a0, $zero, 0x269 +/* E2B970 802BB240 92020012 */ lbu $v0, 0x12($s0) +/* E2B974 802BB244 080AED57 */ j .L802BB55C +/* E2B978 802BB248 24420001 */ addiu $v0, $v0, 1 +/* E2B97C 802BB24C C6000004 */ lwc1 $f0, 4($s0) +/* E2B980 802BB250 3C0140A0 */ lui $at, 0x40a0 +/* E2B984 802BB254 44811000 */ mtc1 $at, $f2 +/* E2B988 802BB258 00000000 */ nop +/* E2B98C 802BB25C 46020000 */ add.s $f0, $f0, $f2 +/* E2B990 802BB260 3C0141A0 */ lui $at, 0x41a0 +/* E2B994 802BB264 44811000 */ mtc1 $at, $f2 +/* E2B998 802BB268 00000000 */ nop +/* E2B99C 802BB26C 4600103E */ c.le.s $f2, $f0 +/* E2B9A0 802BB270 00000000 */ nop +/* E2B9A4 802BB274 450000D7 */ bc1f .L802BB5D4 +/* E2B9A8 802BB278 E6000004 */ swc1 $f0, 4($s0) +/* E2B9AC 802BB27C 92020012 */ lbu $v0, 0x12($s0) +/* E2B9B0 802BB280 E6020004 */ swc1 $f2, 4($s0) +/* E2B9B4 802BB284 24420001 */ addiu $v0, $v0, 1 +/* E2B9B8 802BB288 A2020012 */ sb $v0, 0x12($s0) +/* E2B9BC 802BB28C C6200068 */ lwc1 $f0, 0x68($s1) +/* E2B9C0 802BB290 3C014028 */ lui $at, 0x4028 +/* E2B9C4 802BB294 44811800 */ mtc1 $at, $f3 +/* E2B9C8 802BB298 44801000 */ mtc1 $zero, $f2 +/* E2B9CC 802BB29C 46000021 */ cvt.d.s $f0, $f0 +/* E2B9D0 802BB2A0 46220000 */ add.d $f0, $f0, $f2 +/* E2B9D4 802BB2A4 3C013E4C */ lui $at, 0x3e4c +/* E2B9D8 802BB2A8 3421CCCD */ ori $at, $at, 0xcccd +/* E2B9DC 802BB2AC 44812000 */ mtc1 $at, $f4 +/* E2B9E0 802BB2B0 3C01C000 */ lui $at, 0xc000 +/* E2B9E4 802BB2B4 44811000 */ mtc1 $at, $f2 +/* E2B9E8 802BB2B8 46200020 */ cvt.s.d $f0, $f0 +/* E2B9EC 802BB2BC E6200068 */ swc1 $f0, 0x68($s1) +/* E2B9F0 802BB2C0 E6020008 */ swc1 $f2, 8($s0) +/* E2B9F4 802BB2C4 080AED75 */ j .L802BB5D4 +/* E2B9F8 802BB2C8 E604000C */ swc1 $f4, 0xc($s0) +/* E2B9FC 802BB2CC C600000C */ lwc1 $f0, 0xc($s0) +/* E2BA00 802BB2D0 3C01802C */ lui $at, %hi(D_802BCF78) +/* E2BA04 802BB2D4 D422CF78 */ ldc1 $f2, %lo(D_802BCF78)($at) +/* E2BA08 802BB2D8 46000021 */ cvt.d.s $f0, $f0 +/* E2BA0C 802BB2DC 46220000 */ add.d $f0, $f0, $f2 +/* E2BA10 802BB2E0 46200020 */ cvt.s.d $f0, $f0 +/* E2BA14 802BB2E4 E600000C */ swc1 $f0, 0xc($s0) +/* E2BA18 802BB2E8 C6220060 */ lwc1 $f2, 0x60($s1) +/* E2BA1C 802BB2EC 46001080 */ add.s $f2, $f2, $f0 +/* E2BA20 802BB2F0 E6220060 */ swc1 $f2, 0x60($s1) +/* E2BA24 802BB2F4 C6000008 */ lwc1 $f0, 8($s0) +/* E2BA28 802BB2F8 3C013FF0 */ lui $at, 0x3ff0 +/* E2BA2C 802BB2FC 44811800 */ mtc1 $at, $f3 +/* E2BA30 802BB300 44801000 */ mtc1 $zero, $f2 +/* E2BA34 802BB304 46000021 */ cvt.d.s $f0, $f0 +/* E2BA38 802BB308 46220001 */ sub.d $f0, $f0, $f2 +/* E2BA3C 802BB30C 46200020 */ cvt.s.d $f0, $f0 +/* E2BA40 802BB310 E6000008 */ swc1 $f0, 8($s0) +/* E2BA44 802BB314 C622004C */ lwc1 $f2, 0x4c($s1) +/* E2BA48 802BB318 46001080 */ add.s $f2, $f2, $f0 +/* E2BA4C 802BB31C C620006C */ lwc1 $f0, 0x6c($s1) +/* E2BA50 802BB320 4600103E */ c.le.s $f2, $f0 +/* E2BA54 802BB324 00000000 */ nop +/* E2BA58 802BB328 450000AA */ bc1f .L802BB5D4 +/* E2BA5C 802BB32C E622004C */ swc1 $f2, 0x4c($s1) +/* E2BA60 802BB330 E620004C */ swc1 $f0, 0x4c($s1) +/* E2BA64 802BB334 3C0140A0 */ lui $at, 0x40a0 +/* E2BA68 802BB338 44810000 */ mtc1 $at, $f0 +/* E2BA6C 802BB33C 92020012 */ lbu $v0, 0x12($s0) +/* E2BA70 802BB340 3C014040 */ lui $at, 0x4040 +/* E2BA74 802BB344 44811000 */ mtc1 $at, $f2 +/* E2BA78 802BB348 24420001 */ addiu $v0, $v0, 1 +/* E2BA7C 802BB34C E6000008 */ swc1 $f0, 8($s0) +/* E2BA80 802BB350 E602000C */ swc1 $f2, 0xc($s0) +/* E2BA84 802BB354 A2020012 */ sb $v0, 0x12($s0) +/* E2BA88 802BB358 C624004C */ lwc1 $f4, 0x4c($s1) +/* E2BA8C 802BB35C 3C0141C8 */ lui $at, 0x41c8 +/* E2BA90 802BB360 44810000 */ mtc1 $at, $f0 +/* E2BA94 802BB364 3C014120 */ lui $at, 0x4120 +/* E2BA98 802BB368 44811000 */ mtc1 $at, $f2 +/* E2BA9C 802BB36C 46002100 */ add.s $f4, $f4, $f0 +/* E2BAA0 802BB370 E7A20010 */ swc1 $f2, 0x10($sp) +/* E2BAA4 802BB374 8E250048 */ lw $a1, 0x48($s1) +/* E2BAA8 802BB378 8E270050 */ lw $a3, 0x50($s1) +/* E2BAAC 802BB37C 44062000 */ mfc1 $a2, $f4 +/* E2BAB0 802BB380 0C01BFBC */ jal func_8006FEF0 +/* E2BAB4 802BB384 0000202D */ daddu $a0, $zero, $zero +/* E2BAB8 802BB388 8E220000 */ lw $v0, ($s1) +/* E2BABC 802BB38C 34420020 */ ori $v0, $v0, 0x20 +/* E2BAC0 802BB390 080AED75 */ j .L802BB5D4 +/* E2BAC4 802BB394 AE220000 */ sw $v0, ($s1) +/* E2BAC8 802BB398 C600000C */ lwc1 $f0, 0xc($s0) +/* E2BACC 802BB39C 3C01802C */ lui $at, %hi(D_802BCF80) +/* E2BAD0 802BB3A0 D422CF80 */ ldc1 $f2, %lo(D_802BCF80)($at) +/* E2BAD4 802BB3A4 46000021 */ cvt.d.s $f0, $f0 +/* E2BAD8 802BB3A8 46220000 */ add.d $f0, $f0, $f2 +/* E2BADC 802BB3AC 46200020 */ cvt.s.d $f0, $f0 +/* E2BAE0 802BB3B0 E600000C */ swc1 $f0, 0xc($s0) +/* E2BAE4 802BB3B4 C6220060 */ lwc1 $f2, 0x60($s1) +/* E2BAE8 802BB3B8 46001080 */ add.s $f2, $f2, $f0 +/* E2BAEC 802BB3BC E6220060 */ swc1 $f2, 0x60($s1) +/* E2BAF0 802BB3C0 C6000008 */ lwc1 $f0, 8($s0) +/* E2BAF4 802BB3C4 3C014000 */ lui $at, 0x4000 +/* E2BAF8 802BB3C8 44811800 */ mtc1 $at, $f3 +/* E2BAFC 802BB3CC 44801000 */ mtc1 $zero, $f2 +/* E2BB00 802BB3D0 46000021 */ cvt.d.s $f0, $f0 +/* E2BB04 802BB3D4 46220001 */ sub.d $f0, $f0, $f2 +/* E2BB08 802BB3D8 46200020 */ cvt.s.d $f0, $f0 +/* E2BB0C 802BB3DC E6000008 */ swc1 $f0, 8($s0) +/* E2BB10 802BB3E0 C622004C */ lwc1 $f2, 0x4c($s1) +/* E2BB14 802BB3E4 46001080 */ add.s $f2, $f2, $f0 +/* E2BB18 802BB3E8 C620006C */ lwc1 $f0, 0x6c($s1) +/* E2BB1C 802BB3EC 4600103E */ c.le.s $f2, $f0 +/* E2BB20 802BB3F0 00000000 */ nop +/* E2BB24 802BB3F4 45000077 */ bc1f .L802BB5D4 +/* E2BB28 802BB3F8 E622004C */ swc1 $f2, 0x4c($s1) +/* E2BB2C 802BB3FC 2404026A */ addiu $a0, $zero, 0x26a +/* E2BB30 802BB400 E620004C */ swc1 $f0, 0x4c($s1) +/* E2BB34 802BB404 3C014120 */ lui $at, 0x4120 +/* E2BB38 802BB408 44810000 */ mtc1 $at, $f0 +/* E2BB3C 802BB40C 3C013E4C */ lui $at, 0x3e4c +/* E2BB40 802BB410 3421CCCD */ ori $at, $at, 0xcccd +/* E2BB44 802BB414 44811000 */ mtc1 $at, $f2 +/* E2BB48 802BB418 92030012 */ lbu $v1, 0x12($s0) +/* E2BB4C 802BB41C 24020002 */ addiu $v0, $zero, 2 +/* E2BB50 802BB420 A2020011 */ sb $v0, 0x11($s0) +/* E2BB54 802BB424 24630001 */ addiu $v1, $v1, 1 +/* E2BB58 802BB428 E6000008 */ swc1 $f0, 8($s0) +/* E2BB5C 802BB42C E602000C */ swc1 $f2, 0xc($s0) +/* E2BB60 802BB430 0C05272D */ jal play_sound +/* E2BB64 802BB434 A2030012 */ sb $v1, 0x12($s0) +/* E2BB68 802BB438 080AED75 */ j .L802BB5D4 +/* E2BB6C 802BB43C 00000000 */ nop +/* E2BB70 802BB440 92020011 */ lbu $v0, 0x11($s0) +/* E2BB74 802BB444 2442FFFF */ addiu $v0, $v0, -1 +/* E2BB78 802BB448 A2020011 */ sb $v0, 0x11($s0) +/* E2BB7C 802BB44C 00021600 */ sll $v0, $v0, 0x18 +/* E2BB80 802BB450 1C400060 */ bgtz $v0, .L802BB5D4 +/* E2BB84 802BB454 00000000 */ nop +/* E2BB88 802BB458 92020012 */ lbu $v0, 0x12($s0) +/* E2BB8C 802BB45C 24420001 */ addiu $v0, $v0, 1 +/* E2BB90 802BB460 080AED75 */ j .L802BB5D4 +/* E2BB94 802BB464 A2020012 */ sb $v0, 0x12($s0) +/* E2BB98 802BB468 C600000C */ lwc1 $f0, 0xc($s0) +/* E2BB9C 802BB46C 46000000 */ add.s $f0, $f0, $f0 +/* E2BBA0 802BB470 3C0141F0 */ lui $at, 0x41f0 +/* E2BBA4 802BB474 44811000 */ mtc1 $at, $f2 +/* E2BBA8 802BB478 00000000 */ nop +/* E2BBAC 802BB47C 4600103C */ c.lt.s $f2, $f0 +/* E2BBB0 802BB480 00000000 */ nop +/* E2BBB4 802BB484 45000002 */ bc1f .L802BB490 +/* E2BBB8 802BB488 E600000C */ swc1 $f0, 0xc($s0) +/* E2BBBC 802BB48C E602000C */ swc1 $f2, 0xc($s0) +.L802BB490: +/* E2BBC0 802BB490 C6240060 */ lwc1 $f4, 0x60($s1) +/* E2BBC4 802BB494 C600000C */ lwc1 $f0, 0xc($s0) +/* E2BBC8 802BB498 46002100 */ add.s $f4, $f4, $f0 +/* E2BBCC 802BB49C 3C01802C */ lui $at, %hi(D_802BCF88) +/* E2BBD0 802BB4A0 D422CF88 */ ldc1 $f2, %lo(D_802BCF88)($at) +/* E2BBD4 802BB4A4 46002021 */ cvt.d.s $f0, $f4 +/* E2BBD8 802BB4A8 4620103E */ c.le.d $f2, $f0 +/* E2BBDC 802BB4AC 00000000 */ nop +/* E2BBE0 802BB4B0 45000048 */ bc1f .L802BB5D4 +/* E2BBE4 802BB4B4 E6240060 */ swc1 $f4, 0x60($s1) +/* E2BBE8 802BB4B8 3C0142B4 */ lui $at, 0x42b4 +/* E2BBEC 802BB4BC 44810000 */ mtc1 $at, $f0 +/* E2BBF0 802BB4C0 2404026A */ addiu $a0, $zero, 0x26a +/* E2BBF4 802BB4C4 E6200060 */ swc1 $f0, 0x60($s1) +/* E2BBF8 802BB4C8 92020012 */ lbu $v0, 0x12($s0) +/* E2BBFC 802BB4CC 3C01C1A0 */ lui $at, 0xc1a0 +/* E2BC00 802BB4D0 44810000 */ mtc1 $at, $f0 +/* E2BC04 802BB4D4 24420001 */ addiu $v0, $v0, 1 +/* E2BC08 802BB4D8 080AED57 */ j .L802BB55C +/* E2BC0C 802BB4DC E600000C */ swc1 $f0, 0xc($s0) +/* E2BC10 802BB4E0 C600000C */ lwc1 $f0, 0xc($s0) +/* E2BC14 802BB4E4 3C014120 */ lui $at, 0x4120 +/* E2BC18 802BB4E8 44811000 */ mtc1 $at, $f2 +/* E2BC1C 802BB4EC 00000000 */ nop +/* E2BC20 802BB4F0 46020000 */ add.s $f0, $f0, $f2 +/* E2BC24 802BB4F4 3C0141F0 */ lui $at, 0x41f0 +/* E2BC28 802BB4F8 44811000 */ mtc1 $at, $f2 +/* E2BC2C 802BB4FC 00000000 */ nop +/* E2BC30 802BB500 4600103C */ c.lt.s $f2, $f0 +/* E2BC34 802BB504 00000000 */ nop +/* E2BC38 802BB508 45000002 */ bc1f .L802BB514 +/* E2BC3C 802BB50C E600000C */ swc1 $f0, 0xc($s0) +/* E2BC40 802BB510 E602000C */ swc1 $f2, 0xc($s0) +.L802BB514: +/* E2BC44 802BB514 C6240060 */ lwc1 $f4, 0x60($s1) +/* E2BC48 802BB518 C600000C */ lwc1 $f0, 0xc($s0) +/* E2BC4C 802BB51C 46002100 */ add.s $f4, $f4, $f0 +/* E2BC50 802BB520 3C01802C */ lui $at, %hi(D_802BCF90) +/* E2BC54 802BB524 D422CF90 */ ldc1 $f2, %lo(D_802BCF90)($at) +/* E2BC58 802BB528 46002021 */ cvt.d.s $f0, $f4 +/* E2BC5C 802BB52C 4620103E */ c.le.d $f2, $f0 +/* E2BC60 802BB530 00000000 */ nop +/* E2BC64 802BB534 45000027 */ bc1f .L802BB5D4 +/* E2BC68 802BB538 E6240060 */ swc1 $f4, 0x60($s1) +/* E2BC6C 802BB53C 3C0142B4 */ lui $at, 0x42b4 +/* E2BC70 802BB540 44810000 */ mtc1 $at, $f0 +/* E2BC74 802BB544 2404026A */ addiu $a0, $zero, 0x26a +/* E2BC78 802BB548 E6200060 */ swc1 $f0, 0x60($s1) +/* E2BC7C 802BB54C 92020012 */ lbu $v0, 0x12($s0) +/* E2BC80 802BB550 24030005 */ addiu $v1, $zero, 5 +/* E2BC84 802BB554 A2030011 */ sb $v1, 0x11($s0) +/* E2BC88 802BB558 24420001 */ addiu $v0, $v0, 1 +.L802BB55C: +/* E2BC8C 802BB55C 0C05272D */ jal play_sound +/* E2BC90 802BB560 A2020012 */ sb $v0, 0x12($s0) +/* E2BC94 802BB564 080AED75 */ j .L802BB5D4 +/* E2BC98 802BB568 00000000 */ nop +/* E2BC9C 802BB56C 92020011 */ lbu $v0, 0x11($s0) +/* E2BCA0 802BB570 2442FFFF */ addiu $v0, $v0, -1 +/* E2BCA4 802BB574 A2020011 */ sb $v0, 0x11($s0) +/* E2BCA8 802BB578 00021600 */ sll $v0, $v0, 0x18 +/* E2BCAC 802BB57C 1C400015 */ bgtz $v0, .L802BB5D4 +/* E2BCB0 802BB580 0220202D */ daddu $a0, $s1, $zero +/* E2BCB4 802BB584 92020012 */ lbu $v0, 0x12($s0) +/* E2BCB8 802BB588 24420001 */ addiu $v0, $v0, 1 +/* E2BCBC 802BB58C 0C04419E */ jal func_80110678 +/* E2BCC0 802BB590 A2020012 */ sb $v0, 0x12($s0) +/* E2BCC4 802BB594 24020005 */ addiu $v0, $zero, 5 +/* E2BCC8 802BB598 080AED75 */ j .L802BB5D4 +/* E2BCCC 802BB59C A2020011 */ sb $v0, 0x11($s0) +/* E2BCD0 802BB5A0 92020011 */ lbu $v0, 0x11($s0) +/* E2BCD4 802BB5A4 2442FFFF */ addiu $v0, $v0, -1 +/* E2BCD8 802BB5A8 A2020011 */ sb $v0, 0x11($s0) +/* E2BCDC 802BB5AC 00021600 */ sll $v0, $v0, 0x18 +/* E2BCE0 802BB5B0 1C400008 */ bgtz $v0, .L802BB5D4 +/* E2BCE4 802BB5B4 0220202D */ daddu $a0, $s1, $zero +/* E2BCE8 802BB5B8 92020012 */ lbu $v0, 0x12($s0) +/* E2BCEC 802BB5BC 24420001 */ addiu $v0, $v0, 1 +/* E2BCF0 802BB5C0 A2020012 */ sb $v0, 0x12($s0) +/* E2BCF4 802BB5C4 8E220000 */ lw $v0, ($s1) +/* E2BCF8 802BB5C8 34420021 */ ori $v0, $v0, 0x21 +/* E2BCFC 802BB5CC 0C043F5A */ jal func_8010FD68 +/* E2BD00 802BB5D0 AE220000 */ sw $v0, ($s1) +.L802BB5D4: +/* E2BD04 802BB5D4 92020012 */ lbu $v0, 0x12($s0) +/* E2BD08 802BB5D8 2442FFFE */ addiu $v0, $v0, -2 +/* E2BD0C 802BB5DC 2C420007 */ sltiu $v0, $v0, 7 +/* E2BD10 802BB5E0 1040000D */ beqz $v0, .L802BB618 +/* E2BD14 802BB5E4 00000000 */ nop +/* E2BD18 802BB5E8 92020010 */ lbu $v0, 0x10($s0) +/* E2BD1C 802BB5EC 24420001 */ addiu $v0, $v0, 1 +/* E2BD20 802BB5F0 A2020010 */ sb $v0, 0x10($s0) +/* E2BD24 802BB5F4 30420001 */ andi $v0, $v0, 1 +/* E2BD28 802BB5F8 10400004 */ beqz $v0, .L802BB60C +/* E2BD2C 802BB5FC 2403FFFE */ addiu $v1, $zero, -2 +/* E2BD30 802BB600 8E220000 */ lw $v0, ($s1) +/* E2BD34 802BB604 080AED85 */ j .L802BB614 +/* E2BD38 802BB608 34420001 */ ori $v0, $v0, 1 +.L802BB60C: +/* E2BD3C 802BB60C 8E220000 */ lw $v0, ($s1) +/* E2BD40 802BB610 00431024 */ and $v0, $v0, $v1 +.L802BB614: +/* E2BD44 802BB614 AE220000 */ sw $v0, ($s1) +.L802BB618: +/* E2BD48 802BB618 8FBF0020 */ lw $ra, 0x20($sp) +/* E2BD4C 802BB61C 8FB1001C */ lw $s1, 0x1c($sp) +/* E2BD50 802BB620 8FB00018 */ lw $s0, 0x18($sp) +/* E2BD54 802BB624 03E00008 */ jr $ra +/* E2BD58 802BB628 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_E2B530/func_802BB62C_E2BD5C.s b/asm/nonmatchings/code_E2B530/func_802BB62C_E2BD5C.s new file mode 100644 index 0000000000..a0c672545d --- /dev/null +++ b/asm/nonmatchings/code_E2B530/func_802BB62C_E2BD5C.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB62C_E2BD5C +/* E2BD5C 802BB62C 3C02802C */ lui $v0, %hi(func_802BAE00_E2B530) +/* E2BD60 802BB630 2442AE00 */ addiu $v0, $v0, %lo(func_802BAE00_E2B530) +/* E2BD64 802BB634 3C030A00 */ lui $v1, 0xa00 +/* E2BD68 802BB638 24631EF8 */ addiu $v1, $v1, 0x1ef8 +/* E2BD6C 802BB63C 3063FFFF */ andi $v1, $v1, 0xffff +/* E2BD70 802BB640 AC82003C */ sw $v0, 0x3c($a0) +/* E2BD74 802BB644 8C820044 */ lw $v0, 0x44($a0) +/* E2BD78 802BB648 8C840040 */ lw $a0, 0x40($a0) +/* E2BD7C 802BB64C 00431021 */ addu $v0, $v0, $v1 +/* E2BD80 802BB650 AC820014 */ sw $v0, 0x14($a0) +/* E2BD84 802BB654 3C020A00 */ lui $v0, 0xa00 +/* E2BD88 802BB658 24421FA0 */ addiu $v0, $v0, 0x1fa0 +/* E2BD8C 802BB65C 03E00008 */ jr $ra +/* E2BD90 802BB660 AC820018 */ sw $v0, 0x18($a0) diff --git a/asm/nonmatchings/code_E2B530/func_802BB664_E2BD94.s b/asm/nonmatchings/code_E2B530/func_802BB664_E2BD94.s new file mode 100644 index 0000000000..fad93baf1e --- /dev/null +++ b/asm/nonmatchings/code_E2B530/func_802BB664_E2BD94.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB664_E2BD94 +/* E2BD94 802BB664 3C02802C */ lui $v0, %hi(func_802BAE00_E2B530) +/* E2BD98 802BB668 2442AE00 */ addiu $v0, $v0, %lo(func_802BAE00_E2B530) +/* E2BD9C 802BB66C 3C030A00 */ lui $v1, 0xa00 +/* E2BDA0 802BB670 24631690 */ addiu $v1, $v1, 0x1690 +/* E2BDA4 802BB674 3063FFFF */ andi $v1, $v1, 0xffff +/* E2BDA8 802BB678 AC82003C */ sw $v0, 0x3c($a0) +/* E2BDAC 802BB67C 8C820044 */ lw $v0, 0x44($a0) +/* E2BDB0 802BB680 8C840040 */ lw $a0, 0x40($a0) +/* E2BDB4 802BB684 00431021 */ addu $v0, $v0, $v1 +/* E2BDB8 802BB688 AC820014 */ sw $v0, 0x14($a0) +/* E2BDBC 802BB68C 3C020A00 */ lui $v0, 0xa00 +/* E2BDC0 802BB690 24421840 */ addiu $v0, $v0, 0x1840 +/* E2BDC4 802BB694 03E00008 */ jr $ra +/* E2BDC8 802BB698 AC820018 */ sw $v0, 0x18($a0) diff --git a/asm/nonmatchings/code_E2B530/func_802BB69C_E2BDCC.s b/asm/nonmatchings/code_E2B530/func_802BB69C_E2BDCC.s new file mode 100644 index 0000000000..3f80256c81 --- /dev/null +++ b/asm/nonmatchings/code_E2B530/func_802BB69C_E2BDCC.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB69C_E2BDCC +/* E2BDCC 802BB69C 3C02802C */ lui $v0, %hi(func_802BAE00_E2B530) +/* E2BDD0 802BB6A0 2442AE00 */ addiu $v0, $v0, %lo(func_802BAE00_E2B530) +/* E2BDD4 802BB6A4 3C030A00 */ lui $v1, 0xa00 +/* E2BDD8 802BB6A8 24631AC8 */ addiu $v1, $v1, 0x1ac8 +/* E2BDDC 802BB6AC 3063FFFF */ andi $v1, $v1, 0xffff +/* E2BDE0 802BB6B0 AC82003C */ sw $v0, 0x3c($a0) +/* E2BDE4 802BB6B4 8C820044 */ lw $v0, 0x44($a0) +/* E2BDE8 802BB6B8 8C840040 */ lw $a0, 0x40($a0) +/* E2BDEC 802BB6BC 00431021 */ addu $v0, $v0, $v1 +/* E2BDF0 802BB6C0 AC820014 */ sw $v0, 0x14($a0) +/* E2BDF4 802BB6C4 3C020A00 */ lui $v0, 0xa00 +/* E2BDF8 802BB6C8 24421B70 */ addiu $v0, $v0, 0x1b70 +/* E2BDFC 802BB6CC 03E00008 */ jr $ra +/* E2BE00 802BB6D0 AC820018 */ sw $v0, 0x18($a0) diff --git a/asm/nonmatchings/code_E2B530/func_802BB6D4_E2BE04.s b/asm/nonmatchings/code_E2B530/func_802BB6D4_E2BE04.s new file mode 100644 index 0000000000..d9246b20a9 --- /dev/null +++ b/asm/nonmatchings/code_E2B530/func_802BB6D4_E2BE04.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB6D4_E2BE04 +/* E2BE04 802BB6D4 3C02802C */ lui $v0, %hi(func_802BAE00_E2B530) +/* E2BE08 802BB6D8 2442AE00 */ addiu $v0, $v0, %lo(func_802BAE00_E2B530) +/* E2BE0C 802BB6DC 3C030A00 */ lui $v1, 0xa00 +/* E2BE10 802BB6E0 24631AC8 */ addiu $v1, $v1, 0x1ac8 +/* E2BE14 802BB6E4 3063FFFF */ andi $v1, $v1, 0xffff +/* E2BE18 802BB6E8 AC82003C */ sw $v0, 0x3c($a0) +/* E2BE1C 802BB6EC 8C820044 */ lw $v0, 0x44($a0) +/* E2BE20 802BB6F0 8C840040 */ lw $a0, 0x40($a0) +/* E2BE24 802BB6F4 00431021 */ addu $v0, $v0, $v1 +/* E2BE28 802BB6F8 AC820014 */ sw $v0, 0x14($a0) +/* E2BE2C 802BB6FC 3C020A00 */ lui $v0, 0xa00 +/* E2BE30 802BB700 24421B70 */ addiu $v0, $v0, 0x1b70 +/* E2BE34 802BB704 03E00008 */ jr $ra +/* E2BE38 802BB708 AC820018 */ sw $v0, 0x18($a0) +/* E2BE3C 802BB70C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2BE40/func_802BB710_E2BE40.s b/asm/nonmatchings/code_E2BE40/func_802BB710_E2BE40.s new file mode 100644 index 0000000000..8a8115acdf --- /dev/null +++ b/asm/nonmatchings/code_E2BE40/func_802BB710_E2BE40.s @@ -0,0 +1,94 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB710_E2BE40 +/* E2BE40 802BB710 27BDFF48 */ addiu $sp, $sp, -0xb8 +/* E2BE44 802BB714 AFB3009C */ sw $s3, 0x9c($sp) +/* E2BE48 802BB718 0080982D */ daddu $s3, $a0, $zero +/* E2BE4C 802BB71C AFB400A0 */ sw $s4, 0xa0($sp) +/* E2BE50 802BB720 00C0A02D */ daddu $s4, $a2, $zero +/* E2BE54 802BB724 27A40050 */ addiu $a0, $sp, 0x50 +/* E2BE58 802BB728 AFB20098 */ sw $s2, 0x98($sp) +/* E2BE5C 802BB72C 0000902D */ daddu $s2, $zero, $zero +/* E2BE60 802BB730 AFB600A8 */ sw $s6, 0xa8($sp) +/* E2BE64 802BB734 24160014 */ addiu $s6, $zero, 0x14 +/* E2BE68 802BB738 AFB500A4 */ sw $s5, 0xa4($sp) +/* E2BE6C 802BB73C 2415FFF6 */ addiu $s5, $zero, -0xa +/* E2BE70 802BB740 AFBF00AC */ sw $ra, 0xac($sp) +/* E2BE74 802BB744 AFB10094 */ sw $s1, 0x94($sp) +/* E2BE78 802BB748 AFB00090 */ sw $s0, 0x90($sp) +/* E2BE7C 802BB74C F7B400B0 */ sdc1 $f20, 0xb0($sp) +/* E2BE80 802BB750 8E620040 */ lw $v0, 0x40($s3) +/* E2BE84 802BB754 30A5FFFF */ andi $a1, $a1, 0xffff +/* E2BE88 802BB758 0040802D */ daddu $s0, $v0, $zero +/* E2BE8C 802BB75C 8E620044 */ lw $v0, 0x44($s3) +/* E2BE90 802BB760 3C014120 */ lui $at, 0x4120 +/* E2BE94 802BB764 4481A000 */ mtc1 $at, $f20 +/* E2BE98 802BB768 00451021 */ addu $v0, $v0, $a1 +/* E2BE9C 802BB76C AE020000 */ sw $v0, ($s0) +/* E2BEA0 802BB770 3C02802C */ lui $v0, %hi(func_802BBE3C_E2C56C) +/* E2BEA4 802BB774 2442BE3C */ addiu $v0, $v0, %lo(func_802BBE3C_E2C56C) +/* E2BEA8 802BB778 AE62003C */ sw $v0, 0x3c($s3) +/* E2BEAC 802BB77C 240200FF */ addiu $v0, $zero, 0xff +/* E2BEB0 802BB780 A262000B */ sb $v0, 0xb($s3) +/* E2BEB4 802BB784 C6000004 */ lwc1 $f0, 4($s0) +/* E2BEB8 802BB788 8E650048 */ lw $a1, 0x48($s3) +/* E2BEBC 802BB78C 8E670050 */ lw $a3, 0x50($s3) +/* E2BEC0 802BB790 44060000 */ mfc1 $a2, $f0 +/* E2BEC4 802BB794 0200882D */ daddu $s1, $s0, $zero +/* E2BEC8 802BB798 0C019E40 */ jal guTranslateF +/* E2BECC 802BB79C AE66004C */ sw $a2, 0x4c($s3) +.L802BB7A0: +/* E2BED0 802BB7A0 3282FFFF */ andi $v0, $s4, 0xffff +/* E2BED4 802BB7A4 26940040 */ addiu $s4, $s4, 0x40 +/* E2BED8 802BB7A8 8E650044 */ lw $a1, 0x44($s3) +/* E2BEDC 802BB7AC 27A40010 */ addiu $a0, $sp, 0x10 +/* E2BEE0 802BB7B0 0C019D60 */ jal guMtxL2F +/* E2BEE4 802BB7B4 00A22821 */ addu $a1, $a1, $v0 +/* E2BEE8 802BB7B8 27A40050 */ addiu $a0, $sp, 0x50 +/* E2BEEC 802BB7BC 27A50010 */ addiu $a1, $sp, 0x10 +/* E2BEF0 802BB7C0 0C019D80 */ jal guMtxCatF +/* E2BEF4 802BB7C4 00A0302D */ daddu $a2, $a1, $zero +/* E2BEF8 802BB7C8 C7A00040 */ lwc1 $f0, 0x40($sp) +/* E2BEFC 802BB7CC E6000080 */ swc1 $f0, 0x80($s0) +/* E2BF00 802BB7D0 C7A00044 */ lwc1 $f0, 0x44($sp) +/* E2BF04 802BB7D4 E60000B4 */ swc1 $f0, 0xb4($s0) +/* E2BF08 802BB7D8 C7A00048 */ lwc1 $f0, 0x48($sp) +/* E2BF0C 802BB7DC 240400FF */ addiu $a0, $zero, 0xff +/* E2BF10 802BB7E0 0C00A67F */ jal rand_int +/* E2BF14 802BB7E4 E60000E8 */ swc1 $f0, 0xe8($s0) +/* E2BF18 802BB7E8 24040005 */ addiu $a0, $zero, 5 +/* E2BF1C 802BB7EC 00021023 */ negu $v0, $v0 +/* E2BF20 802BB7F0 A2220015 */ sb $v0, 0x15($s1) +/* E2BF24 802BB7F4 0C00A67F */ jal rand_int +/* E2BF28 802BB7F8 A236003C */ sb $s6, 0x3c($s1) +/* E2BF2C 802BB7FC 0040182D */ daddu $v1, $v0, $zero +/* E2BF30 802BB800 32420001 */ andi $v0, $s2, 1 +/* E2BF34 802BB804 14400002 */ bnez $v0, .L802BB810 +/* E2BF38 802BB808 2462000A */ addiu $v0, $v1, 0xa +/* E2BF3C 802BB80C 02A31023 */ subu $v0, $s5, $v1 +.L802BB810: +/* E2BF40 802BB810 44820000 */ mtc1 $v0, $f0 +/* E2BF44 802BB814 00000000 */ nop +/* E2BF48 802BB818 46800020 */ cvt.s.w $f0, $f0 +/* E2BF4C 802BB81C E600004C */ swc1 $f0, 0x4c($s0) +/* E2BF50 802BB820 E614011C */ swc1 $f20, 0x11c($s0) +/* E2BF54 802BB824 A2200008 */ sb $zero, 8($s1) +/* E2BF58 802BB828 A2200022 */ sb $zero, 0x22($s1) +/* E2BF5C 802BB82C A220002F */ sb $zero, 0x2f($s1) +/* E2BF60 802BB830 26310001 */ addiu $s1, $s1, 1 +/* E2BF64 802BB834 26520001 */ addiu $s2, $s2, 1 +/* E2BF68 802BB838 2A42000C */ slti $v0, $s2, 0xc +/* E2BF6C 802BB83C 1440FFD8 */ bnez $v0, .L802BB7A0 +/* E2BF70 802BB840 26100004 */ addiu $s0, $s0, 4 +/* E2BF74 802BB844 8FBF00AC */ lw $ra, 0xac($sp) +/* E2BF78 802BB848 8FB600A8 */ lw $s6, 0xa8($sp) +/* E2BF7C 802BB84C 8FB500A4 */ lw $s5, 0xa4($sp) +/* E2BF80 802BB850 8FB400A0 */ lw $s4, 0xa0($sp) +/* E2BF84 802BB854 8FB3009C */ lw $s3, 0x9c($sp) +/* E2BF88 802BB858 8FB20098 */ lw $s2, 0x98($sp) +/* E2BF8C 802BB85C 8FB10094 */ lw $s1, 0x94($sp) +/* E2BF90 802BB860 8FB00090 */ lw $s0, 0x90($sp) +/* E2BF94 802BB864 D7B400B0 */ ldc1 $f20, 0xb0($sp) +/* E2BF98 802BB868 03E00008 */ jr $ra +/* E2BF9C 802BB86C 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/asm/nonmatchings/code_E2BE40/func_802BB870_E2BFA0.s b/asm/nonmatchings/code_E2BE40/func_802BB870_E2BFA0.s new file mode 100644 index 0000000000..951d85c728 --- /dev/null +++ b/asm/nonmatchings/code_E2BE40/func_802BB870_E2BFA0.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB870_E2BFA0 +/* E2BFA0 802BB870 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2BFA4 802BB874 3C050A00 */ lui $a1, 0xa00 +/* E2BFA8 802BB878 24A52E18 */ addiu $a1, $a1, 0x2e18 +/* E2BFAC 802BB87C AFBF0010 */ sw $ra, 0x10($sp) +/* E2BFB0 802BB880 8C820040 */ lw $v0, 0x40($a0) +/* E2BFB4 802BB884 C480004C */ lwc1 $f0, 0x4c($a0) +/* E2BFB8 802BB888 3C060A00 */ lui $a2, 0xa00 +/* E2BFBC 802BB88C 24C62478 */ addiu $a2, $a2, 0x2478 +/* E2BFC0 802BB890 0C0AEDC4 */ jal func_802BB710_E2BE40 +/* E2BFC4 802BB894 E4400004 */ swc1 $f0, 4($v0) +/* E2BFC8 802BB898 8FBF0010 */ lw $ra, 0x10($sp) +/* E2BFCC 802BB89C 03E00008 */ jr $ra +/* E2BFD0 802BB8A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2BE40/func_802BB8A4_E2BFD4.s b/asm/nonmatchings/code_E2BE40/func_802BB8A4_E2BFD4.s new file mode 100644 index 0000000000..b8a799e69d --- /dev/null +++ b/asm/nonmatchings/code_E2BE40/func_802BB8A4_E2BFD4.s @@ -0,0 +1,382 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB8A4_E2BFD4 +/* E2BFD4 802BB8A4 27BDFF78 */ addiu $sp, $sp, -0x88 +/* E2BFD8 802BB8A8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* E2BFDC 802BB8AC 4480D000 */ mtc1 $zero, $f26 +/* E2BFE0 802BB8B0 F7BE0080 */ sdc1 $f30, 0x80($sp) +/* E2BFE4 802BB8B4 3C014F00 */ lui $at, 0x4f00 +/* E2BFE8 802BB8B8 4481F000 */ mtc1 $at, $f30 +/* E2BFEC 802BB8BC AFBE0050 */ sw $fp, 0x50($sp) +/* E2BFF0 802BB8C0 0080F02D */ daddu $fp, $a0, $zero +/* E2BFF4 802BB8C4 AFB3003C */ sw $s3, 0x3c($sp) +/* E2BFF8 802BB8C8 0000982D */ daddu $s3, $zero, $zero +/* E2BFFC 802BB8CC AFB60048 */ sw $s6, 0x48($sp) +/* E2C000 802BB8D0 27B60020 */ addiu $s6, $sp, 0x20 +/* E2C004 802BB8D4 AFB50044 */ sw $s5, 0x44($sp) +/* E2C008 802BB8D8 27B50024 */ addiu $s5, $sp, 0x24 +/* E2C00C 802BB8DC AFB40040 */ sw $s4, 0x40($sp) +/* E2C010 802BB8E0 27B40028 */ addiu $s4, $sp, 0x28 +/* E2C014 802BB8E4 AFB7004C */ sw $s7, 0x4c($sp) +/* E2C018 802BB8E8 3C178000 */ lui $s7, 0x8000 +/* E2C01C 802BB8EC AFBF0054 */ sw $ra, 0x54($sp) +/* E2C020 802BB8F0 AFB20038 */ sw $s2, 0x38($sp) +/* E2C024 802BB8F4 AFB10034 */ sw $s1, 0x34($sp) +/* E2C028 802BB8F8 AFB00030 */ sw $s0, 0x30($sp) +/* E2C02C 802BB8FC F7BC0078 */ sdc1 $f28, 0x78($sp) +/* E2C030 802BB900 F7B80068 */ sdc1 $f24, 0x68($sp) +/* E2C034 802BB904 F7B60060 */ sdc1 $f22, 0x60($sp) +/* E2C038 802BB908 F7B40058 */ sdc1 $f20, 0x58($sp) +/* E2C03C 802BB90C 8FD20040 */ lw $s2, 0x40($fp) +/* E2C040 802BB910 4600D706 */ mov.s $f28, $f26 +/* E2C044 802BB914 4600D606 */ mov.s $f24, $f26 +/* E2C048 802BB918 0240882D */ daddu $s1, $s2, $zero +/* E2C04C 802BB91C 0240802D */ daddu $s0, $s2, $zero +.L802BB920: +/* E2C050 802BB920 82230008 */ lb $v1, 8($s1) +/* E2C054 802BB924 24020001 */ addiu $v0, $zero, 1 +/* E2C058 802BB928 10620028 */ beq $v1, $v0, .L802BB9CC +/* E2C05C 802BB92C 28620002 */ slti $v0, $v1, 2 +/* E2C060 802BB930 10400005 */ beqz $v0, .L802BB948 +/* E2C064 802BB934 24020002 */ addiu $v0, $zero, 2 +/* E2C068 802BB938 10600009 */ beqz $v1, .L802BB960 +/* E2C06C 802BB93C 00000000 */ nop +/* E2C070 802BB940 080AEE9B */ j .L802BBA6C +/* E2C074 802BB944 00000000 */ nop +.L802BB948: +/* E2C078 802BB948 10620029 */ beq $v1, $v0, .L802BB9F0 +/* E2C07C 802BB94C 24020003 */ addiu $v0, $zero, 3 +/* E2C080 802BB950 50620046 */ beql $v1, $v0, .L802BBA6C +/* E2C084 802BB954 26730001 */ addiu $s3, $s3, 1 +/* E2C088 802BB958 080AEE9B */ j .L802BBA6C +/* E2C08C 802BB95C 00000000 */ nop +.L802BB960: +/* E2C090 802BB960 3C014000 */ lui $at, 0x4000 +/* E2C094 802BB964 4481E000 */ mtc1 $at, $f28 +/* E2C098 802BB968 9222003C */ lbu $v0, 0x3c($s1) +/* E2C09C 802BB96C C61A004C */ lwc1 $f26, 0x4c($s0) +/* E2C0A0 802BB970 3C014120 */ lui $at, 0x4120 +/* E2C0A4 802BB974 44810000 */ mtc1 $at, $f0 +/* E2C0A8 802BB978 44801000 */ mtc1 $zero, $f2 +/* E2C0AC 802BB97C 44822000 */ mtc1 $v0, $f4 +/* E2C0B0 802BB980 00000000 */ nop +/* E2C0B4 802BB984 46802120 */ cvt.s.w $f4, $f4 +/* E2C0B8 802BB988 461A103E */ c.le.s $f2, $f26 +/* E2C0BC 802BB98C 00000000 */ nop +/* E2C0C0 802BB990 45000006 */ bc1f .L802BB9AC +/* E2C0C4 802BB994 46002603 */ div.s $f24, $f4, $f0 +/* E2C0C8 802BB998 3C01802C */ lui $at, %hi(D_802BCFA0) +/* E2C0CC 802BB99C D422CFA0 */ ldc1 $f2, %lo(D_802BCFA0)($at) +/* E2C0D0 802BB9A0 4600D021 */ cvt.d.s $f0, $f26 +/* E2C0D4 802BB9A4 080AEE70 */ j .L802BB9C0 +/* E2C0D8 802BB9A8 46220001 */ sub.d $f0, $f0, $f2 +.L802BB9AC: +/* E2C0DC 802BB9AC 3C013FE0 */ lui $at, 0x3fe0 +/* E2C0E0 802BB9B0 44811800 */ mtc1 $at, $f3 +/* E2C0E4 802BB9B4 44801000 */ mtc1 $zero, $f2 +/* E2C0E8 802BB9B8 4600D021 */ cvt.d.s $f0, $f26 +/* E2C0EC 802BB9BC 46220000 */ add.d $f0, $f0, $f2 +.L802BB9C0: +/* E2C0F0 802BB9C0 46200020 */ cvt.s.d $f0, $f0 +/* E2C0F4 802BB9C4 080AEE9B */ j .L802BBA6C +/* E2C0F8 802BB9C8 E600004C */ swc1 $f0, 0x4c($s0) +.L802BB9CC: +/* E2C0FC 802BB9CC 3C013F80 */ lui $at, 0x3f80 +/* E2C100 802BB9D0 4481C000 */ mtc1 $at, $f24 +/* E2C104 802BB9D4 C602004C */ lwc1 $f2, 0x4c($s0) +/* E2C108 802BB9D8 3C013E80 */ lui $at, 0x3e80 +/* E2C10C 802BB9DC 44810000 */ mtc1 $at, $f0 +/* E2C110 802BB9E0 4480E000 */ mtc1 $zero, $f28 +/* E2C114 802BB9E4 46001682 */ mul.s $f26, $f2, $f0 +/* E2C118 802BB9E8 080AEE9B */ j .L802BBA6C +/* E2C11C 802BB9EC 00000000 */ nop +.L802BB9F0: +/* E2C120 802BB9F0 C602004C */ lwc1 $f2, 0x4c($s0) +/* E2C124 802BB9F4 3C013F80 */ lui $at, 0x3f80 +/* E2C128 802BB9F8 44810000 */ mtc1 $at, $f0 +/* E2C12C 802BB9FC 00000000 */ nop +/* E2C130 802BBA00 46001080 */ add.s $f2, $f2, $f0 +/* E2C134 802BBA04 3C0141A0 */ lui $at, 0x41a0 +/* E2C138 802BBA08 44810000 */ mtc1 $at, $f0 +/* E2C13C 802BBA0C 00000000 */ nop +/* E2C140 802BBA10 4602003C */ c.lt.s $f0, $f2 +/* E2C144 802BBA14 00000000 */ nop +/* E2C148 802BBA18 45000002 */ bc1f .L802BBA24 +/* E2C14C 802BBA1C E602004C */ swc1 $f2, 0x4c($s0) +/* E2C150 802BBA20 E600004C */ swc1 $f0, 0x4c($s0) +.L802BBA24: +/* E2C154 802BBA24 C602004C */ lwc1 $f2, 0x4c($s0) +/* E2C158 802BBA28 3C01428C */ lui $at, 0x428c +/* E2C15C 802BBA2C 44812000 */ mtc1 $at, $f4 +/* E2C160 802BBA30 C60000B4 */ lwc1 $f0, 0xb4($s0) +/* E2C164 802BBA34 46041083 */ div.s $f2, $f2, $f4 +/* E2C168 802BBA38 46020001 */ sub.s $f0, $f0, $f2 +/* E2C16C 802BBA3C E60000B4 */ swc1 $f0, 0xb4($s0) +/* E2C170 802BBA40 92220015 */ lbu $v0, 0x15($s1) +/* E2C174 802BBA44 2442FFFB */ addiu $v0, $v0, -5 +/* E2C178 802BBA48 A2220015 */ sb $v0, 0x15($s1) +/* E2C17C 802BBA4C 304200FF */ andi $v0, $v0, 0xff +/* E2C180 802BBA50 2C420006 */ sltiu $v0, $v0, 6 +/* E2C184 802BBA54 10400005 */ beqz $v0, .L802BBA6C +/* E2C188 802BBA58 00000000 */ nop +/* E2C18C 802BBA5C 92220008 */ lbu $v0, 8($s1) +/* E2C190 802BBA60 A2200015 */ sb $zero, 0x15($s1) +/* E2C194 802BBA64 24420001 */ addiu $v0, $v0, 1 +/* E2C198 802BBA68 A2220008 */ sb $v0, 8($s1) +.L802BBA6C: +/* E2C19C 802BBA6C 82220008 */ lb $v0, 8($s1) +/* E2C1A0 802BBA70 28420002 */ slti $v0, $v0, 2 +/* E2C1A4 802BBA74 504000D6 */ beql $v0, $zero, .L802BBDD0 +/* E2C1A8 802BBA78 26310001 */ addiu $s1, $s1, 1 +/* E2C1AC 802BBA7C C602011C */ lwc1 $f2, 0x11c($s0) +/* E2C1B0 802BBA80 44800000 */ mtc1 $zero, $f0 +/* E2C1B4 802BBA84 00000000 */ nop +/* E2C1B8 802BBA88 4602003E */ c.le.s $f0, $f2 +/* E2C1BC 802BBA8C 3C01802C */ lui $at, %hi(D_802BCFA8) +/* E2C1C0 802BBA90 D420CFA8 */ ldc1 $f0, %lo(D_802BCFA8)($at) +/* E2C1C4 802BBA94 45000003 */ bc1f .L802BBAA4 +/* E2C1C8 802BBA98 460010A1 */ cvt.d.s $f2, $f2 +/* E2C1CC 802BBA9C 3C01802C */ lui $at, %hi(D_802BCFB0) +/* E2C1D0 802BBAA0 D420CFB0 */ ldc1 $f0, %lo(D_802BCFB0)($at) +.L802BBAA4: +/* E2C1D4 802BBAA4 46201081 */ sub.d $f2, $f2, $f0 +/* E2C1D8 802BBAA8 3C01802C */ lui $at, %hi(D_802BCFB8) +/* E2C1DC 802BBAAC D424CFB8 */ ldc1 $f4, %lo(D_802BCFB8)($at) +/* E2C1E0 802BBAB0 462010A0 */ cvt.s.d $f2, $f2 +/* E2C1E4 802BBAB4 46001021 */ cvt.d.s $f0, $f2 +/* E2C1E8 802BBAB8 4624003C */ c.lt.d $f0, $f4 +/* E2C1EC 802BBABC 00000000 */ nop +/* E2C1F0 802BBAC0 45000006 */ bc1f .L802BBADC +/* E2C1F4 802BBAC4 E602011C */ swc1 $f2, 0x11c($s0) +/* E2C1F8 802BBAC8 3C01C123 */ lui $at, 0xc123 +/* E2C1FC 802BBACC 34213333 */ ori $at, $at, 0x3333 +/* E2C200 802BBAD0 44810000 */ mtc1 $at, $f0 +/* E2C204 802BBAD4 00000000 */ nop +/* E2C208 802BBAD8 E600011C */ swc1 $f0, 0x11c($s0) +.L802BBADC: +/* E2C20C 802BBADC C60000B4 */ lwc1 $f0, 0xb4($s0) +/* E2C210 802BBAE0 C602011C */ lwc1 $f2, 0x11c($s0) +/* E2C214 802BBAE4 46020000 */ add.s $f0, $f0, $f2 +/* E2C218 802BBAE8 E60000B4 */ swc1 $f0, 0xb4($s0) +/* E2C21C 802BBAEC 92220015 */ lbu $v0, 0x15($s1) +/* E2C220 802BBAF0 3C0143B4 */ lui $at, 0x43b4 +/* E2C224 802BBAF4 44814000 */ mtc1 $at, $f8 +/* E2C228 802BBAF8 4482A000 */ mtc1 $v0, $f20 +/* E2C22C 802BBAFC 00000000 */ nop +/* E2C230 802BBB00 4680A520 */ cvt.s.w $f20, $f20 +/* E2C234 802BBB04 4608A502 */ mul.s $f20, $f20, $f8 +/* E2C238 802BBB08 00000000 */ nop +/* E2C23C 802BBB0C 3C013B80 */ lui $at, 0x3b80 +/* E2C240 802BBB10 44814000 */ mtc1 $at, $f8 +/* E2C244 802BBB14 00000000 */ nop +/* E2C248 802BBB18 4608A502 */ mul.s $f20, $f20, $f8 +/* E2C24C 802BBB1C 00000000 */ nop +/* E2C250 802BBB20 3C0140C9 */ lui $at, 0x40c9 +/* E2C254 802BBB24 34210FD0 */ ori $at, $at, 0xfd0 +/* E2C258 802BBB28 44814000 */ mtc1 $at, $f8 +/* E2C25C 802BBB2C 00000000 */ nop +/* E2C260 802BBB30 4608A002 */ mul.s $f0, $f20, $f8 +/* E2C264 802BBB34 00000000 */ nop +/* E2C268 802BBB38 3C0143B4 */ lui $at, 0x43b4 +/* E2C26C 802BBB3C 44814000 */ mtc1 $at, $f8 +/* E2C270 802BBB40 00000000 */ nop +/* E2C274 802BBB44 46080583 */ div.s $f22, $f0, $f8 +/* E2C278 802BBB48 0C00A85B */ jal sin_rad +/* E2C27C 802BBB4C 4600B306 */ mov.s $f12, $f22 +/* E2C280 802BBB50 4600C002 */ mul.s $f0, $f24, $f0 +/* E2C284 802BBB54 00000000 */ nop +/* E2C288 802BBB58 C6020080 */ lwc1 $f2, 0x80($s0) +/* E2C28C 802BBB5C 46001080 */ add.s $f2, $f2, $f0 +/* E2C290 802BBB60 4600B306 */ mov.s $f12, $f22 +/* E2C294 802BBB64 0C00A874 */ jal cos_rad +/* E2C298 802BBB68 E6020080 */ swc1 $f2, 0x80($s0) +/* E2C29C 802BBB6C 4600C002 */ mul.s $f0, $f24, $f0 +/* E2C2A0 802BBB70 00000000 */ nop +/* E2C2A4 802BBB74 C60200E8 */ lwc1 $f2, 0xe8($s0) +/* E2C2A8 802BBB78 3C040004 */ lui $a0, 4 +/* E2C2AC 802BBB7C 46001080 */ add.s $f2, $f2, $f0 +/* E2C2B0 802BBB80 C6000080 */ lwc1 $f0, 0x80($s0) +/* E2C2B4 802BBB84 02C0282D */ daddu $a1, $s6, $zero +/* E2C2B8 802BBB88 E60200E8 */ swc1 $f2, 0xe8($s0) +/* E2C2BC 802BBB8C C60200B4 */ lwc1 $f2, 0xb4($s0) +/* E2C2C0 802BBB90 C60400E8 */ lwc1 $f4, 0xe8($s0) +/* E2C2C4 802BBB94 02A0302D */ daddu $a2, $s5, $zero +/* E2C2C8 802BBB98 E7A00020 */ swc1 $f0, 0x20($sp) +/* E2C2CC 802BBB9C E7A20024 */ swc1 $f2, 0x24($sp) +/* E2C2D0 802BBBA0 E7A40028 */ swc1 $f4, 0x28($sp) +/* E2C2D4 802BBBA4 3C014100 */ lui $at, 0x4100 +/* E2C2D8 802BBBA8 44814000 */ mtc1 $at, $f8 +/* E2C2DC 802BBBAC 0280382D */ daddu $a3, $s4, $zero +/* E2C2E0 802BBBB0 E7B80010 */ swc1 $f24, 0x10($sp) +/* E2C2E4 802BBBB4 E7B40014 */ swc1 $f20, 0x14($sp) +/* E2C2E8 802BBBB8 E7A80018 */ swc1 $f8, 0x18($sp) +/* E2C2EC 802BBBBC 0C0376B9 */ jal func_800DDAE4 +/* E2C2F0 802BBBC0 E7A8001C */ swc1 $f8, 0x1c($sp) +/* E2C2F4 802BBBC4 10400031 */ beqz $v0, .L802BBC8C +/* E2C2F8 802BBBC8 3C040004 */ lui $a0, 4 +/* E2C2FC 802BBBCC C7A00020 */ lwc1 $f0, 0x20($sp) +/* E2C300 802BBBD0 C7A20024 */ lwc1 $f2, 0x24($sp) +/* E2C304 802BBBD4 C7A40028 */ lwc1 $f4, 0x28($sp) +/* E2C308 802BBBD8 E6000080 */ swc1 $f0, 0x80($s0) +/* E2C30C 802BBBDC E60200B4 */ swc1 $f2, 0xb4($s0) +/* E2C310 802BBBE0 E60400E8 */ swc1 $f4, 0xe8($s0) +/* E2C314 802BBBE4 92220015 */ lbu $v0, 0x15($s1) +/* E2C318 802BBBE8 3C0143B4 */ lui $at, 0x43b4 +/* E2C31C 802BBBEC 44814000 */ mtc1 $at, $f8 +/* E2C320 802BBBF0 24420080 */ addiu $v0, $v0, 0x80 +/* E2C324 802BBBF4 A2220015 */ sb $v0, 0x15($s1) +/* E2C328 802BBBF8 304200FF */ andi $v0, $v0, 0xff +/* E2C32C 802BBBFC 44820000 */ mtc1 $v0, $f0 +/* E2C330 802BBC00 00000000 */ nop +/* E2C334 802BBC04 46800020 */ cvt.s.w $f0, $f0 +/* E2C338 802BBC08 46080002 */ mul.s $f0, $f0, $f8 +/* E2C33C 802BBC0C 00000000 */ nop +/* E2C340 802BBC10 3C013B80 */ lui $at, 0x3b80 +/* E2C344 802BBC14 44814000 */ mtc1 $at, $f8 +/* E2C348 802BBC18 00000000 */ nop +/* E2C34C 802BBC1C 46080002 */ mul.s $f0, $f0, $f8 +/* E2C350 802BBC20 00000000 */ nop +/* E2C354 802BBC24 3C0140C9 */ lui $at, 0x40c9 +/* E2C358 802BBC28 34210FD0 */ ori $at, $at, 0xfd0 +/* E2C35C 802BBC2C 44814000 */ mtc1 $at, $f8 +/* E2C360 802BBC30 00000000 */ nop +/* E2C364 802BBC34 46080002 */ mul.s $f0, $f0, $f8 +/* E2C368 802BBC38 00000000 */ nop +/* E2C36C 802BBC3C 3C0143B4 */ lui $at, 0x43b4 +/* E2C370 802BBC40 44814000 */ mtc1 $at, $f8 +/* E2C374 802BBC44 3C014100 */ lui $at, 0x4100 +/* E2C378 802BBC48 4481C000 */ mtc1 $at, $f24 +/* E2C37C 802BBC4C 46080583 */ div.s $f22, $f0, $f8 +/* E2C380 802BBC50 0C00A85B */ jal sin_rad +/* E2C384 802BBC54 4600B306 */ mov.s $f12, $f22 +/* E2C388 802BBC58 46180002 */ mul.s $f0, $f0, $f24 +/* E2C38C 802BBC5C 00000000 */ nop +/* E2C390 802BBC60 C6020080 */ lwc1 $f2, 0x80($s0) +/* E2C394 802BBC64 46001080 */ add.s $f2, $f2, $f0 +/* E2C398 802BBC68 4600B306 */ mov.s $f12, $f22 +/* E2C39C 802BBC6C 0C00A874 */ jal cos_rad +/* E2C3A0 802BBC70 E6020080 */ swc1 $f2, 0x80($s0) +/* E2C3A4 802BBC74 46180002 */ mul.s $f0, $f0, $f24 +/* E2C3A8 802BBC78 00000000 */ nop +/* E2C3AC 802BBC7C C60200E8 */ lwc1 $f2, 0xe8($s0) +/* E2C3B0 802BBC80 46001080 */ add.s $f2, $f2, $f0 +/* E2C3B4 802BBC84 E60200E8 */ swc1 $f2, 0xe8($s0) +/* E2C3B8 802BBC88 3C040004 */ lui $a0, 4 +.L802BBC8C: +/* E2C3BC 802BBC8C 02C0282D */ daddu $a1, $s6, $zero +/* E2C3C0 802BBC90 02A0302D */ daddu $a2, $s5, $zero +/* E2C3C4 802BBC94 0280382D */ daddu $a3, $s4, $zero +/* E2C3C8 802BBC98 27A2002C */ addiu $v0, $sp, 0x2c +/* E2C3CC 802BBC9C C6020080 */ lwc1 $f2, 0x80($s0) +/* E2C3D0 802BBCA0 C60400B4 */ lwc1 $f4, 0xb4($s0) +/* E2C3D4 802BBCA4 C600011C */ lwc1 $f0, 0x11c($s0) +/* E2C3D8 802BBCA8 C60600E8 */ lwc1 $f6, 0xe8($s0) +/* E2C3DC 802BBCAC 46000005 */ abs.s $f0, $f0 +/* E2C3E0 802BBCB0 E7A20020 */ swc1 $f2, 0x20($sp) +/* E2C3E4 802BBCB4 E7A40024 */ swc1 $f4, 0x24($sp) +/* E2C3E8 802BBCB8 E7A60028 */ swc1 $f6, 0x28($sp) +/* E2C3EC 802BBCBC E7A0002C */ swc1 $f0, 0x2c($sp) +/* E2C3F0 802BBCC0 0C0372DF */ jal func_800DCB7C +/* E2C3F4 802BBCC4 AFA20010 */ sw $v0, 0x10($sp) +/* E2C3F8 802BBCC8 1440000B */ bnez $v0, .L802BBCF8 +/* E2C3FC 802BBCCC 00000000 */ nop +/* E2C400 802BBCD0 C6400004 */ lwc1 $f0, 4($s2) +/* E2C404 802BBCD4 3C014348 */ lui $at, 0x4348 +/* E2C408 802BBCD8 44811000 */ mtc1 $at, $f2 +/* E2C40C 802BBCDC 00000000 */ nop +/* E2C410 802BBCE0 46020001 */ sub.s $f0, $f0, $f2 +/* E2C414 802BBCE4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* E2C418 802BBCE8 4600103C */ c.lt.s $f2, $f0 +/* E2C41C 802BBCEC 00000000 */ nop +/* E2C420 802BBCF0 45000010 */ bc1f .L802BBD34 +/* E2C424 802BBCF4 00000000 */ nop +.L802BBCF8: +/* E2C428 802BBCF8 92220008 */ lbu $v0, 8($s1) +/* E2C42C 802BBCFC 24420001 */ addiu $v0, $v0, 1 +/* E2C430 802BBD00 A2220008 */ sb $v0, 8($s1) +/* E2C434 802BBD04 C600011C */ lwc1 $f0, 0x11c($s0) +/* E2C438 802BBD08 C7A20024 */ lwc1 $f2, 0x24($sp) +/* E2C43C 802BBD0C 46000005 */ abs.s $f0, $f0 +/* E2C440 802BBD10 46001080 */ add.s $f2, $f2, $f0 +/* E2C444 802BBD14 E61C011C */ swc1 $f28, 0x11c($s0) +/* E2C448 802BBD18 E60200B4 */ swc1 $f2, 0xb4($s0) +/* E2C44C 802BBD1C 82230008 */ lb $v1, 8($s1) +/* E2C450 802BBD20 24020002 */ addiu $v0, $zero, 2 +/* E2C454 802BBD24 14620003 */ bne $v1, $v0, .L802BBD34 +/* E2C458 802BBD28 240200FE */ addiu $v0, $zero, 0xfe +/* E2C45C 802BBD2C A2220015 */ sb $v0, 0x15($s1) +/* E2C460 802BBD30 AE00004C */ sw $zero, 0x4c($s0) +.L802BBD34: +/* E2C464 802BBD34 92220022 */ lbu $v0, 0x22($s1) +/* E2C468 802BBD38 44820000 */ mtc1 $v0, $f0 +/* E2C46C 802BBD3C 00000000 */ nop +/* E2C470 802BBD40 46800020 */ cvt.s.w $f0, $f0 +/* E2C474 802BBD44 461A0000 */ add.s $f0, $f0, $f26 +/* E2C478 802BBD48 4600F03E */ c.le.s $f30, $f0 +/* E2C47C 802BBD4C 00000000 */ nop +/* E2C480 802BBD50 45010005 */ bc1t .L802BBD68 +/* E2C484 802BBD54 26230022 */ addiu $v1, $s1, 0x22 +/* E2C488 802BBD58 4600020D */ trunc.w.s $f8, $f0 +/* E2C48C 802BBD5C 44024000 */ mfc1 $v0, $f8 +/* E2C490 802BBD60 080AEF60 */ j .L802BBD80 +/* E2C494 802BBD64 A0620000 */ sb $v0, ($v1) +.L802BBD68: +/* E2C498 802BBD68 461E0001 */ sub.s $f0, $f0, $f30 +/* E2C49C 802BBD6C 4600020D */ trunc.w.s $f8, $f0 +/* E2C4A0 802BBD70 44024000 */ mfc1 $v0, $f8 +/* E2C4A4 802BBD74 00000000 */ nop +/* E2C4A8 802BBD78 00571025 */ or $v0, $v0, $s7 +/* E2C4AC 802BBD7C A0620000 */ sb $v0, ($v1) +.L802BBD80: +/* E2C4B0 802BBD80 9222002F */ lbu $v0, 0x2f($s1) +/* E2C4B4 802BBD84 44820000 */ mtc1 $v0, $f0 +/* E2C4B8 802BBD88 00000000 */ nop +/* E2C4BC 802BBD8C 46800020 */ cvt.s.w $f0, $f0 +/* E2C4C0 802BBD90 461A0001 */ sub.s $f0, $f0, $f26 +/* E2C4C4 802BBD94 4600F03E */ c.le.s $f30, $f0 +/* E2C4C8 802BBD98 00000000 */ nop +/* E2C4CC 802BBD9C 45010005 */ bc1t .L802BBDB4 +/* E2C4D0 802BBDA0 2623002F */ addiu $v1, $s1, 0x2f +/* E2C4D4 802BBDA4 4600020D */ trunc.w.s $f8, $f0 +/* E2C4D8 802BBDA8 44024000 */ mfc1 $v0, $f8 +/* E2C4DC 802BBDAC 080AEF73 */ j .L802BBDCC +/* E2C4E0 802BBDB0 A0620000 */ sb $v0, ($v1) +.L802BBDB4: +/* E2C4E4 802BBDB4 461E0001 */ sub.s $f0, $f0, $f30 +/* E2C4E8 802BBDB8 4600020D */ trunc.w.s $f8, $f0 +/* E2C4EC 802BBDBC 44024000 */ mfc1 $v0, $f8 +/* E2C4F0 802BBDC0 00000000 */ nop +/* E2C4F4 802BBDC4 00571025 */ or $v0, $v0, $s7 +/* E2C4F8 802BBDC8 A0620000 */ sb $v0, ($v1) +.L802BBDCC: +/* E2C4FC 802BBDCC 26310001 */ addiu $s1, $s1, 1 +.L802BBDD0: +/* E2C500 802BBDD0 2642000C */ addiu $v0, $s2, 0xc +/* E2C504 802BBDD4 0222102A */ slt $v0, $s1, $v0 +/* E2C508 802BBDD8 1440FED1 */ bnez $v0, .L802BB920 +/* E2C50C 802BBDDC 26100004 */ addiu $s0, $s0, 4 +/* E2C510 802BBDE0 2A62000C */ slti $v0, $s3, 0xc +/* E2C514 802BBDE4 14400003 */ bnez $v0, .L802BBDF4 +/* E2C518 802BBDE8 00000000 */ nop +/* E2C51C 802BBDEC 0C043F5A */ jal func_8010FD68 +/* E2C520 802BBDF0 03C0202D */ daddu $a0, $fp, $zero +.L802BBDF4: +/* E2C524 802BBDF4 8FBF0054 */ lw $ra, 0x54($sp) +/* E2C528 802BBDF8 8FBE0050 */ lw $fp, 0x50($sp) +/* E2C52C 802BBDFC 8FB7004C */ lw $s7, 0x4c($sp) +/* E2C530 802BBE00 8FB60048 */ lw $s6, 0x48($sp) +/* E2C534 802BBE04 8FB50044 */ lw $s5, 0x44($sp) +/* E2C538 802BBE08 8FB40040 */ lw $s4, 0x40($sp) +/* E2C53C 802BBE0C 8FB3003C */ lw $s3, 0x3c($sp) +/* E2C540 802BBE10 8FB20038 */ lw $s2, 0x38($sp) +/* E2C544 802BBE14 8FB10034 */ lw $s1, 0x34($sp) +/* E2C548 802BBE18 8FB00030 */ lw $s0, 0x30($sp) +/* E2C54C 802BBE1C D7BE0080 */ ldc1 $f30, 0x80($sp) +/* E2C550 802BBE20 D7BC0078 */ ldc1 $f28, 0x78($sp) +/* E2C554 802BBE24 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* E2C558 802BBE28 D7B80068 */ ldc1 $f24, 0x68($sp) +/* E2C55C 802BBE2C D7B60060 */ ldc1 $f22, 0x60($sp) +/* E2C560 802BBE30 D7B40058 */ ldc1 $f20, 0x58($sp) +/* E2C564 802BBE34 03E00008 */ jr $ra +/* E2C568 802BBE38 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/code_E2BE40/func_802BBE3C_E2C56C.s b/asm/nonmatchings/code_E2BE40/func_802BBE3C_E2C56C.s new file mode 100644 index 0000000000..7f4082a198 --- /dev/null +++ b/asm/nonmatchings/code_E2BE40/func_802BBE3C_E2C56C.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BBE3C_E2C56C +/* E2C56C 802BBE3C 27BDFE80 */ addiu $sp, $sp, -0x180 +/* E2C570 802BBE40 AFBE0148 */ sw $fp, 0x148($sp) +/* E2C574 802BBE44 0000F02D */ daddu $fp, $zero, $zero +/* E2C578 802BBE48 27A80098 */ addiu $t0, $sp, 0x98 +/* E2C57C 802BBE4C AFB5013C */ sw $s5, 0x13c($sp) +/* E2C580 802BBE50 27B500D8 */ addiu $s5, $sp, 0xd8 +/* E2C584 802BBE54 AFB40138 */ sw $s4, 0x138($sp) +/* E2C588 802BBE58 27B40058 */ addiu $s4, $sp, 0x58 +/* E2C58C 802BBE5C AFA8011C */ sw $t0, 0x11c($sp) +/* E2C590 802BBE60 3C080001 */ lui $t0, 1 +/* E2C594 802BBE64 AFB1012C */ sw $s1, 0x12c($sp) +/* E2C598 802BBE68 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* E2C59C 802BBE6C 8E31A66C */ lw $s1, %lo(gMasterGfxPos)($s1) +/* E2C5A0 802BBE70 35081630 */ ori $t0, $t0, 0x1630 +/* E2C5A4 802BBE74 AFBF014C */ sw $ra, 0x14c($sp) +/* E2C5A8 802BBE78 AFB70144 */ sw $s7, 0x144($sp) +/* E2C5AC 802BBE7C AFB60140 */ sw $s6, 0x140($sp) +/* E2C5B0 802BBE80 AFB30134 */ sw $s3, 0x134($sp) +/* E2C5B4 802BBE84 AFB20130 */ sw $s2, 0x130($sp) +/* E2C5B8 802BBE88 AFB00128 */ sw $s0, 0x128($sp) +/* E2C5BC 802BBE8C F7BE0178 */ sdc1 $f30, 0x178($sp) +/* E2C5C0 802BBE90 F7BC0170 */ sdc1 $f28, 0x170($sp) +/* E2C5C4 802BBE94 F7BA0168 */ sdc1 $f26, 0x168($sp) +/* E2C5C8 802BBE98 F7B80160 */ sdc1 $f24, 0x160($sp) +/* E2C5CC 802BBE9C F7B60158 */ sdc1 $f22, 0x158($sp) +/* E2C5D0 802BBEA0 F7B40150 */ sdc1 $f20, 0x150($sp) +/* E2C5D4 802BBEA4 0C04417A */ jal get_entity_by_index +/* E2C5D8 802BBEA8 AFA80120 */ sw $t0, 0x120($sp) +/* E2C5DC 802BBEAC 0040B82D */ daddu $s7, $v0, $zero +/* E2C5E0 802BBEB0 3C0143B4 */ lui $at, 0x43b4 +/* E2C5E4 802BBEB4 4481D000 */ mtc1 $at, $f26 +/* E2C5E8 802BBEB8 3C013B80 */ lui $at, 0x3b80 +/* E2C5EC 802BBEBC 4481C000 */ mtc1 $at, $f24 +/* E2C5F0 802BBEC0 3C013F80 */ lui $at, 0x3f80 +/* E2C5F4 802BBEC4 4481B000 */ mtc1 $at, $f22 +/* E2C5F8 802BBEC8 8EE20040 */ lw $v0, 0x40($s7) +/* E2C5FC 802BBECC 4480A000 */ mtc1 $zero, $f20 +/* E2C600 802BBED0 C6E00048 */ lwc1 $f0, 0x48($s7) +/* E2C604 802BBED4 0040902D */ daddu $s2, $v0, $zero +/* E2C608 802BBED8 0240982D */ daddu $s3, $s2, $zero +/* E2C60C 802BBEDC 2630FFFC */ addiu $s0, $s1, -4 +/* E2C610 802BBEE0 46000007 */ neg.s $f0, $f0 +/* E2C614 802BBEE4 E7A00118 */ swc1 $f0, 0x118($sp) +/* E2C618 802BBEE8 C6E0004C */ lwc1 $f0, 0x4c($s7) +/* E2C61C 802BBEEC C6E20050 */ lwc1 $f2, 0x50($s7) +/* E2C620 802BBEF0 8E560000 */ lw $s6, ($s2) +/* E2C624 802BBEF4 46000787 */ neg.s $f30, $f0 +/* E2C628 802BBEF8 46001707 */ neg.s $f28, $f2 +.L802BBEFC: +/* E2C62C 802BBEFC 82420008 */ lb $v0, 8($s2) +/* E2C630 802BBF00 28420002 */ slti $v0, $v0, 2 +/* E2C634 802BBF04 1040000F */ beqz $v0, .L802BBF44 +/* E2C638 802BBF08 3C03E200 */ lui $v1, 0xe200 +/* E2C63C 802BBF0C 26100008 */ addiu $s0, $s0, 8 +/* E2C640 802BBF10 3463001C */ ori $v1, $v1, 0x1c +/* E2C644 802BBF14 3C020055 */ lui $v0, 0x55 +/* E2C648 802BBF18 34422078 */ ori $v0, $v0, 0x2078 +/* E2C64C 802BBF1C AE03FFFC */ sw $v1, -4($s0) +/* E2C650 802BBF20 AE020000 */ sw $v0, ($s0) +/* E2C654 802BBF24 26100008 */ addiu $s0, $s0, 8 +/* E2C658 802BBF28 26310010 */ addiu $s1, $s1, 0x10 +/* E2C65C 802BBF2C 3C03FC12 */ lui $v1, 0xfc12 +/* E2C660 802BBF30 34631824 */ ori $v1, $v1, 0x1824 +/* E2C664 802BBF34 3C02FF33 */ lui $v0, 0xff33 +/* E2C668 802BBF38 3442FFFF */ ori $v0, $v0, 0xffff +/* E2C66C 802BBF3C 080AEFDD */ j .L802BBF74 +/* E2C670 802BBF40 AE03FFFC */ sw $v1, -4($s0) +.L802BBF44: +/* E2C674 802BBF44 26100008 */ addiu $s0, $s0, 8 +/* E2C678 802BBF48 3C03FCFF */ lui $v1, 0xfcff +/* E2C67C 802BBF4C 3463C3FF */ ori $v1, $v1, 0xc3ff +/* E2C680 802BBF50 3C02FF30 */ lui $v0, 0xff30 +/* E2C684 802BBF54 3442FE7F */ ori $v0, $v0, 0xfe7f +/* E2C688 802BBF58 AE03FFFC */ sw $v1, -4($s0) +/* E2C68C 802BBF5C AE020000 */ sw $v0, ($s0) +/* E2C690 802BBF60 26100008 */ addiu $s0, $s0, 8 +/* E2C694 802BBF64 3C02FA00 */ lui $v0, 0xfa00 +/* E2C698 802BBF68 AE02FFFC */ sw $v0, -4($s0) +/* E2C69C 802BBF6C 92420015 */ lbu $v0, 0x15($s2) +/* E2C6A0 802BBF70 26310010 */ addiu $s1, $s1, 0x10 +.L802BBF74: +/* E2C6A4 802BBF74 AE020000 */ sw $v0, ($s0) +/* E2C6A8 802BBF78 8FA50118 */ lw $a1, 0x118($sp) +/* E2C6AC 802BBF7C 4406F000 */ mfc1 $a2, $f30 +/* E2C6B0 802BBF80 4407E000 */ mfc1 $a3, $f28 +/* E2C6B4 802BBF84 0C019E40 */ jal guTranslateF +/* E2C6B8 802BBF88 27A40018 */ addiu $a0, $sp, 0x18 +/* E2C6BC 802BBF8C 92420022 */ lbu $v0, 0x22($s2) +/* E2C6C0 802BBF90 44820000 */ mtc1 $v0, $f0 +/* E2C6C4 802BBF94 00000000 */ nop +/* E2C6C8 802BBF98 46800020 */ cvt.s.w $f0, $f0 +/* E2C6CC 802BBF9C 461A0002 */ mul.s $f0, $f0, $f26 +/* E2C6D0 802BBFA0 00000000 */ nop +/* E2C6D4 802BBFA4 46180002 */ mul.s $f0, $f0, $f24 +/* E2C6D8 802BBFA8 00000000 */ nop +/* E2C6DC 802BBFAC 4406B000 */ mfc1 $a2, $f22 +/* E2C6E0 802BBFB0 4407A000 */ mfc1 $a3, $f20 +/* E2C6E4 802BBFB4 8FA4011C */ lw $a0, 0x11c($sp) +/* E2C6E8 802BBFB8 44050000 */ mfc1 $a1, $f0 +/* E2C6EC 802BBFBC 0C019EC8 */ jal guRotateF +/* E2C6F0 802BBFC0 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2C6F4 802BBFC4 9242002F */ lbu $v0, 0x2f($s2) +/* E2C6F8 802BBFC8 44820000 */ mtc1 $v0, $f0 +/* E2C6FC 802BBFCC 00000000 */ nop +/* E2C700 802BBFD0 46800020 */ cvt.s.w $f0, $f0 +/* E2C704 802BBFD4 461A0002 */ mul.s $f0, $f0, $f26 +/* E2C708 802BBFD8 00000000 */ nop +/* E2C70C 802BBFDC 26100008 */ addiu $s0, $s0, 8 +/* E2C710 802BBFE0 26310018 */ addiu $s1, $s1, 0x18 +/* E2C714 802BBFE4 46180002 */ mul.s $f0, $f0, $f24 +/* E2C718 802BBFE8 00000000 */ nop +/* E2C71C 802BBFEC 27DE0001 */ addiu $fp, $fp, 1 +/* E2C720 802BBFF0 02A0202D */ daddu $a0, $s5, $zero +/* E2C724 802BBFF4 4406A000 */ mfc1 $a2, $f20 +/* E2C728 802BBFF8 4407B000 */ mfc1 $a3, $f22 +/* E2C72C 802BBFFC 44050000 */ mfc1 $a1, $f0 +/* E2C730 802BC000 26520001 */ addiu $s2, $s2, 1 +/* E2C734 802BC004 0C019EC8 */ jal guRotateF +/* E2C738 802BC008 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2C73C 802BC00C 02A0282D */ daddu $a1, $s5, $zero +/* E2C740 802BC010 8FA4011C */ lw $a0, 0x11c($sp) +/* E2C744 802BC014 0C019D80 */ jal guMtxCatF +/* E2C748 802BC018 02A0302D */ daddu $a2, $s5, $zero +/* E2C74C 802BC01C 02A0202D */ daddu $a0, $s5, $zero +/* E2C750 802BC020 27A50018 */ addiu $a1, $sp, 0x18 +/* E2C754 802BC024 0C019D80 */ jal guMtxCatF +/* E2C758 802BC028 00A0302D */ daddu $a2, $a1, $zero +/* E2C75C 802BC02C 0280202D */ daddu $a0, $s4, $zero +/* E2C760 802BC030 8E650080 */ lw $a1, 0x80($s3) +/* E2C764 802BC034 8E6600B4 */ lw $a2, 0xb4($s3) +/* E2C768 802BC038 8E6700E8 */ lw $a3, 0xe8($s3) +/* E2C76C 802BC03C 0C019E40 */ jal guTranslateF +/* E2C770 802BC040 26730004 */ addiu $s3, $s3, 4 +/* E2C774 802BC044 27A40018 */ addiu $a0, $sp, 0x18 +/* E2C778 802BC048 0280282D */ daddu $a1, $s4, $zero +/* E2C77C 802BC04C 0C019D80 */ jal guMtxCatF +/* E2C780 802BC050 0280302D */ daddu $a2, $s4, $zero +/* E2C784 802BC054 0280202D */ daddu $a0, $s4, $zero +/* E2C788 802BC058 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* E2C78C 802BC05C 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) +/* E2C790 802BC060 3C02800A */ lui $v0, %hi(gDisplayContext) +/* E2C794 802BC064 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) +/* E2C798 802BC068 8FA80120 */ lw $t0, 0x120($sp) +/* E2C79C 802BC06C 00052980 */ sll $a1, $a1, 6 +/* E2C7A0 802BC070 00A82821 */ addu $a1, $a1, $t0 +/* E2C7A4 802BC074 0C019D40 */ jal guMtxF2L +/* E2C7A8 802BC078 00452821 */ addu $a1, $v0, $a1 +/* E2C7AC 802BC07C 3C05D838 */ lui $a1, 0xd838 +/* E2C7B0 802BC080 34A50002 */ ori $a1, $a1, 2 +/* E2C7B4 802BC084 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* E2C7B8 802BC088 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) +/* E2C7BC 802BC08C 3C03DA38 */ lui $v1, 0xda38 +/* E2C7C0 802BC090 AE03FFFC */ sw $v1, -4($s0) +/* E2C7C4 802BC094 8FA80120 */ lw $t0, 0x120($sp) +/* E2C7C8 802BC098 24430001 */ addiu $v1, $v0, 1 +/* E2C7CC 802BC09C 3042FFFF */ andi $v0, $v0, 0xffff +/* E2C7D0 802BC0A0 00021180 */ sll $v0, $v0, 6 +/* E2C7D4 802BC0A4 3C018007 */ lui $at, %hi(gMatrixListPos) +/* E2C7D8 802BC0A8 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) +/* E2C7DC 802BC0AC 3C03800A */ lui $v1, %hi(gDisplayContext) +/* E2C7E0 802BC0B0 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) +/* E2C7E4 802BC0B4 00481021 */ addu $v0, $v0, $t0 +/* E2C7E8 802BC0B8 00621821 */ addu $v1, $v1, $v0 +/* E2C7EC 802BC0BC AE030000 */ sw $v1, ($s0) +/* E2C7F0 802BC0C0 96C40002 */ lhu $a0, 2($s6) +/* E2C7F4 802BC0C4 26D60004 */ addiu $s6, $s6, 4 +/* E2C7F8 802BC0C8 26100008 */ addiu $s0, $s0, 8 +/* E2C7FC 802BC0CC 8EE30044 */ lw $v1, 0x44($s7) +/* E2C800 802BC0D0 3C02DE00 */ lui $v0, 0xde00 +/* E2C804 802BC0D4 AE02FFFC */ sw $v0, -4($s0) +/* E2C808 802BC0D8 24020040 */ addiu $v0, $zero, 0x40 +/* E2C80C 802BC0DC 00641821 */ addu $v1, $v1, $a0 +/* E2C810 802BC0E0 AE030000 */ sw $v1, ($s0) +/* E2C814 802BC0E4 26100008 */ addiu $s0, $s0, 8 +/* E2C818 802BC0E8 AE020000 */ sw $v0, ($s0) +/* E2C81C 802BC0EC 2BC2000C */ slti $v0, $fp, 0xc +/* E2C820 802BC0F0 1440FF82 */ bnez $v0, .L802BBEFC +/* E2C824 802BC0F4 AE05FFFC */ sw $a1, -4($s0) +/* E2C828 802BC0F8 8FBF014C */ lw $ra, 0x14c($sp) +/* E2C82C 802BC0FC 8FBE0148 */ lw $fp, 0x148($sp) +/* E2C830 802BC100 8FB70144 */ lw $s7, 0x144($sp) +/* E2C834 802BC104 8FB60140 */ lw $s6, 0x140($sp) +/* E2C838 802BC108 8FB5013C */ lw $s5, 0x13c($sp) +/* E2C83C 802BC10C 8FB40138 */ lw $s4, 0x138($sp) +/* E2C840 802BC110 8FB30134 */ lw $s3, 0x134($sp) +/* E2C844 802BC114 8FB20130 */ lw $s2, 0x130($sp) +/* E2C848 802BC118 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* E2C84C 802BC11C AC31A66C */ sw $s1, %lo(gMasterGfxPos)($at) +/* E2C850 802BC120 8FB1012C */ lw $s1, 0x12c($sp) +/* E2C854 802BC124 8FB00128 */ lw $s0, 0x128($sp) +/* E2C858 802BC128 D7BE0178 */ ldc1 $f30, 0x178($sp) +/* E2C85C 802BC12C D7BC0170 */ ldc1 $f28, 0x170($sp) +/* E2C860 802BC130 D7BA0168 */ ldc1 $f26, 0x168($sp) +/* E2C864 802BC134 D7B80160 */ ldc1 $f24, 0x160($sp) +/* E2C868 802BC138 D7B60158 */ ldc1 $f22, 0x158($sp) +/* E2C86C 802BC13C D7B40150 */ ldc1 $f20, 0x150($sp) +/* E2C870 802BC140 03E00008 */ jr $ra +/* E2C874 802BC144 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/code_E2BE40/func_802BC148_E2C878.s b/asm/nonmatchings/code_E2BE40/func_802BC148_E2C878.s new file mode 100644 index 0000000000..ff6b031b78 --- /dev/null +++ b/asm/nonmatchings/code_E2BE40/func_802BC148_E2C878.s @@ -0,0 +1,30 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC148_E2C878 +/* E2C878 802BC148 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2C87C 802BC14C AFB00010 */ sw $s0, 0x10($sp) +/* E2C880 802BC150 0080802D */ daddu $s0, $a0, $zero +/* E2C884 802BC154 AFBF0014 */ sw $ra, 0x14($sp) +/* E2C888 802BC158 92020006 */ lbu $v0, 6($s0) +/* E2C88C 802BC15C 30420001 */ andi $v0, $v0, 1 +/* E2C890 802BC160 1040000D */ beqz $v0, .L802BC198 +/* E2C894 802BC164 00000000 */ nop +/* E2C898 802BC168 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* E2C89C 802BC16C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* E2C8A0 802BC170 804300B4 */ lb $v1, 0xb4($v0) +/* E2C8A4 802BC174 2402000E */ addiu $v0, $zero, 0xe +/* E2C8A8 802BC178 10620003 */ beq $v1, $v0, .L802BC188 +/* E2C8AC 802BC17C 24020010 */ addiu $v0, $zero, 0x10 +/* E2C8B0 802BC180 14620005 */ bne $v1, $v0, .L802BC198 +/* E2C8B4 802BC184 00000000 */ nop +.L802BC188: +/* E2C8B8 802BC188 0C04419E */ jal func_80110678 +/* E2C8BC 802BC18C 0200202D */ daddu $a0, $s0, $zero +/* E2C8C0 802BC190 0C043F5A */ jal func_8010FD68 +/* E2C8C4 802BC194 0200202D */ daddu $a0, $s0, $zero +.L802BC198: +/* E2C8C8 802BC198 8FBF0014 */ lw $ra, 0x14($sp) +/* E2C8CC 802BC19C 8FB00010 */ lw $s0, 0x10($sp) +/* E2C8D0 802BC1A0 03E00008 */ jr $ra +/* E2C8D4 802BC1A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2BE40/func_802BC1A8_E2C8D8.s b/asm/nonmatchings/code_E2BE40/func_802BC1A8_E2C8D8.s new file mode 100644 index 0000000000..20456154f8 --- /dev/null +++ b/asm/nonmatchings/code_E2BE40/func_802BC1A8_E2C8D8.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC1A8_E2C8D8 +/* E2C8D8 802BC1A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2C8DC 802BC1AC 3C013F80 */ lui $at, 0x3f80 +/* E2C8E0 802BC1B0 44811000 */ mtc1 $at, $f2 +/* E2C8E4 802BC1B4 0000282D */ daddu $a1, $zero, $zero +/* E2C8E8 802BC1B8 AFBF0010 */ sw $ra, 0x10($sp) +/* E2C8EC 802BC1BC 8C830040 */ lw $v1, 0x40($a0) +.L802BC1C0: +/* E2C8F0 802BC1C0 C46000B4 */ lwc1 $f0, 0xb4($v1) +/* E2C8F4 802BC1C4 46020000 */ add.s $f0, $f0, $f2 +/* E2C8F8 802BC1C8 24A50001 */ addiu $a1, $a1, 1 +/* E2C8FC 802BC1CC 28A2000C */ slti $v0, $a1, 0xc +/* E2C900 802BC1D0 E46000B4 */ swc1 $f0, 0xb4($v1) +/* E2C904 802BC1D4 1440FFFA */ bnez $v0, .L802BC1C0 +/* E2C908 802BC1D8 24630004 */ addiu $v1, $v1, 4 +/* E2C90C 802BC1DC 3C05802C */ lui $a1, %hi(D_802BCE1C) +/* E2C910 802BC1E0 0C0442F3 */ jal func_80110BCC +/* E2C914 802BC1E4 24A5CE1C */ addiu $a1, $a1, %lo(D_802BCE1C) +/* E2C918 802BC1E8 8FBF0010 */ lw $ra, 0x10($sp) +/* E2C91C 802BC1EC 03E00008 */ jr $ra +/* E2C920 802BC1F0 27BD0018 */ addiu $sp, $sp, 0x18 +/* E2C924 802BC1F4 00000000 */ nop +/* E2C928 802BC1F8 00000000 */ nop +/* E2C92C 802BC1FC 00000000 */ nop diff --git a/asm/nonmatchings/code_E2C930/func_802BC200_E2C930.s b/asm/nonmatchings/code_E2C930/func_802BC200_E2C930.s new file mode 100644 index 0000000000..e2a44d8f55 --- /dev/null +++ b/asm/nonmatchings/code_E2C930/func_802BC200_E2C930.s @@ -0,0 +1,114 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC200_E2C930 +/* E2C930 802BC200 27BDFF48 */ addiu $sp, $sp, -0xb8 +/* E2C934 802BC204 AFB600A8 */ sw $s6, 0xa8($sp) +/* E2C938 802BC208 0080B02D */ daddu $s6, $a0, $zero +/* E2C93C 802BC20C AFB700AC */ sw $s7, 0xac($sp) +/* E2C940 802BC210 00C0B82D */ daddu $s7, $a2, $zero +/* E2C944 802BC214 AFB3009C */ sw $s3, 0x9c($sp) +/* E2C948 802BC218 0000982D */ daddu $s3, $zero, $zero +/* E2C94C 802BC21C AFB20098 */ sw $s2, 0x98($sp) +/* E2C950 802BC220 0260902D */ daddu $s2, $s3, $zero +/* E2C954 802BC224 27A40050 */ addiu $a0, $sp, 0x50 +/* E2C958 802BC228 AFB400A0 */ sw $s4, 0xa0($sp) +/* E2C95C 802BC22C 0260A02D */ daddu $s4, $s3, $zero +/* E2C960 802BC230 AFBF00B0 */ sw $ra, 0xb0($sp) +/* E2C964 802BC234 AFB500A4 */ sw $s5, 0xa4($sp) +/* E2C968 802BC238 AFB10094 */ sw $s1, 0x94($sp) +/* E2C96C 802BC23C AFB00090 */ sw $s0, 0x90($sp) +/* E2C970 802BC240 8EC20040 */ lw $v0, 0x40($s6) +/* E2C974 802BC244 0260A82D */ daddu $s5, $s3, $zero +/* E2C978 802BC248 0040802D */ daddu $s0, $v0, $zero +/* E2C97C 802BC24C 8EC20044 */ lw $v0, 0x44($s6) +/* E2C980 802BC250 30A5FFFF */ andi $a1, $a1, 0xffff +/* E2C984 802BC254 00451021 */ addu $v0, $v0, $a1 +/* E2C988 802BC258 AE020000 */ sw $v0, ($s0) +/* E2C98C 802BC25C 3C02802C */ lui $v0, %hi(func_802BC974_E2D0A4) +/* E2C990 802BC260 2442C974 */ addiu $v0, $v0, %lo(func_802BC974_E2D0A4) +/* E2C994 802BC264 AEC2003C */ sw $v0, 0x3c($s6) +/* E2C998 802BC268 240200FF */ addiu $v0, $zero, 0xff +/* E2C99C 802BC26C A2C2000B */ sb $v0, 0xb($s6) +/* E2C9A0 802BC270 C6000004 */ lwc1 $f0, 4($s0) +/* E2C9A4 802BC274 8EC50048 */ lw $a1, 0x48($s6) +/* E2C9A8 802BC278 8EC70050 */ lw $a3, 0x50($s6) +/* E2C9AC 802BC27C 44060000 */ mfc1 $a2, $f0 +/* E2C9B0 802BC280 0200882D */ daddu $s1, $s0, $zero +/* E2C9B4 802BC284 0C019E40 */ jal guTranslateF +/* E2C9B8 802BC288 AEC6004C */ sw $a2, 0x4c($s6) +.L802BC28C: +/* E2C9BC 802BC28C 32E2FFFF */ andi $v0, $s7, 0xffff +/* E2C9C0 802BC290 26F70040 */ addiu $s7, $s7, 0x40 +/* E2C9C4 802BC294 8EC50044 */ lw $a1, 0x44($s6) +/* E2C9C8 802BC298 27A40010 */ addiu $a0, $sp, 0x10 +/* E2C9CC 802BC29C 0C019D60 */ jal guMtxL2F +/* E2C9D0 802BC2A0 00A22821 */ addu $a1, $a1, $v0 +/* E2C9D4 802BC2A4 27A40050 */ addiu $a0, $sp, 0x50 +/* E2C9D8 802BC2A8 27A50010 */ addiu $a1, $sp, 0x10 +/* E2C9DC 802BC2AC 0C019D80 */ jal guMtxCatF +/* E2C9E0 802BC2B0 00A0302D */ daddu $a2, $a1, $zero +/* E2C9E4 802BC2B4 C7A00040 */ lwc1 $f0, 0x40($sp) +/* E2C9E8 802BC2B8 E6000040 */ swc1 $f0, 0x40($s0) +/* E2C9EC 802BC2BC C7A00044 */ lwc1 $f0, 0x44($sp) +/* E2C9F0 802BC2C0 E6000058 */ swc1 $f0, 0x58($s0) +/* E2C9F4 802BC2C4 C7A00048 */ lwc1 $f0, 0x48($sp) +/* E2C9F8 802BC2C8 2E820005 */ sltiu $v0, $s4, 5 +/* E2C9FC 802BC2CC 10400011 */ beqz $v0, .L802BC314 +/* E2CA00 802BC2D0 E6000070 */ swc1 $f0, 0x70($s0) +/* E2CA04 802BC2D4 3C02802C */ lui $v0, %hi(D_802BCFC0) +/* E2CA08 802BC2D8 00551021 */ addu $v0, $v0, $s5 +/* E2CA0C 802BC2DC 8C42CFC0 */ lw $v0, %lo(D_802BCFC0)($v0) +/* E2CA10 802BC2E0 00400008 */ jr $v0 +/* E2CA14 802BC2E4 00000000 */ nop +/* E2CA18 802BC2E8 241300C0 */ addiu $s3, $zero, 0xc0 +/* E2CA1C 802BC2EC 080AF0C5 */ j .L802BC314 +/* E2CA20 802BC2F0 0000902D */ daddu $s2, $zero, $zero +/* E2CA24 802BC2F4 080AF0C4 */ j .L802BC310 +/* E2CA28 802BC2F8 24130060 */ addiu $s3, $zero, 0x60 +/* E2CA2C 802BC2FC 080AF0C4 */ j .L802BC310 +/* E2CA30 802BC300 24130020 */ addiu $s3, $zero, 0x20 +/* E2CA34 802BC304 080AF0C4 */ j .L802BC310 +/* E2CA38 802BC308 241300A0 */ addiu $s3, $zero, 0xa0 +/* E2CA3C 802BC30C 241300E0 */ addiu $s3, $zero, 0xe0 +.L802BC310: +/* E2CA40 802BC310 24120014 */ addiu $s2, $zero, 0x14 +.L802BC314: +/* E2CA44 802BC314 24040005 */ addiu $a0, $zero, 5 +/* E2CA48 802BC318 A233000E */ sb $s3, 0xe($s1) +/* E2CA4C 802BC31C 0C00A67F */ jal rand_int +/* E2CA50 802BC320 A2320020 */ sb $s2, 0x20($s1) +/* E2CA54 802BC324 0040182D */ daddu $v1, $v0, $zero +/* E2CA58 802BC328 32820001 */ andi $v0, $s4, 1 +/* E2CA5C 802BC32C 14400003 */ bnez $v0, .L802BC33C +/* E2CA60 802BC330 2462000A */ addiu $v0, $v1, 0xa +/* E2CA64 802BC334 2402FFF6 */ addiu $v0, $zero, -0xa +/* E2CA68 802BC338 00431023 */ subu $v0, $v0, $v1 +.L802BC33C: +/* E2CA6C 802BC33C 44820000 */ mtc1 $v0, $f0 +/* E2CA70 802BC340 00000000 */ nop +/* E2CA74 802BC344 46800020 */ cvt.s.w $f0, $f0 +/* E2CA78 802BC348 E6000028 */ swc1 $f0, 0x28($s0) +/* E2CA7C 802BC34C 26B50004 */ addiu $s5, $s5, 4 +/* E2CA80 802BC350 26940001 */ addiu $s4, $s4, 1 +/* E2CA84 802BC354 3C014120 */ lui $at, 0x4120 +/* E2CA88 802BC358 44810000 */ mtc1 $at, $f0 +/* E2CA8C 802BC35C 2A820005 */ slti $v0, $s4, 5 +/* E2CA90 802BC360 E6000088 */ swc1 $f0, 0x88($s0) +/* E2CA94 802BC364 A2200008 */ sb $zero, 8($s1) +/* E2CA98 802BC368 A2200014 */ sb $zero, 0x14($s1) +/* E2CA9C 802BC36C A220001A */ sb $zero, 0x1a($s1) +/* E2CAA0 802BC370 26310001 */ addiu $s1, $s1, 1 +/* E2CAA4 802BC374 1440FFC5 */ bnez $v0, .L802BC28C +/* E2CAA8 802BC378 26100004 */ addiu $s0, $s0, 4 +/* E2CAAC 802BC37C 8FBF00B0 */ lw $ra, 0xb0($sp) +/* E2CAB0 802BC380 8FB700AC */ lw $s7, 0xac($sp) +/* E2CAB4 802BC384 8FB600A8 */ lw $s6, 0xa8($sp) +/* E2CAB8 802BC388 8FB500A4 */ lw $s5, 0xa4($sp) +/* E2CABC 802BC38C 8FB400A0 */ lw $s4, 0xa0($sp) +/* E2CAC0 802BC390 8FB3009C */ lw $s3, 0x9c($sp) +/* E2CAC4 802BC394 8FB20098 */ lw $s2, 0x98($sp) +/* E2CAC8 802BC398 8FB10094 */ lw $s1, 0x94($sp) +/* E2CACC 802BC39C 8FB00090 */ lw $s0, 0x90($sp) +/* E2CAD0 802BC3A0 03E00008 */ jr $ra +/* E2CAD4 802BC3A4 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/asm/nonmatchings/code_E2C930/func_802BC3A8_E2CAD8.s b/asm/nonmatchings/code_E2C930/func_802BC3A8_E2CAD8.s new file mode 100644 index 0000000000..edf6830392 --- /dev/null +++ b/asm/nonmatchings/code_E2C930/func_802BC3A8_E2CAD8.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC3A8_E2CAD8 +/* E2CAD8 802BC3A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2CADC 802BC3AC 3C050A00 */ lui $a1, 0xa00 +/* E2CAE0 802BC3B0 24A51660 */ addiu $a1, $a1, 0x1660 +/* E2CAE4 802BC3B4 AFBF0010 */ sw $ra, 0x10($sp) +/* E2CAE8 802BC3B8 8C820040 */ lw $v0, 0x40($a0) +/* E2CAEC 802BC3BC C480004C */ lwc1 $f0, 0x4c($a0) +/* E2CAF0 802BC3C0 3C060A00 */ lui $a2, 0xa00 +/* E2CAF4 802BC3C4 24C61118 */ addiu $a2, $a2, 0x1118 +/* E2CAF8 802BC3C8 0C0AF080 */ jal func_802BC200_E2C930 +/* E2CAFC 802BC3CC E4400004 */ swc1 $f0, 4($v0) +/* E2CB00 802BC3D0 8FBF0010 */ lw $ra, 0x10($sp) +/* E2CB04 802BC3D4 03E00008 */ jr $ra +/* E2CB08 802BC3D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2C930/func_802BC3DC_E2CB0C.s b/asm/nonmatchings/code_E2C930/func_802BC3DC_E2CB0C.s new file mode 100644 index 0000000000..8b29a6cfd7 --- /dev/null +++ b/asm/nonmatchings/code_E2C930/func_802BC3DC_E2CB0C.s @@ -0,0 +1,382 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC3DC_E2CB0C +/* E2CB0C 802BC3DC 27BDFF78 */ addiu $sp, $sp, -0x88 +/* E2CB10 802BC3E0 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* E2CB14 802BC3E4 4480D000 */ mtc1 $zero, $f26 +/* E2CB18 802BC3E8 F7BE0080 */ sdc1 $f30, 0x80($sp) +/* E2CB1C 802BC3EC 3C014F00 */ lui $at, 0x4f00 +/* E2CB20 802BC3F0 4481F000 */ mtc1 $at, $f30 +/* E2CB24 802BC3F4 AFBE0050 */ sw $fp, 0x50($sp) +/* E2CB28 802BC3F8 0080F02D */ daddu $fp, $a0, $zero +/* E2CB2C 802BC3FC AFB3003C */ sw $s3, 0x3c($sp) +/* E2CB30 802BC400 0000982D */ daddu $s3, $zero, $zero +/* E2CB34 802BC404 AFB60048 */ sw $s6, 0x48($sp) +/* E2CB38 802BC408 27B60020 */ addiu $s6, $sp, 0x20 +/* E2CB3C 802BC40C AFB50044 */ sw $s5, 0x44($sp) +/* E2CB40 802BC410 27B50024 */ addiu $s5, $sp, 0x24 +/* E2CB44 802BC414 AFB40040 */ sw $s4, 0x40($sp) +/* E2CB48 802BC418 27B40028 */ addiu $s4, $sp, 0x28 +/* E2CB4C 802BC41C AFB7004C */ sw $s7, 0x4c($sp) +/* E2CB50 802BC420 3C178000 */ lui $s7, 0x8000 +/* E2CB54 802BC424 AFBF0054 */ sw $ra, 0x54($sp) +/* E2CB58 802BC428 AFB20038 */ sw $s2, 0x38($sp) +/* E2CB5C 802BC42C AFB10034 */ sw $s1, 0x34($sp) +/* E2CB60 802BC430 AFB00030 */ sw $s0, 0x30($sp) +/* E2CB64 802BC434 F7BC0078 */ sdc1 $f28, 0x78($sp) +/* E2CB68 802BC438 F7B80068 */ sdc1 $f24, 0x68($sp) +/* E2CB6C 802BC43C F7B60060 */ sdc1 $f22, 0x60($sp) +/* E2CB70 802BC440 F7B40058 */ sdc1 $f20, 0x58($sp) +/* E2CB74 802BC444 8FD20040 */ lw $s2, 0x40($fp) +/* E2CB78 802BC448 4600D706 */ mov.s $f28, $f26 +/* E2CB7C 802BC44C 4600D606 */ mov.s $f24, $f26 +/* E2CB80 802BC450 0240882D */ daddu $s1, $s2, $zero +/* E2CB84 802BC454 0240802D */ daddu $s0, $s2, $zero +.L802BC458: +/* E2CB88 802BC458 82230008 */ lb $v1, 8($s1) +/* E2CB8C 802BC45C 24020001 */ addiu $v0, $zero, 1 +/* E2CB90 802BC460 10620028 */ beq $v1, $v0, .L802BC504 +/* E2CB94 802BC464 28620002 */ slti $v0, $v1, 2 +/* E2CB98 802BC468 10400005 */ beqz $v0, .L802BC480 +/* E2CB9C 802BC46C 24020002 */ addiu $v0, $zero, 2 +/* E2CBA0 802BC470 10600009 */ beqz $v1, .L802BC498 +/* E2CBA4 802BC474 00000000 */ nop +/* E2CBA8 802BC478 080AF169 */ j .L802BC5A4 +/* E2CBAC 802BC47C 00000000 */ nop +.L802BC480: +/* E2CBB0 802BC480 10620029 */ beq $v1, $v0, .L802BC528 +/* E2CBB4 802BC484 24020003 */ addiu $v0, $zero, 3 +/* E2CBB8 802BC488 50620046 */ beql $v1, $v0, .L802BC5A4 +/* E2CBBC 802BC48C 26730001 */ addiu $s3, $s3, 1 +/* E2CBC0 802BC490 080AF169 */ j .L802BC5A4 +/* E2CBC4 802BC494 00000000 */ nop +.L802BC498: +/* E2CBC8 802BC498 3C014000 */ lui $at, 0x4000 +/* E2CBCC 802BC49C 4481E000 */ mtc1 $at, $f28 +/* E2CBD0 802BC4A0 92220020 */ lbu $v0, 0x20($s1) +/* E2CBD4 802BC4A4 C61A0028 */ lwc1 $f26, 0x28($s0) +/* E2CBD8 802BC4A8 3C014120 */ lui $at, 0x4120 +/* E2CBDC 802BC4AC 44810000 */ mtc1 $at, $f0 +/* E2CBE0 802BC4B0 44801000 */ mtc1 $zero, $f2 +/* E2CBE4 802BC4B4 44822000 */ mtc1 $v0, $f4 +/* E2CBE8 802BC4B8 00000000 */ nop +/* E2CBEC 802BC4BC 46802120 */ cvt.s.w $f4, $f4 +/* E2CBF0 802BC4C0 461A103E */ c.le.s $f2, $f26 +/* E2CBF4 802BC4C4 00000000 */ nop +/* E2CBF8 802BC4C8 45000006 */ bc1f .L802BC4E4 +/* E2CBFC 802BC4CC 46002603 */ div.s $f24, $f4, $f0 +/* E2CC00 802BC4D0 3C01802C */ lui $at, %hi(D_802BCFD8) +/* E2CC04 802BC4D4 D422CFD8 */ ldc1 $f2, %lo(D_802BCFD8)($at) +/* E2CC08 802BC4D8 4600D021 */ cvt.d.s $f0, $f26 +/* E2CC0C 802BC4DC 080AF13E */ j .L802BC4F8 +/* E2CC10 802BC4E0 46220001 */ sub.d $f0, $f0, $f2 +.L802BC4E4: +/* E2CC14 802BC4E4 3C013FE0 */ lui $at, 0x3fe0 +/* E2CC18 802BC4E8 44811800 */ mtc1 $at, $f3 +/* E2CC1C 802BC4EC 44801000 */ mtc1 $zero, $f2 +/* E2CC20 802BC4F0 4600D021 */ cvt.d.s $f0, $f26 +/* E2CC24 802BC4F4 46220000 */ add.d $f0, $f0, $f2 +.L802BC4F8: +/* E2CC28 802BC4F8 46200020 */ cvt.s.d $f0, $f0 +/* E2CC2C 802BC4FC 080AF169 */ j .L802BC5A4 +/* E2CC30 802BC500 E6000028 */ swc1 $f0, 0x28($s0) +.L802BC504: +/* E2CC34 802BC504 3C013F80 */ lui $at, 0x3f80 +/* E2CC38 802BC508 4481C000 */ mtc1 $at, $f24 +/* E2CC3C 802BC50C C6020028 */ lwc1 $f2, 0x28($s0) +/* E2CC40 802BC510 3C013E80 */ lui $at, 0x3e80 +/* E2CC44 802BC514 44810000 */ mtc1 $at, $f0 +/* E2CC48 802BC518 4480E000 */ mtc1 $zero, $f28 +/* E2CC4C 802BC51C 46001682 */ mul.s $f26, $f2, $f0 +/* E2CC50 802BC520 080AF169 */ j .L802BC5A4 +/* E2CC54 802BC524 00000000 */ nop +.L802BC528: +/* E2CC58 802BC528 C6020028 */ lwc1 $f2, 0x28($s0) +/* E2CC5C 802BC52C 3C013F80 */ lui $at, 0x3f80 +/* E2CC60 802BC530 44810000 */ mtc1 $at, $f0 +/* E2CC64 802BC534 00000000 */ nop +/* E2CC68 802BC538 46001080 */ add.s $f2, $f2, $f0 +/* E2CC6C 802BC53C 3C0141A0 */ lui $at, 0x41a0 +/* E2CC70 802BC540 44810000 */ mtc1 $at, $f0 +/* E2CC74 802BC544 00000000 */ nop +/* E2CC78 802BC548 4602003C */ c.lt.s $f0, $f2 +/* E2CC7C 802BC54C 00000000 */ nop +/* E2CC80 802BC550 45000002 */ bc1f .L802BC55C +/* E2CC84 802BC554 E6020028 */ swc1 $f2, 0x28($s0) +/* E2CC88 802BC558 E6000028 */ swc1 $f0, 0x28($s0) +.L802BC55C: +/* E2CC8C 802BC55C C6020028 */ lwc1 $f2, 0x28($s0) +/* E2CC90 802BC560 3C01428C */ lui $at, 0x428c +/* E2CC94 802BC564 44812000 */ mtc1 $at, $f4 +/* E2CC98 802BC568 C6000058 */ lwc1 $f0, 0x58($s0) +/* E2CC9C 802BC56C 46041083 */ div.s $f2, $f2, $f4 +/* E2CCA0 802BC570 46020001 */ sub.s $f0, $f0, $f2 +/* E2CCA4 802BC574 E6000058 */ swc1 $f0, 0x58($s0) +/* E2CCA8 802BC578 9222000E */ lbu $v0, 0xe($s1) +/* E2CCAC 802BC57C 2442FFFB */ addiu $v0, $v0, -5 +/* E2CCB0 802BC580 A222000E */ sb $v0, 0xe($s1) +/* E2CCB4 802BC584 304200FF */ andi $v0, $v0, 0xff +/* E2CCB8 802BC588 2C420006 */ sltiu $v0, $v0, 6 +/* E2CCBC 802BC58C 10400005 */ beqz $v0, .L802BC5A4 +/* E2CCC0 802BC590 00000000 */ nop +/* E2CCC4 802BC594 92220008 */ lbu $v0, 8($s1) +/* E2CCC8 802BC598 A220000E */ sb $zero, 0xe($s1) +/* E2CCCC 802BC59C 24420001 */ addiu $v0, $v0, 1 +/* E2CCD0 802BC5A0 A2220008 */ sb $v0, 8($s1) +.L802BC5A4: +/* E2CCD4 802BC5A4 82220008 */ lb $v0, 8($s1) +/* E2CCD8 802BC5A8 28420002 */ slti $v0, $v0, 2 +/* E2CCDC 802BC5AC 504000D6 */ beql $v0, $zero, .L802BC908 +/* E2CCE0 802BC5B0 26310001 */ addiu $s1, $s1, 1 +/* E2CCE4 802BC5B4 C6020088 */ lwc1 $f2, 0x88($s0) +/* E2CCE8 802BC5B8 44800000 */ mtc1 $zero, $f0 +/* E2CCEC 802BC5BC 00000000 */ nop +/* E2CCF0 802BC5C0 4602003E */ c.le.s $f0, $f2 +/* E2CCF4 802BC5C4 3C01802C */ lui $at, %hi(D_802BCFE0) +/* E2CCF8 802BC5C8 D420CFE0 */ ldc1 $f0, %lo(D_802BCFE0)($at) +/* E2CCFC 802BC5CC 45000003 */ bc1f .L802BC5DC +/* E2CD00 802BC5D0 460010A1 */ cvt.d.s $f2, $f2 +/* E2CD04 802BC5D4 3C01802C */ lui $at, %hi(D_802BCFE8) +/* E2CD08 802BC5D8 D420CFE8 */ ldc1 $f0, %lo(D_802BCFE8)($at) +.L802BC5DC: +/* E2CD0C 802BC5DC 46201081 */ sub.d $f2, $f2, $f0 +/* E2CD10 802BC5E0 3C01802C */ lui $at, %hi(D_802BCFF0) +/* E2CD14 802BC5E4 D424CFF0 */ ldc1 $f4, %lo(D_802BCFF0)($at) +/* E2CD18 802BC5E8 462010A0 */ cvt.s.d $f2, $f2 +/* E2CD1C 802BC5EC 46001021 */ cvt.d.s $f0, $f2 +/* E2CD20 802BC5F0 4624003C */ c.lt.d $f0, $f4 +/* E2CD24 802BC5F4 00000000 */ nop +/* E2CD28 802BC5F8 45000006 */ bc1f .L802BC614 +/* E2CD2C 802BC5FC E6020088 */ swc1 $f2, 0x88($s0) +/* E2CD30 802BC600 3C01C123 */ lui $at, 0xc123 +/* E2CD34 802BC604 34213333 */ ori $at, $at, 0x3333 +/* E2CD38 802BC608 44810000 */ mtc1 $at, $f0 +/* E2CD3C 802BC60C 00000000 */ nop +/* E2CD40 802BC610 E6000088 */ swc1 $f0, 0x88($s0) +.L802BC614: +/* E2CD44 802BC614 C6000058 */ lwc1 $f0, 0x58($s0) +/* E2CD48 802BC618 C6020088 */ lwc1 $f2, 0x88($s0) +/* E2CD4C 802BC61C 46020000 */ add.s $f0, $f0, $f2 +/* E2CD50 802BC620 E6000058 */ swc1 $f0, 0x58($s0) +/* E2CD54 802BC624 9222000E */ lbu $v0, 0xe($s1) +/* E2CD58 802BC628 3C0143B4 */ lui $at, 0x43b4 +/* E2CD5C 802BC62C 44814000 */ mtc1 $at, $f8 +/* E2CD60 802BC630 4482A000 */ mtc1 $v0, $f20 +/* E2CD64 802BC634 00000000 */ nop +/* E2CD68 802BC638 4680A520 */ cvt.s.w $f20, $f20 +/* E2CD6C 802BC63C 4608A502 */ mul.s $f20, $f20, $f8 +/* E2CD70 802BC640 00000000 */ nop +/* E2CD74 802BC644 3C013B80 */ lui $at, 0x3b80 +/* E2CD78 802BC648 44814000 */ mtc1 $at, $f8 +/* E2CD7C 802BC64C 00000000 */ nop +/* E2CD80 802BC650 4608A502 */ mul.s $f20, $f20, $f8 +/* E2CD84 802BC654 00000000 */ nop +/* E2CD88 802BC658 3C0140C9 */ lui $at, 0x40c9 +/* E2CD8C 802BC65C 34210FD0 */ ori $at, $at, 0xfd0 +/* E2CD90 802BC660 44814000 */ mtc1 $at, $f8 +/* E2CD94 802BC664 00000000 */ nop +/* E2CD98 802BC668 4608A002 */ mul.s $f0, $f20, $f8 +/* E2CD9C 802BC66C 00000000 */ nop +/* E2CDA0 802BC670 3C0143B4 */ lui $at, 0x43b4 +/* E2CDA4 802BC674 44814000 */ mtc1 $at, $f8 +/* E2CDA8 802BC678 00000000 */ nop +/* E2CDAC 802BC67C 46080583 */ div.s $f22, $f0, $f8 +/* E2CDB0 802BC680 0C00A85B */ jal sin_rad +/* E2CDB4 802BC684 4600B306 */ mov.s $f12, $f22 +/* E2CDB8 802BC688 4600C002 */ mul.s $f0, $f24, $f0 +/* E2CDBC 802BC68C 00000000 */ nop +/* E2CDC0 802BC690 C6020040 */ lwc1 $f2, 0x40($s0) +/* E2CDC4 802BC694 46001080 */ add.s $f2, $f2, $f0 +/* E2CDC8 802BC698 4600B306 */ mov.s $f12, $f22 +/* E2CDCC 802BC69C 0C00A874 */ jal cos_rad +/* E2CDD0 802BC6A0 E6020040 */ swc1 $f2, 0x40($s0) +/* E2CDD4 802BC6A4 4600C002 */ mul.s $f0, $f24, $f0 +/* E2CDD8 802BC6A8 00000000 */ nop +/* E2CDDC 802BC6AC C6020070 */ lwc1 $f2, 0x70($s0) +/* E2CDE0 802BC6B0 3C040004 */ lui $a0, 4 +/* E2CDE4 802BC6B4 46001080 */ add.s $f2, $f2, $f0 +/* E2CDE8 802BC6B8 C6000040 */ lwc1 $f0, 0x40($s0) +/* E2CDEC 802BC6BC 02C0282D */ daddu $a1, $s6, $zero +/* E2CDF0 802BC6C0 E6020070 */ swc1 $f2, 0x70($s0) +/* E2CDF4 802BC6C4 C6020058 */ lwc1 $f2, 0x58($s0) +/* E2CDF8 802BC6C8 C6040070 */ lwc1 $f4, 0x70($s0) +/* E2CDFC 802BC6CC 02A0302D */ daddu $a2, $s5, $zero +/* E2CE00 802BC6D0 E7A00020 */ swc1 $f0, 0x20($sp) +/* E2CE04 802BC6D4 E7A20024 */ swc1 $f2, 0x24($sp) +/* E2CE08 802BC6D8 E7A40028 */ swc1 $f4, 0x28($sp) +/* E2CE0C 802BC6DC 3C014100 */ lui $at, 0x4100 +/* E2CE10 802BC6E0 44814000 */ mtc1 $at, $f8 +/* E2CE14 802BC6E4 0280382D */ daddu $a3, $s4, $zero +/* E2CE18 802BC6E8 E7B80010 */ swc1 $f24, 0x10($sp) +/* E2CE1C 802BC6EC E7B40014 */ swc1 $f20, 0x14($sp) +/* E2CE20 802BC6F0 E7A80018 */ swc1 $f8, 0x18($sp) +/* E2CE24 802BC6F4 0C0376B9 */ jal func_800DDAE4 +/* E2CE28 802BC6F8 E7A8001C */ swc1 $f8, 0x1c($sp) +/* E2CE2C 802BC6FC 10400031 */ beqz $v0, .L802BC7C4 +/* E2CE30 802BC700 3C040004 */ lui $a0, 4 +/* E2CE34 802BC704 C7A00020 */ lwc1 $f0, 0x20($sp) +/* E2CE38 802BC708 C7A20024 */ lwc1 $f2, 0x24($sp) +/* E2CE3C 802BC70C C7A40028 */ lwc1 $f4, 0x28($sp) +/* E2CE40 802BC710 E6000040 */ swc1 $f0, 0x40($s0) +/* E2CE44 802BC714 E6020058 */ swc1 $f2, 0x58($s0) +/* E2CE48 802BC718 E6040070 */ swc1 $f4, 0x70($s0) +/* E2CE4C 802BC71C 9222000E */ lbu $v0, 0xe($s1) +/* E2CE50 802BC720 3C0143B4 */ lui $at, 0x43b4 +/* E2CE54 802BC724 44814000 */ mtc1 $at, $f8 +/* E2CE58 802BC728 24420080 */ addiu $v0, $v0, 0x80 +/* E2CE5C 802BC72C A222000E */ sb $v0, 0xe($s1) +/* E2CE60 802BC730 304200FF */ andi $v0, $v0, 0xff +/* E2CE64 802BC734 44820000 */ mtc1 $v0, $f0 +/* E2CE68 802BC738 00000000 */ nop +/* E2CE6C 802BC73C 46800020 */ cvt.s.w $f0, $f0 +/* E2CE70 802BC740 46080002 */ mul.s $f0, $f0, $f8 +/* E2CE74 802BC744 00000000 */ nop +/* E2CE78 802BC748 3C013B80 */ lui $at, 0x3b80 +/* E2CE7C 802BC74C 44814000 */ mtc1 $at, $f8 +/* E2CE80 802BC750 00000000 */ nop +/* E2CE84 802BC754 46080002 */ mul.s $f0, $f0, $f8 +/* E2CE88 802BC758 00000000 */ nop +/* E2CE8C 802BC75C 3C0140C9 */ lui $at, 0x40c9 +/* E2CE90 802BC760 34210FD0 */ ori $at, $at, 0xfd0 +/* E2CE94 802BC764 44814000 */ mtc1 $at, $f8 +/* E2CE98 802BC768 00000000 */ nop +/* E2CE9C 802BC76C 46080002 */ mul.s $f0, $f0, $f8 +/* E2CEA0 802BC770 00000000 */ nop +/* E2CEA4 802BC774 3C0143B4 */ lui $at, 0x43b4 +/* E2CEA8 802BC778 44814000 */ mtc1 $at, $f8 +/* E2CEAC 802BC77C 3C014100 */ lui $at, 0x4100 +/* E2CEB0 802BC780 4481C000 */ mtc1 $at, $f24 +/* E2CEB4 802BC784 46080583 */ div.s $f22, $f0, $f8 +/* E2CEB8 802BC788 0C00A85B */ jal sin_rad +/* E2CEBC 802BC78C 4600B306 */ mov.s $f12, $f22 +/* E2CEC0 802BC790 46180002 */ mul.s $f0, $f0, $f24 +/* E2CEC4 802BC794 00000000 */ nop +/* E2CEC8 802BC798 C6020040 */ lwc1 $f2, 0x40($s0) +/* E2CECC 802BC79C 46001080 */ add.s $f2, $f2, $f0 +/* E2CED0 802BC7A0 4600B306 */ mov.s $f12, $f22 +/* E2CED4 802BC7A4 0C00A874 */ jal cos_rad +/* E2CED8 802BC7A8 E6020040 */ swc1 $f2, 0x40($s0) +/* E2CEDC 802BC7AC 46180002 */ mul.s $f0, $f0, $f24 +/* E2CEE0 802BC7B0 00000000 */ nop +/* E2CEE4 802BC7B4 C6020070 */ lwc1 $f2, 0x70($s0) +/* E2CEE8 802BC7B8 46001080 */ add.s $f2, $f2, $f0 +/* E2CEEC 802BC7BC E6020070 */ swc1 $f2, 0x70($s0) +/* E2CEF0 802BC7C0 3C040004 */ lui $a0, 4 +.L802BC7C4: +/* E2CEF4 802BC7C4 02C0282D */ daddu $a1, $s6, $zero +/* E2CEF8 802BC7C8 02A0302D */ daddu $a2, $s5, $zero +/* E2CEFC 802BC7CC 0280382D */ daddu $a3, $s4, $zero +/* E2CF00 802BC7D0 27A2002C */ addiu $v0, $sp, 0x2c +/* E2CF04 802BC7D4 C6020040 */ lwc1 $f2, 0x40($s0) +/* E2CF08 802BC7D8 C6040058 */ lwc1 $f4, 0x58($s0) +/* E2CF0C 802BC7DC C6000088 */ lwc1 $f0, 0x88($s0) +/* E2CF10 802BC7E0 C6060070 */ lwc1 $f6, 0x70($s0) +/* E2CF14 802BC7E4 46000005 */ abs.s $f0, $f0 +/* E2CF18 802BC7E8 E7A20020 */ swc1 $f2, 0x20($sp) +/* E2CF1C 802BC7EC E7A40024 */ swc1 $f4, 0x24($sp) +/* E2CF20 802BC7F0 E7A60028 */ swc1 $f6, 0x28($sp) +/* E2CF24 802BC7F4 E7A0002C */ swc1 $f0, 0x2c($sp) +/* E2CF28 802BC7F8 0C0372DF */ jal func_800DCB7C +/* E2CF2C 802BC7FC AFA20010 */ sw $v0, 0x10($sp) +/* E2CF30 802BC800 1440000B */ bnez $v0, .L802BC830 +/* E2CF34 802BC804 00000000 */ nop +/* E2CF38 802BC808 C6400004 */ lwc1 $f0, 4($s2) +/* E2CF3C 802BC80C 3C014348 */ lui $at, 0x4348 +/* E2CF40 802BC810 44811000 */ mtc1 $at, $f2 +/* E2CF44 802BC814 00000000 */ nop +/* E2CF48 802BC818 46020001 */ sub.s $f0, $f0, $f2 +/* E2CF4C 802BC81C C7A20024 */ lwc1 $f2, 0x24($sp) +/* E2CF50 802BC820 4600103C */ c.lt.s $f2, $f0 +/* E2CF54 802BC824 00000000 */ nop +/* E2CF58 802BC828 45000010 */ bc1f .L802BC86C +/* E2CF5C 802BC82C 00000000 */ nop +.L802BC830: +/* E2CF60 802BC830 92220008 */ lbu $v0, 8($s1) +/* E2CF64 802BC834 24420001 */ addiu $v0, $v0, 1 +/* E2CF68 802BC838 A2220008 */ sb $v0, 8($s1) +/* E2CF6C 802BC83C C6000088 */ lwc1 $f0, 0x88($s0) +/* E2CF70 802BC840 C7A20024 */ lwc1 $f2, 0x24($sp) +/* E2CF74 802BC844 46000005 */ abs.s $f0, $f0 +/* E2CF78 802BC848 46001080 */ add.s $f2, $f2, $f0 +/* E2CF7C 802BC84C E61C0088 */ swc1 $f28, 0x88($s0) +/* E2CF80 802BC850 E6020058 */ swc1 $f2, 0x58($s0) +/* E2CF84 802BC854 82230008 */ lb $v1, 8($s1) +/* E2CF88 802BC858 24020002 */ addiu $v0, $zero, 2 +/* E2CF8C 802BC85C 14620003 */ bne $v1, $v0, .L802BC86C +/* E2CF90 802BC860 240200FE */ addiu $v0, $zero, 0xfe +/* E2CF94 802BC864 A222000E */ sb $v0, 0xe($s1) +/* E2CF98 802BC868 AE000028 */ sw $zero, 0x28($s0) +.L802BC86C: +/* E2CF9C 802BC86C 92220014 */ lbu $v0, 0x14($s1) +/* E2CFA0 802BC870 44820000 */ mtc1 $v0, $f0 +/* E2CFA4 802BC874 00000000 */ nop +/* E2CFA8 802BC878 46800020 */ cvt.s.w $f0, $f0 +/* E2CFAC 802BC87C 461A0000 */ add.s $f0, $f0, $f26 +/* E2CFB0 802BC880 4600F03E */ c.le.s $f30, $f0 +/* E2CFB4 802BC884 00000000 */ nop +/* E2CFB8 802BC888 45010005 */ bc1t .L802BC8A0 +/* E2CFBC 802BC88C 26230014 */ addiu $v1, $s1, 0x14 +/* E2CFC0 802BC890 4600020D */ trunc.w.s $f8, $f0 +/* E2CFC4 802BC894 44024000 */ mfc1 $v0, $f8 +/* E2CFC8 802BC898 080AF22E */ j .L802BC8B8 +/* E2CFCC 802BC89C A0620000 */ sb $v0, ($v1) +.L802BC8A0: +/* E2CFD0 802BC8A0 461E0001 */ sub.s $f0, $f0, $f30 +/* E2CFD4 802BC8A4 4600020D */ trunc.w.s $f8, $f0 +/* E2CFD8 802BC8A8 44024000 */ mfc1 $v0, $f8 +/* E2CFDC 802BC8AC 00000000 */ nop +/* E2CFE0 802BC8B0 00571025 */ or $v0, $v0, $s7 +/* E2CFE4 802BC8B4 A0620000 */ sb $v0, ($v1) +.L802BC8B8: +/* E2CFE8 802BC8B8 9222001A */ lbu $v0, 0x1a($s1) +/* E2CFEC 802BC8BC 44820000 */ mtc1 $v0, $f0 +/* E2CFF0 802BC8C0 00000000 */ nop +/* E2CFF4 802BC8C4 46800020 */ cvt.s.w $f0, $f0 +/* E2CFF8 802BC8C8 461A0001 */ sub.s $f0, $f0, $f26 +/* E2CFFC 802BC8CC 4600F03E */ c.le.s $f30, $f0 +/* E2D000 802BC8D0 00000000 */ nop +/* E2D004 802BC8D4 45010005 */ bc1t .L802BC8EC +/* E2D008 802BC8D8 2623001A */ addiu $v1, $s1, 0x1a +/* E2D00C 802BC8DC 4600020D */ trunc.w.s $f8, $f0 +/* E2D010 802BC8E0 44024000 */ mfc1 $v0, $f8 +/* E2D014 802BC8E4 080AF241 */ j .L802BC904 +/* E2D018 802BC8E8 A0620000 */ sb $v0, ($v1) +.L802BC8EC: +/* E2D01C 802BC8EC 461E0001 */ sub.s $f0, $f0, $f30 +/* E2D020 802BC8F0 4600020D */ trunc.w.s $f8, $f0 +/* E2D024 802BC8F4 44024000 */ mfc1 $v0, $f8 +/* E2D028 802BC8F8 00000000 */ nop +/* E2D02C 802BC8FC 00571025 */ or $v0, $v0, $s7 +/* E2D030 802BC900 A0620000 */ sb $v0, ($v1) +.L802BC904: +/* E2D034 802BC904 26310001 */ addiu $s1, $s1, 1 +.L802BC908: +/* E2D038 802BC908 26420005 */ addiu $v0, $s2, 5 +/* E2D03C 802BC90C 0222102A */ slt $v0, $s1, $v0 +/* E2D040 802BC910 1440FED1 */ bnez $v0, .L802BC458 +/* E2D044 802BC914 26100004 */ addiu $s0, $s0, 4 +/* E2D048 802BC918 2A620005 */ slti $v0, $s3, 5 +/* E2D04C 802BC91C 14400003 */ bnez $v0, .L802BC92C +/* E2D050 802BC920 00000000 */ nop +/* E2D054 802BC924 0C043F5A */ jal func_8010FD68 +/* E2D058 802BC928 03C0202D */ daddu $a0, $fp, $zero +.L802BC92C: +/* E2D05C 802BC92C 8FBF0054 */ lw $ra, 0x54($sp) +/* E2D060 802BC930 8FBE0050 */ lw $fp, 0x50($sp) +/* E2D064 802BC934 8FB7004C */ lw $s7, 0x4c($sp) +/* E2D068 802BC938 8FB60048 */ lw $s6, 0x48($sp) +/* E2D06C 802BC93C 8FB50044 */ lw $s5, 0x44($sp) +/* E2D070 802BC940 8FB40040 */ lw $s4, 0x40($sp) +/* E2D074 802BC944 8FB3003C */ lw $s3, 0x3c($sp) +/* E2D078 802BC948 8FB20038 */ lw $s2, 0x38($sp) +/* E2D07C 802BC94C 8FB10034 */ lw $s1, 0x34($sp) +/* E2D080 802BC950 8FB00030 */ lw $s0, 0x30($sp) +/* E2D084 802BC954 D7BE0080 */ ldc1 $f30, 0x80($sp) +/* E2D088 802BC958 D7BC0078 */ ldc1 $f28, 0x78($sp) +/* E2D08C 802BC95C D7BA0070 */ ldc1 $f26, 0x70($sp) +/* E2D090 802BC960 D7B80068 */ ldc1 $f24, 0x68($sp) +/* E2D094 802BC964 D7B60060 */ ldc1 $f22, 0x60($sp) +/* E2D098 802BC968 D7B40058 */ ldc1 $f20, 0x58($sp) +/* E2D09C 802BC96C 03E00008 */ jr $ra +/* E2D0A0 802BC970 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/code_E2C930/func_802BC974_E2D0A4.s b/asm/nonmatchings/code_E2C930/func_802BC974_E2D0A4.s new file mode 100644 index 0000000000..6898715f06 --- /dev/null +++ b/asm/nonmatchings/code_E2C930/func_802BC974_E2D0A4.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC974_E2D0A4 +/* E2D0A4 802BC974 27BDFE80 */ addiu $sp, $sp, -0x180 +/* E2D0A8 802BC978 AFBE0148 */ sw $fp, 0x148($sp) +/* E2D0AC 802BC97C 0000F02D */ daddu $fp, $zero, $zero +/* E2D0B0 802BC980 27A80098 */ addiu $t0, $sp, 0x98 +/* E2D0B4 802BC984 AFB5013C */ sw $s5, 0x13c($sp) +/* E2D0B8 802BC988 27B500D8 */ addiu $s5, $sp, 0xd8 +/* E2D0BC 802BC98C AFB40138 */ sw $s4, 0x138($sp) +/* E2D0C0 802BC990 27B40058 */ addiu $s4, $sp, 0x58 +/* E2D0C4 802BC994 AFA8011C */ sw $t0, 0x11c($sp) +/* E2D0C8 802BC998 3C080001 */ lui $t0, 1 +/* E2D0CC 802BC99C AFB1012C */ sw $s1, 0x12c($sp) +/* E2D0D0 802BC9A0 3C11800A */ lui $s1, %hi(gMasterGfxPos) +/* E2D0D4 802BC9A4 8E31A66C */ lw $s1, %lo(gMasterGfxPos)($s1) +/* E2D0D8 802BC9A8 35081630 */ ori $t0, $t0, 0x1630 +/* E2D0DC 802BC9AC AFBF014C */ sw $ra, 0x14c($sp) +/* E2D0E0 802BC9B0 AFB70144 */ sw $s7, 0x144($sp) +/* E2D0E4 802BC9B4 AFB60140 */ sw $s6, 0x140($sp) +/* E2D0E8 802BC9B8 AFB30134 */ sw $s3, 0x134($sp) +/* E2D0EC 802BC9BC AFB20130 */ sw $s2, 0x130($sp) +/* E2D0F0 802BC9C0 AFB00128 */ sw $s0, 0x128($sp) +/* E2D0F4 802BC9C4 F7BE0178 */ sdc1 $f30, 0x178($sp) +/* E2D0F8 802BC9C8 F7BC0170 */ sdc1 $f28, 0x170($sp) +/* E2D0FC 802BC9CC F7BA0168 */ sdc1 $f26, 0x168($sp) +/* E2D100 802BC9D0 F7B80160 */ sdc1 $f24, 0x160($sp) +/* E2D104 802BC9D4 F7B60158 */ sdc1 $f22, 0x158($sp) +/* E2D108 802BC9D8 F7B40150 */ sdc1 $f20, 0x150($sp) +/* E2D10C 802BC9DC 0C04417A */ jal get_entity_by_index +/* E2D110 802BC9E0 AFA80120 */ sw $t0, 0x120($sp) +/* E2D114 802BC9E4 0040B82D */ daddu $s7, $v0, $zero +/* E2D118 802BC9E8 3C0143B4 */ lui $at, 0x43b4 +/* E2D11C 802BC9EC 4481D000 */ mtc1 $at, $f26 +/* E2D120 802BC9F0 3C013B80 */ lui $at, 0x3b80 +/* E2D124 802BC9F4 4481C000 */ mtc1 $at, $f24 +/* E2D128 802BC9F8 3C013F80 */ lui $at, 0x3f80 +/* E2D12C 802BC9FC 4481B000 */ mtc1 $at, $f22 +/* E2D130 802BCA00 8EE20040 */ lw $v0, 0x40($s7) +/* E2D134 802BCA04 4480A000 */ mtc1 $zero, $f20 +/* E2D138 802BCA08 C6E00048 */ lwc1 $f0, 0x48($s7) +/* E2D13C 802BCA0C 0040902D */ daddu $s2, $v0, $zero +/* E2D140 802BCA10 0240982D */ daddu $s3, $s2, $zero +/* E2D144 802BCA14 2630FFFC */ addiu $s0, $s1, -4 +/* E2D148 802BCA18 46000007 */ neg.s $f0, $f0 +/* E2D14C 802BCA1C E7A00118 */ swc1 $f0, 0x118($sp) +/* E2D150 802BCA20 C6E0004C */ lwc1 $f0, 0x4c($s7) +/* E2D154 802BCA24 C6E20050 */ lwc1 $f2, 0x50($s7) +/* E2D158 802BCA28 8E560000 */ lw $s6, ($s2) +/* E2D15C 802BCA2C 46000787 */ neg.s $f30, $f0 +/* E2D160 802BCA30 46001707 */ neg.s $f28, $f2 +.L802BCA34: +/* E2D164 802BCA34 82420008 */ lb $v0, 8($s2) +/* E2D168 802BCA38 28420002 */ slti $v0, $v0, 2 +/* E2D16C 802BCA3C 1040000F */ beqz $v0, .L802BCA7C +/* E2D170 802BCA40 3C03E200 */ lui $v1, 0xe200 +/* E2D174 802BCA44 26100008 */ addiu $s0, $s0, 8 +/* E2D178 802BCA48 3463001C */ ori $v1, $v1, 0x1c +/* E2D17C 802BCA4C 3C020055 */ lui $v0, 0x55 +/* E2D180 802BCA50 34422078 */ ori $v0, $v0, 0x2078 +/* E2D184 802BCA54 AE03FFFC */ sw $v1, -4($s0) +/* E2D188 802BCA58 AE020000 */ sw $v0, ($s0) +/* E2D18C 802BCA5C 26100008 */ addiu $s0, $s0, 8 +/* E2D190 802BCA60 26310010 */ addiu $s1, $s1, 0x10 +/* E2D194 802BCA64 3C03FC12 */ lui $v1, 0xfc12 +/* E2D198 802BCA68 34631824 */ ori $v1, $v1, 0x1824 +/* E2D19C 802BCA6C 3C02FF33 */ lui $v0, 0xff33 +/* E2D1A0 802BCA70 3442FFFF */ ori $v0, $v0, 0xffff +/* E2D1A4 802BCA74 080AF2AB */ j .L802BCAAC +/* E2D1A8 802BCA78 AE03FFFC */ sw $v1, -4($s0) +.L802BCA7C: +/* E2D1AC 802BCA7C 26100008 */ addiu $s0, $s0, 8 +/* E2D1B0 802BCA80 3C03FCFF */ lui $v1, 0xfcff +/* E2D1B4 802BCA84 3463C3FF */ ori $v1, $v1, 0xc3ff +/* E2D1B8 802BCA88 3C02FF30 */ lui $v0, 0xff30 +/* E2D1BC 802BCA8C 3442FE7F */ ori $v0, $v0, 0xfe7f +/* E2D1C0 802BCA90 AE03FFFC */ sw $v1, -4($s0) +/* E2D1C4 802BCA94 AE020000 */ sw $v0, ($s0) +/* E2D1C8 802BCA98 26100008 */ addiu $s0, $s0, 8 +/* E2D1CC 802BCA9C 3C02FA00 */ lui $v0, 0xfa00 +/* E2D1D0 802BCAA0 AE02FFFC */ sw $v0, -4($s0) +/* E2D1D4 802BCAA4 9242000E */ lbu $v0, 0xe($s2) +/* E2D1D8 802BCAA8 26310010 */ addiu $s1, $s1, 0x10 +.L802BCAAC: +/* E2D1DC 802BCAAC AE020000 */ sw $v0, ($s0) +/* E2D1E0 802BCAB0 8FA50118 */ lw $a1, 0x118($sp) +/* E2D1E4 802BCAB4 4406F000 */ mfc1 $a2, $f30 +/* E2D1E8 802BCAB8 4407E000 */ mfc1 $a3, $f28 +/* E2D1EC 802BCABC 0C019E40 */ jal guTranslateF +/* E2D1F0 802BCAC0 27A40018 */ addiu $a0, $sp, 0x18 +/* E2D1F4 802BCAC4 92420014 */ lbu $v0, 0x14($s2) +/* E2D1F8 802BCAC8 44820000 */ mtc1 $v0, $f0 +/* E2D1FC 802BCACC 00000000 */ nop +/* E2D200 802BCAD0 46800020 */ cvt.s.w $f0, $f0 +/* E2D204 802BCAD4 461A0002 */ mul.s $f0, $f0, $f26 +/* E2D208 802BCAD8 00000000 */ nop +/* E2D20C 802BCADC 46180002 */ mul.s $f0, $f0, $f24 +/* E2D210 802BCAE0 00000000 */ nop +/* E2D214 802BCAE4 4406B000 */ mfc1 $a2, $f22 +/* E2D218 802BCAE8 4407A000 */ mfc1 $a3, $f20 +/* E2D21C 802BCAEC 8FA4011C */ lw $a0, 0x11c($sp) +/* E2D220 802BCAF0 44050000 */ mfc1 $a1, $f0 +/* E2D224 802BCAF4 0C019EC8 */ jal guRotateF +/* E2D228 802BCAF8 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2D22C 802BCAFC 9242001A */ lbu $v0, 0x1a($s2) +/* E2D230 802BCB00 44820000 */ mtc1 $v0, $f0 +/* E2D234 802BCB04 00000000 */ nop +/* E2D238 802BCB08 46800020 */ cvt.s.w $f0, $f0 +/* E2D23C 802BCB0C 461A0002 */ mul.s $f0, $f0, $f26 +/* E2D240 802BCB10 00000000 */ nop +/* E2D244 802BCB14 26100008 */ addiu $s0, $s0, 8 +/* E2D248 802BCB18 26310018 */ addiu $s1, $s1, 0x18 +/* E2D24C 802BCB1C 46180002 */ mul.s $f0, $f0, $f24 +/* E2D250 802BCB20 00000000 */ nop +/* E2D254 802BCB24 27DE0001 */ addiu $fp, $fp, 1 +/* E2D258 802BCB28 02A0202D */ daddu $a0, $s5, $zero +/* E2D25C 802BCB2C 4406A000 */ mfc1 $a2, $f20 +/* E2D260 802BCB30 4407B000 */ mfc1 $a3, $f22 +/* E2D264 802BCB34 44050000 */ mfc1 $a1, $f0 +/* E2D268 802BCB38 26520001 */ addiu $s2, $s2, 1 +/* E2D26C 802BCB3C 0C019EC8 */ jal guRotateF +/* E2D270 802BCB40 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2D274 802BCB44 02A0282D */ daddu $a1, $s5, $zero +/* E2D278 802BCB48 8FA4011C */ lw $a0, 0x11c($sp) +/* E2D27C 802BCB4C 0C019D80 */ jal guMtxCatF +/* E2D280 802BCB50 02A0302D */ daddu $a2, $s5, $zero +/* E2D284 802BCB54 02A0202D */ daddu $a0, $s5, $zero +/* E2D288 802BCB58 27A50018 */ addiu $a1, $sp, 0x18 +/* E2D28C 802BCB5C 0C019D80 */ jal guMtxCatF +/* E2D290 802BCB60 00A0302D */ daddu $a2, $a1, $zero +/* E2D294 802BCB64 0280202D */ daddu $a0, $s4, $zero +/* E2D298 802BCB68 8E650040 */ lw $a1, 0x40($s3) +/* E2D29C 802BCB6C 8E660058 */ lw $a2, 0x58($s3) +/* E2D2A0 802BCB70 8E670070 */ lw $a3, 0x70($s3) +/* E2D2A4 802BCB74 0C019E40 */ jal guTranslateF +/* E2D2A8 802BCB78 26730004 */ addiu $s3, $s3, 4 +/* E2D2AC 802BCB7C 27A40018 */ addiu $a0, $sp, 0x18 +/* E2D2B0 802BCB80 0280282D */ daddu $a1, $s4, $zero +/* E2D2B4 802BCB84 0C019D80 */ jal guMtxCatF +/* E2D2B8 802BCB88 0280302D */ daddu $a2, $s4, $zero +/* E2D2BC 802BCB8C 0280202D */ daddu $a0, $s4, $zero +/* E2D2C0 802BCB90 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* E2D2C4 802BCB94 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) +/* E2D2C8 802BCB98 3C02800A */ lui $v0, %hi(gDisplayContext) +/* E2D2CC 802BCB9C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) +/* E2D2D0 802BCBA0 8FA80120 */ lw $t0, 0x120($sp) +/* E2D2D4 802BCBA4 00052980 */ sll $a1, $a1, 6 +/* E2D2D8 802BCBA8 00A82821 */ addu $a1, $a1, $t0 +/* E2D2DC 802BCBAC 0C019D40 */ jal guMtxF2L +/* E2D2E0 802BCBB0 00452821 */ addu $a1, $v0, $a1 +/* E2D2E4 802BCBB4 3C05D838 */ lui $a1, 0xd838 +/* E2D2E8 802BCBB8 34A50002 */ ori $a1, $a1, 2 +/* E2D2EC 802BCBBC 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* E2D2F0 802BCBC0 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) +/* E2D2F4 802BCBC4 3C03DA38 */ lui $v1, 0xda38 +/* E2D2F8 802BCBC8 AE03FFFC */ sw $v1, -4($s0) +/* E2D2FC 802BCBCC 8FA80120 */ lw $t0, 0x120($sp) +/* E2D300 802BCBD0 24430001 */ addiu $v1, $v0, 1 +/* E2D304 802BCBD4 3042FFFF */ andi $v0, $v0, 0xffff +/* E2D308 802BCBD8 00021180 */ sll $v0, $v0, 6 +/* E2D30C 802BCBDC 3C018007 */ lui $at, %hi(gMatrixListPos) +/* E2D310 802BCBE0 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) +/* E2D314 802BCBE4 3C03800A */ lui $v1, %hi(gDisplayContext) +/* E2D318 802BCBE8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) +/* E2D31C 802BCBEC 00481021 */ addu $v0, $v0, $t0 +/* E2D320 802BCBF0 00621821 */ addu $v1, $v1, $v0 +/* E2D324 802BCBF4 AE030000 */ sw $v1, ($s0) +/* E2D328 802BCBF8 96C40002 */ lhu $a0, 2($s6) +/* E2D32C 802BCBFC 26D60004 */ addiu $s6, $s6, 4 +/* E2D330 802BCC00 26100008 */ addiu $s0, $s0, 8 +/* E2D334 802BCC04 8EE30044 */ lw $v1, 0x44($s7) +/* E2D338 802BCC08 3C02DE00 */ lui $v0, 0xde00 +/* E2D33C 802BCC0C AE02FFFC */ sw $v0, -4($s0) +/* E2D340 802BCC10 24020040 */ addiu $v0, $zero, 0x40 +/* E2D344 802BCC14 00641821 */ addu $v1, $v1, $a0 +/* E2D348 802BCC18 AE030000 */ sw $v1, ($s0) +/* E2D34C 802BCC1C 26100008 */ addiu $s0, $s0, 8 +/* E2D350 802BCC20 AE020000 */ sw $v0, ($s0) +/* E2D354 802BCC24 2BC20005 */ slti $v0, $fp, 5 +/* E2D358 802BCC28 1440FF82 */ bnez $v0, .L802BCA34 +/* E2D35C 802BCC2C AE05FFFC */ sw $a1, -4($s0) +/* E2D360 802BCC30 8FBF014C */ lw $ra, 0x14c($sp) +/* E2D364 802BCC34 8FBE0148 */ lw $fp, 0x148($sp) +/* E2D368 802BCC38 8FB70144 */ lw $s7, 0x144($sp) +/* E2D36C 802BCC3C 8FB60140 */ lw $s6, 0x140($sp) +/* E2D370 802BCC40 8FB5013C */ lw $s5, 0x13c($sp) +/* E2D374 802BCC44 8FB40138 */ lw $s4, 0x138($sp) +/* E2D378 802BCC48 8FB30134 */ lw $s3, 0x134($sp) +/* E2D37C 802BCC4C 8FB20130 */ lw $s2, 0x130($sp) +/* E2D380 802BCC50 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* E2D384 802BCC54 AC31A66C */ sw $s1, %lo(gMasterGfxPos)($at) +/* E2D388 802BCC58 8FB1012C */ lw $s1, 0x12c($sp) +/* E2D38C 802BCC5C 8FB00128 */ lw $s0, 0x128($sp) +/* E2D390 802BCC60 D7BE0178 */ ldc1 $f30, 0x178($sp) +/* E2D394 802BCC64 D7BC0170 */ ldc1 $f28, 0x170($sp) +/* E2D398 802BCC68 D7BA0168 */ ldc1 $f26, 0x168($sp) +/* E2D39C 802BCC6C D7B80160 */ ldc1 $f24, 0x160($sp) +/* E2D3A0 802BCC70 D7B60158 */ ldc1 $f22, 0x158($sp) +/* E2D3A4 802BCC74 D7B40150 */ ldc1 $f20, 0x150($sp) +/* E2D3A8 802BCC78 03E00008 */ jr $ra +/* E2D3AC 802BCC7C 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/asm/nonmatchings/code_E2C930/func_802BCC80_E2D3B0.s b/asm/nonmatchings/code_E2C930/func_802BCC80_E2D3B0.s new file mode 100644 index 0000000000..90138912ae --- /dev/null +++ b/asm/nonmatchings/code_E2C930/func_802BCC80_E2D3B0.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BCC80_E2D3B0 +/* E2D3B0 802BCC80 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2D3B4 802BCC84 AFB00010 */ sw $s0, 0x10($sp) +/* E2D3B8 802BCC88 0080802D */ daddu $s0, $a0, $zero +/* E2D3BC 802BCC8C AFBF0014 */ sw $ra, 0x14($sp) +/* E2D3C0 802BCC90 92020006 */ lbu $v0, 6($s0) +/* E2D3C4 802BCC94 30420080 */ andi $v0, $v0, 0x80 +/* E2D3C8 802BCC98 1040000C */ beqz $v0, .L802BCCCC +/* E2D3CC 802BCC9C 00000000 */ nop +/* E2D3D0 802BCCA0 0C04419E */ jal func_80110678 +/* E2D3D4 802BCCA4 00000000 */ nop +/* E2D3D8 802BCCA8 0C043F5A */ jal func_8010FD68 +/* E2D3DC 802BCCAC 0200202D */ daddu $a0, $s0, $zero +/* E2D3E0 802BCCB0 C600004C */ lwc1 $f0, 0x4c($s0) +/* E2D3E4 802BCCB4 3C0141C8 */ lui $at, 0x41c8 +/* E2D3E8 802BCCB8 44817000 */ mtc1 $at, $f14 +/* E2D3EC 802BCCBC C60C0048 */ lwc1 $f12, 0x48($s0) +/* E2D3F0 802BCCC0 8E060050 */ lw $a2, 0x50($s0) +/* E2D3F4 802BCCC4 0C01BE3C */ jal func_8006F8F0 +/* E2D3F8 802BCCC8 460E0380 */ add.s $f14, $f0, $f14 +.L802BCCCC: +/* E2D3FC 802BCCCC 8FBF0014 */ lw $ra, 0x14($sp) +/* E2D400 802BCCD0 8FB00010 */ lw $s0, 0x10($sp) +/* E2D404 802BCCD4 03E00008 */ jr $ra +/* E2D408 802BCCD8 27BD0018 */ addiu $sp, $sp, 0x18 +/* E2D40C 802BCCDC 00000000 */ nop diff --git a/asm/nonmatchings/code_E2D730/func_802BAE00_E2D730.s b/asm/nonmatchings/code_E2D730/func_802BAE00_E2D730.s new file mode 100644 index 0000000000..d655d0dc05 --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BAE00_E2D730.s @@ -0,0 +1,133 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BAE00_E2D730 +/* E2D730 802BAE00 27BDFF00 */ addiu $sp, $sp, -0x100 +/* E2D734 802BAE04 AFBF00EC */ sw $ra, 0xec($sp) +/* E2D738 802BAE08 AFB400E8 */ sw $s4, 0xe8($sp) +/* E2D73C 802BAE0C AFB300E4 */ sw $s3, 0xe4($sp) +/* E2D740 802BAE10 AFB200E0 */ sw $s2, 0xe0($sp) +/* E2D744 802BAE14 AFB100DC */ sw $s1, 0xdc($sp) +/* E2D748 802BAE18 AFB000D8 */ sw $s0, 0xd8($sp) +/* E2D74C 802BAE1C F7B600F8 */ sdc1 $f22, 0xf8($sp) +/* E2D750 802BAE20 0C04417A */ jal get_entity_by_index +/* E2D754 802BAE24 F7B400F0 */ sdc1 $f20, 0xf0($sp) +/* E2D758 802BAE28 27A40018 */ addiu $a0, $sp, 0x18 +/* E2D75C 802BAE2C 0040A02D */ daddu $s4, $v0, $zero +/* E2D760 802BAE30 3C050A00 */ lui $a1, 0xa00 +/* E2D764 802BAE34 24A50B70 */ addiu $a1, $a1, 0xb70 +/* E2D768 802BAE38 30A5FFFF */ andi $a1, $a1, 0xffff +/* E2D76C 802BAE3C 3C13800A */ lui $s3, %hi(gMasterGfxPos) +/* E2D770 802BAE40 8E73A66C */ lw $s3, %lo(gMasterGfxPos)($s3) +/* E2D774 802BAE44 8E820044 */ lw $v0, 0x44($s4) +/* E2D778 802BAE48 8E920040 */ lw $s2, 0x40($s4) +/* E2D77C 802BAE4C 4480A000 */ mtc1 $zero, $f20 +/* E2D780 802BAE50 0C019D60 */ jal guMtxL2F +/* E2D784 802BAE54 00452821 */ addu $a1, $v0, $a1 +/* E2D788 802BAE58 3C013F80 */ lui $at, 0x3f80 +/* E2D78C 802BAE5C 4481B000 */ mtc1 $at, $f22 +/* E2D790 802BAE60 27B10058 */ addiu $s1, $sp, 0x58 +/* E2D794 802BAE64 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2D798 802BAE68 8E450004 */ lw $a1, 4($s2) +/* E2D79C 802BAE6C 4407A000 */ mfc1 $a3, $f20 +/* E2D7A0 802BAE70 4406B000 */ mfc1 $a2, $f22 +/* E2D7A4 802BAE74 0C019EC8 */ jal guRotateF +/* E2D7A8 802BAE78 0220202D */ daddu $a0, $s1, $zero +/* E2D7AC 802BAE7C 27B00098 */ addiu $s0, $sp, 0x98 +/* E2D7B0 802BAE80 E7B60010 */ swc1 $f22, 0x10($sp) +/* E2D7B4 802BAE84 8E45000C */ lw $a1, 0xc($s2) +/* E2D7B8 802BAE88 4406A000 */ mfc1 $a2, $f20 +/* E2D7BC 802BAE8C 4407A000 */ mfc1 $a3, $f20 +/* E2D7C0 802BAE90 0C019EC8 */ jal guRotateF +/* E2D7C4 802BAE94 0200202D */ daddu $a0, $s0, $zero +/* E2D7C8 802BAE98 0220202D */ daddu $a0, $s1, $zero +/* E2D7CC 802BAE9C 0200282D */ daddu $a1, $s0, $zero +/* E2D7D0 802BAEA0 0C019D80 */ jal guMtxCatF +/* E2D7D4 802BAEA4 0200302D */ daddu $a2, $s0, $zero +/* E2D7D8 802BAEA8 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2D7DC 802BAEAC 8E450008 */ lw $a1, 8($s2) +/* E2D7E0 802BAEB0 4406A000 */ mfc1 $a2, $f20 +/* E2D7E4 802BAEB4 4407B000 */ mfc1 $a3, $f22 +/* E2D7E8 802BAEB8 0C019EC8 */ jal guRotateF +/* E2D7EC 802BAEBC 0220202D */ daddu $a0, $s1, $zero +/* E2D7F0 802BAEC0 0200202D */ daddu $a0, $s0, $zero +/* E2D7F4 802BAEC4 0220282D */ daddu $a1, $s1, $zero +/* E2D7F8 802BAEC8 0C019D80 */ jal guMtxCatF +/* E2D7FC 802BAECC 0220302D */ daddu $a2, $s1, $zero +/* E2D800 802BAED0 0220202D */ daddu $a0, $s1, $zero +/* E2D804 802BAED4 27A50018 */ addiu $a1, $sp, 0x18 +/* E2D808 802BAED8 0C019D80 */ jal guMtxCatF +/* E2D80C 802BAEDC 00A0302D */ daddu $a2, $a1, $zero +/* E2D810 802BAEE0 27A40018 */ addiu $a0, $sp, 0x18 +/* E2D814 802BAEE4 26500030 */ addiu $s0, $s2, 0x30 +/* E2D818 802BAEE8 0C019D40 */ jal guMtxF2L +/* E2D81C 802BAEEC 0200282D */ daddu $a1, $s0, $zero +/* E2D820 802BAEF0 3C040001 */ lui $a0, 1 +/* E2D824 802BAEF4 34841630 */ ori $a0, $a0, 0x1630 +/* E2D828 802BAEF8 26520070 */ addiu $s2, $s2, 0x70 +/* E2D82C 802BAEFC 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* E2D830 802BAF00 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) +/* E2D834 802BAF04 3C03800A */ lui $v1, %hi(gDisplayContext) +/* E2D838 802BAF08 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) +/* E2D83C 802BAF0C 00021180 */ sll $v0, $v0, 6 +/* E2D840 802BAF10 00621821 */ addu $v1, $v1, $v0 +/* E2D844 802BAF14 00641821 */ addu $v1, $v1, $a0 +.L802BAF18: +/* E2D848 802BAF18 8E0A0000 */ lw $t2, ($s0) +/* E2D84C 802BAF1C 8E0B0004 */ lw $t3, 4($s0) +/* E2D850 802BAF20 8E0C0008 */ lw $t4, 8($s0) +/* E2D854 802BAF24 8E0D000C */ lw $t5, 0xc($s0) +/* E2D858 802BAF28 AC6A0000 */ sw $t2, ($v1) +/* E2D85C 802BAF2C AC6B0004 */ sw $t3, 4($v1) +/* E2D860 802BAF30 AC6C0008 */ sw $t4, 8($v1) +/* E2D864 802BAF34 AC6D000C */ sw $t5, 0xc($v1) +/* E2D868 802BAF38 26100010 */ addiu $s0, $s0, 0x10 +/* E2D86C 802BAF3C 1612FFF6 */ bne $s0, $s2, .L802BAF18 +/* E2D870 802BAF40 24630010 */ addiu $v1, $v1, 0x10 +/* E2D874 802BAF44 0260282D */ daddu $a1, $s3, $zero +/* E2D878 802BAF48 26730008 */ addiu $s3, $s3, 8 +/* E2D87C 802BAF4C 3C080001 */ lui $t0, 1 +/* E2D880 802BAF50 35081630 */ ori $t0, $t0, 0x1630 +/* E2D884 802BAF54 0260302D */ daddu $a2, $s3, $zero +/* E2D888 802BAF58 26730008 */ addiu $s3, $s3, 8 +/* E2D88C 802BAF5C 0260382D */ daddu $a3, $s3, $zero +/* E2D890 802BAF60 26730008 */ addiu $s3, $s3, 8 +/* E2D894 802BAF64 3C09D838 */ lui $t1, 0xd838 +/* E2D898 802BAF68 35290002 */ ori $t1, $t1, 2 +/* E2D89C 802BAF6C 3C048007 */ lui $a0, %hi(gMatrixListPos) +/* E2D8A0 802BAF70 248441F0 */ addiu $a0, $a0, %lo(gMatrixListPos) +/* E2D8A4 802BAF74 94820000 */ lhu $v0, ($a0) +/* E2D8A8 802BAF78 3C03DA38 */ lui $v1, 0xda38 +/* E2D8AC 802BAF7C ACA30000 */ sw $v1, ($a1) +/* E2D8B0 802BAF80 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* E2D8B4 802BAF84 AC33A66C */ sw $s3, %lo(gMasterGfxPos)($at) +/* E2D8B8 802BAF88 24430001 */ addiu $v1, $v0, 1 +/* E2D8BC 802BAF8C 3042FFFF */ andi $v0, $v0, 0xffff +/* E2D8C0 802BAF90 00021180 */ sll $v0, $v0, 6 +/* E2D8C4 802BAF94 A4830000 */ sh $v1, ($a0) +/* E2D8C8 802BAF98 3C03800A */ lui $v1, %hi(gDisplayContext) +/* E2D8CC 802BAF9C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) +/* E2D8D0 802BAFA0 00481021 */ addu $v0, $v0, $t0 +/* E2D8D4 802BAFA4 00621821 */ addu $v1, $v1, $v0 +/* E2D8D8 802BAFA8 ACA30004 */ sw $v1, 4($a1) +/* E2D8DC 802BAFAC 8E830044 */ lw $v1, 0x44($s4) +/* E2D8E0 802BAFB0 3C02DE00 */ lui $v0, 0xde00 +/* E2D8E4 802BAFB4 ACC20000 */ sw $v0, ($a2) +/* E2D8E8 802BAFB8 3C020A00 */ lui $v0, 0xa00 +/* E2D8EC 802BAFBC 24420D18 */ addiu $v0, $v0, 0xd18 +/* E2D8F0 802BAFC0 3042FFFF */ andi $v0, $v0, 0xffff +/* E2D8F4 802BAFC4 00621821 */ addu $v1, $v1, $v0 +/* E2D8F8 802BAFC8 24020040 */ addiu $v0, $zero, 0x40 +/* E2D8FC 802BAFCC ACC30004 */ sw $v1, 4($a2) +/* E2D900 802BAFD0 ACE90000 */ sw $t1, ($a3) +/* E2D904 802BAFD4 ACE20004 */ sw $v0, 4($a3) +/* E2D908 802BAFD8 8FBF00EC */ lw $ra, 0xec($sp) +/* E2D90C 802BAFDC 8FB400E8 */ lw $s4, 0xe8($sp) +/* E2D910 802BAFE0 8FB300E4 */ lw $s3, 0xe4($sp) +/* E2D914 802BAFE4 8FB200E0 */ lw $s2, 0xe0($sp) +/* E2D918 802BAFE8 8FB100DC */ lw $s1, 0xdc($sp) +/* E2D91C 802BAFEC 8FB000D8 */ lw $s0, 0xd8($sp) +/* E2D920 802BAFF0 D7B600F8 */ ldc1 $f22, 0xf8($sp) +/* E2D924 802BAFF4 D7B400F0 */ ldc1 $f20, 0xf0($sp) +/* E2D928 802BAFF8 03E00008 */ jr $ra +/* E2D92C 802BAFFC 27BD0100 */ addiu $sp, $sp, 0x100 diff --git a/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s b/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s new file mode 100644 index 0000000000..1b92010515 --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB000_E2D930 +/* E2D930 802BB000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E2D934 802BB004 AFB10014 */ sw $s1, 0x14($sp) +/* E2D938 802BB008 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E2D93C 802BB00C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E2D940 802BB010 AFBF0018 */ sw $ra, 0x18($sp) +/* E2D944 802BB014 AFB00010 */ sw $s0, 0x10($sp) +/* E2D948 802BB018 90820006 */ lbu $v0, 6($a0) +/* E2D94C 802BB01C 8C900040 */ lw $s0, 0x40($a0) +/* E2D950 802BB020 30420001 */ andi $v0, $v0, 1 +/* E2D954 802BB024 10400019 */ beqz $v0, .L802BB08C +/* E2D958 802BB028 00000000 */ nop +/* E2D95C 802BB02C 0C04D07A */ jal func_801341E8 +/* E2D960 802BB030 00000000 */ nop +/* E2D964 802BB034 14400015 */ bnez $v0, .L802BB08C +/* E2D968 802BB038 24020021 */ addiu $v0, $zero, 0x21 +/* E2D96C 802BB03C 822300B4 */ lb $v1, 0xb4($s1) +/* E2D970 802BB040 14620005 */ bne $v1, $v0, .L802BB058 +/* E2D974 802BB044 2402001D */ addiu $v0, $zero, 0x1d +/* E2D978 802BB048 8E220004 */ lw $v0, 4($s1) +/* E2D97C 802BB04C 34420004 */ ori $v0, $v0, 4 +/* E2D980 802BB050 080AEC23 */ j .L802BB08C +/* E2D984 802BB054 AE220004 */ sw $v0, 4($s1) +.L802BB058: +/* E2D988 802BB058 1062000C */ beq $v1, $v0, .L802BB08C +/* E2D98C 802BB05C 00000000 */ nop +/* E2D990 802BB060 9604002C */ lhu $a0, 0x2c($s0) +/* E2D994 802BB064 96020028 */ lhu $v0, 0x28($s0) +/* E2D998 802BB068 9603002A */ lhu $v1, 0x2a($s0) +/* E2D99C 802BB06C 3C01802C */ lui $at, %hi(D_802BCE32) +/* E2D9A0 802BB070 A424CE32 */ sh $a0, %lo(D_802BCE32)($at) +/* E2D9A4 802BB074 3C01802C */ lui $at, %hi(D_802BCE34) +/* E2D9A8 802BB078 A422CE34 */ sh $v0, %lo(D_802BCE34)($at) +/* E2D9AC 802BB07C 3C01802C */ lui $at, %hi(D_802BCE30) +/* E2D9B0 802BB080 A423CE30 */ sh $v1, %lo(D_802BCE30)($at) +/* E2D9B4 802BB084 0C039769 */ jal set_action_state +/* E2D9B8 802BB088 2404001D */ addiu $a0, $zero, 0x1d +.L802BB08C: +/* E2D9BC 802BB08C 8FBF0018 */ lw $ra, 0x18($sp) +/* E2D9C0 802BB090 8FB10014 */ lw $s1, 0x14($sp) +/* E2D9C4 802BB094 8FB00010 */ lw $s0, 0x10($sp) +/* E2D9C8 802BB098 03E00008 */ jr $ra +/* E2D9CC 802BB09C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E2D730/func_802BB0A0_E2D9D0.s b/asm/nonmatchings/code_E2D730/func_802BB0A0_E2D9D0.s new file mode 100644 index 0000000000..74b3d30386 --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB0A0_E2D9D0.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB0A0_E2D9D0 +/* E2D9D0 802BB0A0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E2D9D4 802BB0A4 AFB10014 */ sw $s1, 0x14($sp) +/* E2D9D8 802BB0A8 0080882D */ daddu $s1, $a0, $zero +/* E2D9DC 802BB0AC AFBF001C */ sw $ra, 0x1c($sp) +/* E2D9E0 802BB0B0 AFB20018 */ sw $s2, 0x18($sp) +/* E2D9E4 802BB0B4 AFB00010 */ sw $s0, 0x10($sp) +/* E2D9E8 802BB0B8 0C0AEC00 */ jal func_802BB000_E2D930 +/* E2D9EC 802BB0BC 8E300040 */ lw $s0, 0x40($s1) +/* E2D9F0 802BB0C0 82030002 */ lb $v1, 2($s0) +/* E2D9F4 802BB0C4 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* E2D9F8 802BB0C8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* E2D9FC 802BB0CC 10600005 */ beqz $v1, .L802BB0E4 +/* E2DA00 802BB0D0 24020001 */ addiu $v0, $zero, 1 +/* E2DA04 802BB0D4 1062000A */ beq $v1, $v0, .L802BB100 +/* E2DA08 802BB0D8 00000000 */ nop +/* E2DA0C 802BB0DC 080AEC67 */ j .L802BB19C +/* E2DA10 802BB0E0 00000000 */ nop +.L802BB0E4: +/* E2DA14 802BB0E4 24020001 */ addiu $v0, $zero, 1 +/* E2DA18 802BB0E8 AE000018 */ sw $zero, 0x18($s0) +/* E2DA1C 802BB0EC A6000000 */ sh $zero, ($s0) +/* E2DA20 802BB0F0 A2020002 */ sb $v0, 2($s0) +/* E2DA24 802BB0F4 AE000004 */ sw $zero, 4($s0) +/* E2DA28 802BB0F8 080AEC67 */ j .L802BB19C +/* E2DA2C 802BB0FC AE00000C */ sw $zero, 0xc($s0) +.L802BB100: +/* E2DA30 802BB100 92220006 */ lbu $v0, 6($s1) +/* E2DA34 802BB104 30420001 */ andi $v0, $v0, 1 +/* E2DA38 802BB108 14400017 */ bnez $v0, .L802BB168 +/* E2DA3C 802BB10C 00000000 */ nop +/* E2DA40 802BB110 C6000014 */ lwc1 $f0, 0x14($s0) +/* E2DA44 802BB114 3C01802C */ lui $at, %hi(D_802BCDC0) +/* E2DA48 802BB118 D422CDC0 */ ldc1 $f2, %lo(D_802BCDC0)($at) +/* E2DA4C 802BB11C 46000021 */ cvt.d.s $f0, $f0 +/* E2DA50 802BB120 46220000 */ add.d $f0, $f0, $f2 +/* E2DA54 802BB124 3C014000 */ lui $at, 0x4000 +/* E2DA58 802BB128 44812800 */ mtc1 $at, $f5 +/* E2DA5C 802BB12C 44802000 */ mtc1 $zero, $f4 +/* E2DA60 802BB130 46200020 */ cvt.s.d $f0, $f0 +/* E2DA64 802BB134 460000A1 */ cvt.d.s $f2, $f0 +/* E2DA68 802BB138 4622203C */ c.lt.d $f4, $f2 +/* E2DA6C 802BB13C 00000000 */ nop +/* E2DA70 802BB140 45000016 */ bc1f .L802BB19C +/* E2DA74 802BB144 E6000014 */ swc1 $f0, 0x14($s0) +/* E2DA78 802BB148 45000014 */ bc1f .L802BB19C +/* E2DA7C 802BB14C 00000000 */ nop +/* E2DA80 802BB150 3C01802C */ lui $at, %hi(D_802BCDC8) +/* E2DA84 802BB154 D420CDC8 */ ldc1 $f0, %lo(D_802BCDC8)($at) +/* E2DA88 802BB158 46201001 */ sub.d $f0, $f2, $f0 +/* E2DA8C 802BB15C 46200020 */ cvt.s.d $f0, $f0 +/* E2DA90 802BB160 080AEC67 */ j .L802BB19C +/* E2DA94 802BB164 E6000014 */ swc1 $f0, 0x14($s0) +.L802BB168: +/* E2DA98 802BB168 C6000014 */ lwc1 $f0, 0x14($s0) +/* E2DA9C 802BB16C 3C01802C */ lui $at, %hi(D_802BCDD0) +/* E2DAA0 802BB170 D422CDD0 */ ldc1 $f2, %lo(D_802BCDD0)($at) +/* E2DAA4 802BB174 46000021 */ cvt.d.s $f0, $f0 +/* E2DAA8 802BB178 46220000 */ add.d $f0, $f0, $f2 +/* E2DAAC 802BB17C 3C014160 */ lui $at, 0x4160 +/* E2DAB0 802BB180 44811000 */ mtc1 $at, $f2 +/* E2DAB4 802BB184 46200020 */ cvt.s.d $f0, $f0 +/* E2DAB8 802BB188 4600103C */ c.lt.s $f2, $f0 +/* E2DABC 802BB18C 00000000 */ nop +/* E2DAC0 802BB190 45000002 */ bc1f .L802BB19C +/* E2DAC4 802BB194 E6000014 */ swc1 $f0, 0x14($s0) +/* E2DAC8 802BB198 E6020014 */ swc1 $f2, 0x14($s0) +.L802BB19C: +/* E2DACC 802BB19C C6000008 */ lwc1 $f0, 8($s0) +/* E2DAD0 802BB1A0 C60C0014 */ lwc1 $f12, 0x14($s0) +/* E2DAD4 802BB1A4 0C00A6C9 */ jal clamp_angle +/* E2DAD8 802BB1A8 460C0300 */ add.s $f12, $f0, $f12 +/* E2DADC 802BB1AC E6000008 */ swc1 $f0, 8($s0) +/* E2DAE0 802BB1B0 92220006 */ lbu $v0, 6($s1) +/* E2DAE4 802BB1B4 30420001 */ andi $v0, $v0, 1 +/* E2DAE8 802BB1B8 14400015 */ bnez $v0, .L802BB210 +/* E2DAEC 802BB1BC 3C030001 */ lui $v1, 1 +/* E2DAF0 802BB1C0 8E420004 */ lw $v0, 4($s2) +/* E2DAF4 802BB1C4 00431024 */ and $v0, $v0, $v1 +/* E2DAF8 802BB1C8 10400011 */ beqz $v0, .L802BB210 +/* E2DAFC 802BB1CC 00000000 */ nop +/* E2DB00 802BB1D0 C62C0048 */ lwc1 $f12, 0x48($s1) +/* E2DB04 802BB1D4 C62E0050 */ lwc1 $f14, 0x50($s1) +/* E2DB08 802BB1D8 8E460028 */ lw $a2, 0x28($s2) +/* E2DB0C 802BB1DC 0C00A7B5 */ jal dist2D +/* E2DB10 802BB1E0 8E470030 */ lw $a3, 0x30($s2) +/* E2DB14 802BB1E4 46000021 */ cvt.d.s $f0, $f0 +/* E2DB18 802BB1E8 3C01404E */ lui $at, 0x404e +/* E2DB1C 802BB1EC 44811800 */ mtc1 $at, $f3 +/* E2DB20 802BB1F0 44801000 */ mtc1 $zero, $f2 +/* E2DB24 802BB1F4 46200005 */ abs.d $f0, $f0 +/* E2DB28 802BB1F8 4622003C */ c.lt.d $f0, $f2 +/* E2DB2C 802BB1FC 00000000 */ nop +/* E2DB30 802BB200 45000003 */ bc1f .L802BB210 +/* E2DB34 802BB204 00000000 */ nop +/* E2DB38 802BB208 0C043F5A */ jal func_8010FD68 +/* E2DB3C 802BB20C 0220202D */ daddu $a0, $s1, $zero +.L802BB210: +/* E2DB40 802BB210 8FBF001C */ lw $ra, 0x1c($sp) +/* E2DB44 802BB214 8FB20018 */ lw $s2, 0x18($sp) +/* E2DB48 802BB218 8FB10014 */ lw $s1, 0x14($sp) +/* E2DB4C 802BB21C 8FB00010 */ lw $s0, 0x10($sp) +/* E2DB50 802BB220 03E00008 */ jr $ra +/* E2DB54 802BB224 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E2D730/func_802BB228_E2DB58.s b/asm/nonmatchings/code_E2D730/func_802BB228_E2DB58.s new file mode 100644 index 0000000000..25dc089495 --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB228_E2DB58.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB228_E2DB58 +/* E2DB58 802BB228 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2DB5C 802BB22C AFBF0014 */ sw $ra, 0x14($sp) +/* E2DB60 802BB230 AFB00010 */ sw $s0, 0x10($sp) +/* E2DB64 802BB234 0C0AEC00 */ jal func_802BB000_E2D930 +/* E2DB68 802BB238 8C900040 */ lw $s0, 0x40($a0) +/* E2DB6C 802BB23C C6000014 */ lwc1 $f0, 0x14($s0) +/* E2DB70 802BB240 3C014000 */ lui $at, 0x4000 +/* E2DB74 802BB244 44811800 */ mtc1 $at, $f3 +/* E2DB78 802BB248 44801000 */ mtc1 $zero, $f2 +/* E2DB7C 802BB24C 46000021 */ cvt.d.s $f0, $f0 +/* E2DB80 802BB250 46220000 */ add.d $f0, $f0, $f2 +/* E2DB84 802BB254 3C014220 */ lui $at, 0x4220 +/* E2DB88 802BB258 44811000 */ mtc1 $at, $f2 +/* E2DB8C 802BB25C 46200020 */ cvt.s.d $f0, $f0 +/* E2DB90 802BB260 4600103C */ c.lt.s $f2, $f0 +/* E2DB94 802BB264 00000000 */ nop +/* E2DB98 802BB268 45000002 */ bc1f .L802BB274 +/* E2DB9C 802BB26C E6000014 */ swc1 $f0, 0x14($s0) +/* E2DBA0 802BB270 E6020014 */ swc1 $f2, 0x14($s0) +.L802BB274: +/* E2DBA4 802BB274 C6000008 */ lwc1 $f0, 8($s0) +/* E2DBA8 802BB278 C60C0014 */ lwc1 $f12, 0x14($s0) +/* E2DBAC 802BB27C 0C00A6C9 */ jal clamp_angle +/* E2DBB0 802BB280 460C0300 */ add.s $f12, $f0, $f12 +/* E2DBB4 802BB284 E6000008 */ swc1 $f0, 8($s0) +/* E2DBB8 802BB288 8FBF0014 */ lw $ra, 0x14($sp) +/* E2DBBC 802BB28C 8FB00010 */ lw $s0, 0x10($sp) +/* E2DBC0 802BB290 03E00008 */ jr $ra +/* E2DBC4 802BB294 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2D730/func_802BB298_E2DBC8.s b/asm/nonmatchings/code_E2D730/func_802BB298_E2DBC8.s new file mode 100644 index 0000000000..3b8251321f --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB298_E2DBC8.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB298_E2DBC8 +/* E2DBC8 802BB298 3C028016 */ lui $v0, %hi(D_8015C7D0) +/* E2DBCC 802BB29C 2442C7D0 */ addiu $v0, $v0, %lo(D_8015C7D0) +/* E2DBD0 802BB2A0 8C460000 */ lw $a2, ($v0) +/* E2DBD4 802BB2A4 8C430004 */ lw $v1, 4($v0) +/* E2DBD8 802BB2A8 8C450008 */ lw $a1, 8($v0) +/* E2DBDC 802BB2AC 8C870040 */ lw $a3, 0x40($a0) +/* E2DBE0 802BB2B0 00C31025 */ or $v0, $a2, $v1 +/* E2DBE4 802BB2B4 00451025 */ or $v0, $v0, $a1 +/* E2DBE8 802BB2B8 1440000E */ bnez $v0, .L802BB2F4 +/* E2DBEC 802BB2BC 00000000 */ nop +/* E2DBF0 802BB2C0 C482004C */ lwc1 $f2, 0x4c($a0) +/* E2DBF4 802BB2C4 3C0142C8 */ lui $at, 0x42c8 +/* E2DBF8 802BB2C8 44810000 */ mtc1 $at, $f0 +/* E2DBFC 802BB2CC 00000000 */ nop +/* E2DC00 802BB2D0 46001080 */ add.s $f2, $f2, $f0 +/* E2DC04 802BB2D4 C4800048 */ lwc1 $f0, 0x48($a0) +/* E2DC08 802BB2D8 C4840050 */ lwc1 $f4, 0x50($a0) +/* E2DC0C 802BB2DC 4600018D */ trunc.w.s $f6, $f0 +/* E2DC10 802BB2E0 44063000 */ mfc1 $a2, $f6 +/* E2DC14 802BB2E4 4600218D */ trunc.w.s $f6, $f4 +/* E2DC18 802BB2E8 44053000 */ mfc1 $a1, $f6 +/* E2DC1C 802BB2EC 4600118D */ trunc.w.s $f6, $f2 +/* E2DC20 802BB2F0 44033000 */ mfc1 $v1, $f6 +.L802BB2F4: +/* E2DC24 802BB2F4 3C02802C */ lui $v0, %hi(func_802BAE00_E2D730) +/* E2DC28 802BB2F8 2442AE00 */ addiu $v0, $v0, %lo(func_802BAE00_E2D730) +/* E2DC2C 802BB2FC A4E60028 */ sh $a2, 0x28($a3) +/* E2DC30 802BB300 A4E3002A */ sh $v1, 0x2a($a3) +/* E2DC34 802BB304 A4E5002C */ sh $a1, 0x2c($a3) +/* E2DC38 802BB308 A0E00002 */ sb $zero, 2($a3) +/* E2DC3C 802BB30C 03E00008 */ jr $ra +/* E2DC40 802BB310 AC82003C */ sw $v0, 0x3c($a0) diff --git a/asm/nonmatchings/code_E2D730/func_802BB314_E2DC44.s b/asm/nonmatchings/code_E2D730/func_802BB314_E2DC44.s new file mode 100644 index 0000000000..560c85247c --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB314_E2DC44.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB314_E2DC44 +/* E2DC44 802BB314 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E2DC48 802BB318 0080102D */ daddu $v0, $a0, $zero +/* E2DC4C 802BB31C 3C048000 */ lui $a0, 0x8000 +/* E2DC50 802BB320 AFBF0018 */ sw $ra, 0x18($sp) +/* E2DC54 802BB324 C4400050 */ lwc1 $f0, 0x50($v0) +/* E2DC58 802BB328 3484006A */ ori $a0, $a0, 0x6a +/* E2DC5C 802BB32C E7A00010 */ swc1 $f0, 0x10($sp) +/* E2DC60 802BB330 8C460048 */ lw $a2, 0x48($v0) +/* E2DC64 802BB334 8C47004C */ lw $a3, 0x4c($v0) +/* E2DC68 802BB338 0C052757 */ jal play_sound_at_position +/* E2DC6C 802BB33C 0000282D */ daddu $a1, $zero, $zero +/* E2DC70 802BB340 8FBF0018 */ lw $ra, 0x18($sp) +/* E2DC74 802BB344 03E00008 */ jr $ra +/* E2DC78 802BB348 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E2D730/func_802BB34C_E2DC7C.s b/asm/nonmatchings/code_E2D730/func_802BB34C_E2DC7C.s new file mode 100644 index 0000000000..62649074c5 --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB34C_E2DC7C.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB34C_E2DC7C +/* E2DC7C 802BB34C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2DC80 802BB350 AFBF0010 */ sw $ra, 0x10($sp) +/* E2DC84 802BB354 0C05272D */ jal play_sound +/* E2DC88 802BB358 24040791 */ addiu $a0, $zero, 0x791 +/* E2DC8C 802BB35C 24040391 */ addiu $a0, $zero, 0x391 +/* E2DC90 802BB360 0C05269B */ jal func_80149A6C +/* E2DC94 802BB364 24050001 */ addiu $a1, $zero, 1 +/* E2DC98 802BB368 8FBF0010 */ lw $ra, 0x10($sp) +/* E2DC9C 802BB36C 03E00008 */ jr $ra +/* E2DCA0 802BB370 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2D730/func_802BB374_E2DCA4.s b/asm/nonmatchings/code_E2D730/func_802BB374_E2DCA4.s new file mode 100644 index 0000000000..8acb7fe8bc --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB374_E2DCA4.s @@ -0,0 +1,185 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB374_E2DCA4 +/* E2DCA4 802BB374 27BDFF30 */ addiu $sp, $sp, -0xd0 +/* E2DCA8 802BB378 AFBF00B8 */ sw $ra, 0xb8($sp) +/* E2DCAC 802BB37C AFB500B4 */ sw $s5, 0xb4($sp) +/* E2DCB0 802BB380 AFB400B0 */ sw $s4, 0xb0($sp) +/* E2DCB4 802BB384 AFB300AC */ sw $s3, 0xac($sp) +/* E2DCB8 802BB388 AFB200A8 */ sw $s2, 0xa8($sp) +/* E2DCBC 802BB38C AFB100A4 */ sw $s1, 0xa4($sp) +/* E2DCC0 802BB390 AFB000A0 */ sw $s0, 0xa0($sp) +/* E2DCC4 802BB394 F7B600C8 */ sdc1 $f22, 0xc8($sp) +/* E2DCC8 802BB398 F7B400C0 */ sdc1 $f20, 0xc0($sp) +/* E2DCCC 802BB39C 0C04417A */ jal get_entity_by_index +/* E2DCD0 802BB3A0 3C140001 */ lui $s4, 1 +/* E2DCD4 802BB3A4 0040902D */ daddu $s2, $v0, $zero +/* E2DCD8 802BB3A8 27B10058 */ addiu $s1, $sp, 0x58 +/* E2DCDC 802BB3AC 8E530040 */ lw $s3, 0x40($s2) +/* E2DCE0 802BB3B0 4480A000 */ mtc1 $zero, $f20 +/* E2DCE4 802BB3B4 3C013F80 */ lui $at, 0x3f80 +/* E2DCE8 802BB3B8 4481B000 */ mtc1 $at, $f22 +/* E2DCEC 802BB3BC 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* E2DCF0 802BB3C0 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) +/* E2DCF4 802BB3C4 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2DCF8 802BB3C8 8E450064 */ lw $a1, 0x64($s2) +/* E2DCFC 802BB3CC 4406A000 */ mfc1 $a2, $f20 +/* E2DD00 802BB3D0 4407B000 */ mfc1 $a3, $f22 +/* E2DD04 802BB3D4 8EB00000 */ lw $s0, ($s5) +/* E2DD08 802BB3D8 0C019EC8 */ jal guRotateF +/* E2DD0C 802BB3DC 0220202D */ daddu $a0, $s1, $zero +/* E2DD10 802BB3E0 8E450054 */ lw $a1, 0x54($s2) +/* E2DD14 802BB3E4 27A40018 */ addiu $a0, $sp, 0x18 +/* E2DD18 802BB3E8 00A0302D */ daddu $a2, $a1, $zero +/* E2DD1C 802BB3EC 0C019DF0 */ jal guScaleF +/* E2DD20 802BB3F0 00A0382D */ daddu $a3, $a1, $zero +/* E2DD24 802BB3F4 27A40018 */ addiu $a0, $sp, 0x18 +/* E2DD28 802BB3F8 0220282D */ daddu $a1, $s1, $zero +/* E2DD2C 802BB3FC 0C019D80 */ jal guMtxCatF +/* E2DD30 802BB400 0220302D */ daddu $a2, $s1, $zero +/* E2DD34 802BB404 27A40018 */ addiu $a0, $sp, 0x18 +/* E2DD38 802BB408 3C050A00 */ lui $a1, 0xa00 +/* E2DD3C 802BB40C 24A51098 */ addiu $a1, $a1, 0x1098 +/* E2DD40 802BB410 8E420044 */ lw $v0, 0x44($s2) +/* E2DD44 802BB414 30A5FFFF */ andi $a1, $a1, 0xffff +/* E2DD48 802BB418 0C019D60 */ jal guMtxL2F +/* E2DD4C 802BB41C 00452821 */ addu $a1, $v0, $a1 +/* E2DD50 802BB420 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E2DD54 802BB424 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) +/* E2DD58 802BB428 3C014334 */ lui $at, 0x4334 +/* E2DD5C 802BB42C 44810000 */ mtc1 $at, $f0 +/* E2DD60 802BB430 00000000 */ nop +/* E2DD64 802BB434 46006300 */ add.s $f12, $f12, $f0 +/* E2DD68 802BB438 3C0140C9 */ lui $at, 0x40c9 +/* E2DD6C 802BB43C 34210FD0 */ ori $at, $at, 0xfd0 +/* E2DD70 802BB440 44810000 */ mtc1 $at, $f0 +/* E2DD74 802BB444 00000000 */ nop +/* E2DD78 802BB448 46006302 */ mul.s $f12, $f12, $f0 +/* E2DD7C 802BB44C 00000000 */ nop +/* E2DD80 802BB450 27A50098 */ addiu $a1, $sp, 0x98 +/* E2DD84 802BB454 3C0143B4 */ lui $at, 0x43b4 +/* E2DD88 802BB458 44810000 */ mtc1 $at, $f0 +/* E2DD8C 802BB45C 27A6009C */ addiu $a2, $sp, 0x9c +/* E2DD90 802BB460 0C00A82D */ jal sin_cos_rad +/* E2DD94 802BB464 46006303 */ div.s $f12, $f12, $f0 +/* E2DD98 802BB468 C7A2004C */ lwc1 $f2, 0x4c($sp) +/* E2DD9C 802BB46C 3C014120 */ lui $at, 0x4120 +/* E2DDA0 802BB470 44812000 */ mtc1 $at, $f4 +/* E2DDA4 802BB474 0220202D */ daddu $a0, $s1, $zero +/* E2DDA8 802BB478 46041080 */ add.s $f2, $f2, $f4 +/* E2DDAC 802BB47C C7A00050 */ lwc1 $f0, 0x50($sp) +/* E2DDB0 802BB480 27A50018 */ addiu $a1, $sp, 0x18 +/* E2DDB4 802BB484 46040001 */ sub.s $f0, $f0, $f4 +/* E2DDB8 802BB488 00A0302D */ daddu $a2, $a1, $zero +/* E2DDBC 802BB48C E7A2004C */ swc1 $f2, 0x4c($sp) +/* E2DDC0 802BB490 0C019D80 */ jal guMtxCatF +/* E2DDC4 802BB494 E7A00050 */ swc1 $f0, 0x50($sp) +/* E2DDC8 802BB498 E7B60010 */ swc1 $f22, 0x10($sp) +/* E2DDCC 802BB49C 8E450068 */ lw $a1, 0x68($s2) +/* E2DDD0 802BB4A0 4406A000 */ mfc1 $a2, $f20 +/* E2DDD4 802BB4A4 4407A000 */ mfc1 $a3, $f20 +/* E2DDD8 802BB4A8 0C019EC8 */ jal guRotateF +/* E2DDDC 802BB4AC 0220202D */ daddu $a0, $s1, $zero +/* E2DDE0 802BB4B0 27A40018 */ addiu $a0, $sp, 0x18 +/* E2DDE4 802BB4B4 0220282D */ daddu $a1, $s1, $zero +/* E2DDE8 802BB4B8 0C019D80 */ jal guMtxCatF +/* E2DDEC 802BB4BC 0080302D */ daddu $a2, $a0, $zero +/* E2DDF0 802BB4C0 E7B40010 */ swc1 $f20, 0x10($sp) +/* E2DDF4 802BB4C4 8E650008 */ lw $a1, 8($s3) +/* E2DDF8 802BB4C8 4406A000 */ mfc1 $a2, $f20 +/* E2DDFC 802BB4CC 4407B000 */ mfc1 $a3, $f22 +/* E2DE00 802BB4D0 0C019EC8 */ jal guRotateF +/* E2DE04 802BB4D4 0220202D */ daddu $a0, $s1, $zero +/* E2DE08 802BB4D8 27A40018 */ addiu $a0, $sp, 0x18 +/* E2DE0C 802BB4DC 0220282D */ daddu $a1, $s1, $zero +/* E2DE10 802BB4E0 0C019D80 */ jal guMtxCatF +/* E2DE14 802BB4E4 0080302D */ daddu $a2, $a0, $zero +/* E2DE18 802BB4E8 C7A00098 */ lwc1 $f0, 0x98($sp) +/* E2DE1C 802BB4EC 3C014180 */ lui $at, 0x4180 +/* E2DE20 802BB4F0 44812000 */ mtc1 $at, $f4 +/* E2DE24 802BB4F4 00000000 */ nop +/* E2DE28 802BB4F8 46040002 */ mul.s $f0, $f0, $f4 +/* E2DE2C 802BB4FC 00000000 */ nop +/* E2DE30 802BB500 C7A2009C */ lwc1 $f2, 0x9c($sp) +/* E2DE34 802BB504 46041082 */ mul.s $f2, $f2, $f4 +/* E2DE38 802BB508 00000000 */ nop +/* E2DE3C 802BB50C C6440048 */ lwc1 $f4, 0x48($s2) +/* E2DE40 802BB510 46002100 */ add.s $f4, $f4, $f0 +/* E2DE44 802BB514 C6400050 */ lwc1 $f0, 0x50($s2) +/* E2DE48 802BB518 36941630 */ ori $s4, $s4, 0x1630 +/* E2DE4C 802BB51C 46020001 */ sub.s $f0, $f0, $f2 +/* E2DE50 802BB520 8E46004C */ lw $a2, 0x4c($s2) +/* E2DE54 802BB524 44052000 */ mfc1 $a1, $f4 +/* E2DE58 802BB528 44070000 */ mfc1 $a3, $f0 +/* E2DE5C 802BB52C 0C019E40 */ jal guTranslateF +/* E2DE60 802BB530 0220202D */ daddu $a0, $s1, $zero +/* E2DE64 802BB534 27A40018 */ addiu $a0, $sp, 0x18 +/* E2DE68 802BB538 0220282D */ daddu $a1, $s1, $zero +/* E2DE6C 802BB53C 0C019D80 */ jal guMtxCatF +/* E2DE70 802BB540 0080302D */ daddu $a2, $a0, $zero +/* E2DE74 802BB544 0200182D */ daddu $v1, $s0, $zero +/* E2DE78 802BB548 26100008 */ addiu $s0, $s0, 8 +/* E2DE7C 802BB54C 3C05FCFF */ lui $a1, 0xfcff +/* E2DE80 802BB550 34A5B3FF */ ori $a1, $a1, 0xb3ff +/* E2DE84 802BB554 3C02FF2C */ lui $v0, 0xff2c +/* E2DE88 802BB558 3442FE7F */ ori $v0, $v0, 0xfe7f +/* E2DE8C 802BB55C 0200302D */ daddu $a2, $s0, $zero +/* E2DE90 802BB560 26100008 */ addiu $s0, $s0, 8 +/* E2DE94 802BB564 27A40018 */ addiu $a0, $sp, 0x18 +/* E2DE98 802BB568 AC620004 */ sw $v0, 4($v1) +/* E2DE9C 802BB56C 3C02FA00 */ lui $v0, 0xfa00 +/* E2DEA0 802BB570 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* E2DEA4 802BB574 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* E2DEA8 802BB578 3C13800A */ lui $s3, %hi(gDisplayContext) +/* E2DEAC 802BB57C 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) +/* E2DEB0 802BB580 AC650000 */ sw $a1, ($v1) +/* E2DEB4 802BB584 ACC20000 */ sw $v0, ($a2) +/* E2DEB8 802BB588 96250000 */ lhu $a1, ($s1) +/* E2DEBC 802BB58C 8E620000 */ lw $v0, ($s3) +/* E2DEC0 802BB590 9243000B */ lbu $v1, 0xb($s2) +/* E2DEC4 802BB594 00052980 */ sll $a1, $a1, 6 +/* E2DEC8 802BB598 00B42821 */ addu $a1, $a1, $s4 +/* E2DECC 802BB59C 00452821 */ addu $a1, $v0, $a1 +/* E2DED0 802BB5A0 0C019D40 */ jal guMtxF2L +/* E2DED4 802BB5A4 ACC30004 */ sw $v1, 4($a2) +/* E2DED8 802BB5A8 0200202D */ daddu $a0, $s0, $zero +/* E2DEDC 802BB5AC 26100008 */ addiu $s0, $s0, 8 +/* E2DEE0 802BB5B0 3C03DA38 */ lui $v1, 0xda38 +/* E2DEE4 802BB5B4 34630002 */ ori $v1, $v1, 2 +/* E2DEE8 802BB5B8 0200282D */ daddu $a1, $s0, $zero +/* E2DEEC 802BB5BC 26100008 */ addiu $s0, $s0, 8 +/* E2DEF0 802BB5C0 0200302D */ daddu $a2, $s0, $zero +/* E2DEF4 802BB5C4 26100008 */ addiu $s0, $s0, 8 +/* E2DEF8 802BB5C8 3C07D838 */ lui $a3, 0xd838 +/* E2DEFC 802BB5CC 96220000 */ lhu $v0, ($s1) +/* E2DF00 802BB5D0 34E70002 */ ori $a3, $a3, 2 +/* E2DF04 802BB5D4 AC830000 */ sw $v1, ($a0) +/* E2DF08 802BB5D8 AEB00000 */ sw $s0, ($s5) +/* E2DF0C 802BB5DC 24430001 */ addiu $v1, $v0, 1 +/* E2DF10 802BB5E0 3042FFFF */ andi $v0, $v0, 0xffff +/* E2DF14 802BB5E4 00021180 */ sll $v0, $v0, 6 +/* E2DF18 802BB5E8 A6230000 */ sh $v1, ($s1) +/* E2DF1C 802BB5EC 8E630000 */ lw $v1, ($s3) +/* E2DF20 802BB5F0 00541021 */ addu $v0, $v0, $s4 +/* E2DF24 802BB5F4 00621821 */ addu $v1, $v1, $v0 +/* E2DF28 802BB5F8 3C02DE00 */ lui $v0, 0xde00 +/* E2DF2C 802BB5FC AC830004 */ sw $v1, 4($a0) +/* E2DF30 802BB600 ACA20000 */ sw $v0, ($a1) +/* E2DF34 802BB604 3C020A00 */ lui $v0, 0xa00 +/* E2DF38 802BB608 244213B8 */ addiu $v0, $v0, 0x13b8 +/* E2DF3C 802BB60C ACA20004 */ sw $v0, 4($a1) +/* E2DF40 802BB610 24020040 */ addiu $v0, $zero, 0x40 +/* E2DF44 802BB614 ACC70000 */ sw $a3, ($a2) +/* E2DF48 802BB618 ACC20004 */ sw $v0, 4($a2) +/* E2DF4C 802BB61C 8FBF00B8 */ lw $ra, 0xb8($sp) +/* E2DF50 802BB620 8FB500B4 */ lw $s5, 0xb4($sp) +/* E2DF54 802BB624 8FB400B0 */ lw $s4, 0xb0($sp) +/* E2DF58 802BB628 8FB300AC */ lw $s3, 0xac($sp) +/* E2DF5C 802BB62C 8FB200A8 */ lw $s2, 0xa8($sp) +/* E2DF60 802BB630 8FB100A4 */ lw $s1, 0xa4($sp) +/* E2DF64 802BB634 8FB000A0 */ lw $s0, 0xa0($sp) +/* E2DF68 802BB638 D7B600C8 */ ldc1 $f22, 0xc8($sp) +/* E2DF6C 802BB63C D7B400C0 */ ldc1 $f20, 0xc0($sp) +/* E2DF70 802BB640 03E00008 */ jr $ra +/* E2DF74 802BB644 27BD00D0 */ addiu $sp, $sp, 0xd0 diff --git a/asm/nonmatchings/code_E2D730/func_802BB648_E2DF78.s b/asm/nonmatchings/code_E2D730/func_802BB648_E2DF78.s new file mode 100644 index 0000000000..2f0db8afc3 --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB648_E2DF78.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB648_E2DF78 +/* E2DF78 802BB648 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) +/* E2DF7C 802BB64C 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) +/* E2DF80 802BB650 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2DF84 802BB654 AFB00010 */ sw $s0, 0x10($sp) +/* E2DF88 802BB658 0080802D */ daddu $s0, $a0, $zero +/* E2DF8C 802BB65C AFBF0014 */ sw $ra, 0x14($sp) +/* E2DF90 802BB660 8E050040 */ lw $a1, 0x40($s0) +/* E2DF94 802BB664 30420010 */ andi $v0, $v0, 0x10 +/* E2DF98 802BB668 10400019 */ beqz $v0, .L802BB6D0 +/* E2DF9C 802BB66C 00000000 */ nop +/* E2DFA0 802BB670 92020006 */ lbu $v0, 6($s0) +/* E2DFA4 802BB674 30420048 */ andi $v0, $v0, 0x48 +/* E2DFA8 802BB678 10400015 */ beqz $v0, .L802BB6D0 +/* E2DFAC 802BB67C 00000000 */ nop +/* E2DFB0 802BB680 8E030000 */ lw $v1, ($s0) +/* E2DFB4 802BB684 30621000 */ andi $v0, $v1, 0x1000 +/* E2DFB8 802BB688 10400011 */ beqz $v0, .L802BB6D0 +/* E2DFBC 802BB68C 2402EFFF */ addiu $v0, $zero, -0x1001 +/* E2DFC0 802BB690 00621024 */ and $v0, $v1, $v0 +/* E2DFC4 802BB694 AE020000 */ sw $v0, ($s0) +/* E2DFC8 802BB698 0C04417A */ jal get_entity_by_index +/* E2DFCC 802BB69C 94A40004 */ lhu $a0, 4($a1) +/* E2DFD0 802BB6A0 8C450040 */ lw $a1, 0x40($v0) +/* E2DFD4 802BB6A4 94A20000 */ lhu $v0, ($a1) +/* E2DFD8 802BB6A8 14400009 */ bnez $v0, .L802BB6D0 +/* E2DFDC 802BB6AC 0200202D */ daddu $a0, $s0, $zero +/* E2DFE0 802BB6B0 24020001 */ addiu $v0, $zero, 1 +/* E2DFE4 802BB6B4 0C043F5A */ jal func_8010FD68 +/* E2DFE8 802BB6B8 A4A20000 */ sh $v0, ($a1) +/* E2DFEC 802BB6BC 86040014 */ lh $a0, 0x14($s0) +/* E2DFF0 802BB6C0 3C050000 */ lui $a1, 0 +/* E2DFF4 802BB6C4 24A500F4 */ addiu $a1, $a1, 0xf4 +/* E2DFF8 802BB6C8 0C048052 */ jal play_model_animation +/* E2DFFC 802BB6CC 00000000 */ nop +.L802BB6D0: +/* E2E000 802BB6D0 8FBF0014 */ lw $ra, 0x14($sp) +/* E2E004 802BB6D4 8FB00010 */ lw $s0, 0x10($sp) +/* E2E008 802BB6D8 03E00008 */ jr $ra +/* E2E00C 802BB6DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2D730/func_802BB6E0_E2E010.s b/asm/nonmatchings/code_E2D730/func_802BB6E0_E2E010.s new file mode 100644 index 0000000000..4754c4171f --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB6E0_E2E010.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB6E0_E2E010 +/* E2E010 802BB6E0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E2E014 802BB6E4 AFB00018 */ sw $s0, 0x18($sp) +/* E2E018 802BB6E8 0080802D */ daddu $s0, $a0, $zero +/* E2E01C 802BB6EC AFBF0020 */ sw $ra, 0x20($sp) +/* E2E020 802BB6F0 AFB1001C */ sw $s1, 0x1c($sp) +/* E2E024 802BB6F4 86040014 */ lh $a0, 0x14($s0) +/* E2E028 802BB6F8 0C047FF8 */ jal get_anim_mesh +/* E2E02C 802BB6FC 8E110040 */ lw $s1, 0x40($s0) +/* E2E030 802BB700 24030011 */ addiu $v1, $zero, 0x11 +/* E2E034 802BB704 3C04802C */ lui $a0, %hi(D_802BC7D0) +/* E2E038 802BB708 2484C7D0 */ addiu $a0, $a0, %lo(D_802BC7D0) +/* E2E03C 802BB70C A0430004 */ sb $v1, 4($v0) +/* E2E040 802BB710 C6000048 */ lwc1 $f0, 0x48($s0) +/* E2E044 802BB714 C602004C */ lwc1 $f2, 0x4c($s0) +/* E2E048 802BB718 C6040050 */ lwc1 $f4, 0x50($s0) +/* E2E04C 802BB71C 3C028000 */ lui $v0, 0x8000 +/* E2E050 802BB720 AFA00010 */ sw $zero, 0x10($sp) +/* E2E054 802BB724 4600018D */ trunc.w.s $f6, $f0 +/* E2E058 802BB728 44053000 */ mfc1 $a1, $f6 +/* E2E05C 802BB72C 4600118D */ trunc.w.s $f6, $f2 +/* E2E060 802BB730 44063000 */ mfc1 $a2, $f6 +/* E2E064 802BB734 4600218D */ trunc.w.s $f6, $f4 +/* E2E068 802BB738 44073000 */ mfc1 $a3, $f6 +/* E2E06C 802BB73C 0C044631 */ jal create_entity +/* E2E070 802BB740 AFA20014 */ sw $v0, 0x14($sp) +/* E2E074 802BB744 0040202D */ daddu $a0, $v0, $zero +/* E2E078 802BB748 0C04417A */ jal get_entity_by_index +/* E2E07C 802BB74C A6240004 */ sh $a0, 4($s1) +/* E2E080 802BB750 8C510040 */ lw $s1, 0x40($v0) +/* E2E084 802BB754 92030004 */ lbu $v1, 4($s0) +/* E2E088 802BB758 A6230004 */ sh $v1, 4($s1) +/* E2E08C 802BB75C C4400064 */ lwc1 $f0, 0x64($v0) +/* E2E090 802BB760 E6200008 */ swc1 $f0, 8($s1) +/* E2E094 802BB764 8FBF0020 */ lw $ra, 0x20($sp) +/* E2E098 802BB768 8FB1001C */ lw $s1, 0x1c($sp) +/* E2E09C 802BB76C 8FB00018 */ lw $s0, 0x18($sp) +/* E2E0A0 802BB770 03E00008 */ jr $ra +/* E2E0A4 802BB774 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_E2D730/func_802BB778_E2E0A8.s b/asm/nonmatchings/code_E2D730/func_802BB778_E2E0A8.s new file mode 100644 index 0000000000..5c02acde77 --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB778_E2E0A8.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB778_E2E0A8 +/* E2E0A8 802BB778 3C02802C */ lui $v0, %hi(func_802BB374_E2DCA4) +/* E2E0AC 802BB77C 2442B374 */ addiu $v0, $v0, %lo(func_802BB374_E2DCA4) +/* E2E0B0 802BB780 AC800054 */ sw $zero, 0x54($a0) +/* E2E0B4 802BB784 03E00008 */ jr $ra +/* E2E0B8 802BB788 AC82003C */ sw $v0, 0x3c($a0) diff --git a/asm/nonmatchings/code_E2D730/func_802BB78C_E2E0BC.s b/asm/nonmatchings/code_E2D730/func_802BB78C_E2E0BC.s new file mode 100644 index 0000000000..279c1772da --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB78C_E2E0BC.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB78C_E2E0BC +/* E2E0BC 802BB78C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E2E0C0 802BB790 AFB00010 */ sw $s0, 0x10($sp) +/* E2E0C4 802BB794 0080802D */ daddu $s0, $a0, $zero +/* E2E0C8 802BB798 AFBF0018 */ sw $ra, 0x18($sp) +/* E2E0CC 802BB79C AFB10014 */ sw $s1, 0x14($sp) +/* E2E0D0 802BB7A0 8E110040 */ lw $s1, 0x40($s0) +/* E2E0D4 802BB7A4 96230002 */ lhu $v1, 2($s1) +/* E2E0D8 802BB7A8 10600005 */ beqz $v1, .L802BB7C0 +/* E2E0DC 802BB7AC 24020001 */ addiu $v0, $zero, 1 +/* E2E0E0 802BB7B0 10620014 */ beq $v1, $v0, .L802BB804 +/* E2E0E4 802BB7B4 00000000 */ nop +/* E2E0E8 802BB7B8 080AEE29 */ j .L802BB8A4 +/* E2E0EC 802BB7BC 00000000 */ nop +.L802BB7C0: +/* E2E0F0 802BB7C0 96220000 */ lhu $v0, ($s1) +/* E2E0F4 802BB7C4 10400037 */ beqz $v0, .L802BB8A4 +/* E2E0F8 802BB7C8 00000000 */ nop +/* E2E0FC 802BB7CC 96220002 */ lhu $v0, 2($s1) +/* E2E100 802BB7D0 3C01C1C8 */ lui $at, 0xc1c8 +/* E2E104 802BB7D4 44810000 */ mtc1 $at, $f0 +/* E2E108 802BB7D8 3C013FE6 */ lui $at, 0x3fe6 +/* E2E10C 802BB7DC 34216666 */ ori $at, $at, 0x6666 +/* E2E110 802BB7E0 44811000 */ mtc1 $at, $f2 +/* E2E114 802BB7E4 A6200000 */ sh $zero, ($s1) +/* E2E118 802BB7E8 24420001 */ addiu $v0, $v0, 1 +/* E2E11C 802BB7EC A6220002 */ sh $v0, 2($s1) +/* E2E120 802BB7F0 240200FF */ addiu $v0, $zero, 0xff +/* E2E124 802BB7F4 E6000068 */ swc1 $f0, 0x68($s0) +/* E2E128 802BB7F8 E6020054 */ swc1 $f2, 0x54($s0) +/* E2E12C 802BB7FC 080AEE29 */ j .L802BB8A4 +/* E2E130 802BB800 A202000B */ sb $v0, 0xb($s0) +.L802BB804: +/* E2E134 802BB804 C6000068 */ lwc1 $f0, 0x68($s0) +/* E2E138 802BB808 3C013F80 */ lui $at, 0x3f80 +/* E2E13C 802BB80C 44811000 */ mtc1 $at, $f2 +/* E2E140 802BB810 00000000 */ nop +/* E2E144 802BB814 46020000 */ add.s $f0, $f0, $f2 +/* E2E148 802BB818 3C014100 */ lui $at, 0x4100 +/* E2E14C 802BB81C 44811000 */ mtc1 $at, $f2 +/* E2E150 802BB820 00000000 */ nop +/* E2E154 802BB824 4600103E */ c.le.s $f2, $f0 +/* E2E158 802BB828 00000000 */ nop +/* E2E15C 802BB82C 45000002 */ bc1f .L802BB838 +/* E2E160 802BB830 E6000068 */ swc1 $f0, 0x68($s0) +/* E2E164 802BB834 E6020068 */ swc1 $f2, 0x68($s0) +.L802BB838: +/* E2E168 802BB838 9202000B */ lbu $v0, 0xb($s0) +/* E2E16C 802BB83C 2442FFFA */ addiu $v0, $v0, -6 +/* E2E170 802BB840 A202000B */ sb $v0, 0xb($s0) +/* E2E174 802BB844 304200FF */ andi $v0, $v0, 0xff +/* E2E178 802BB848 2C420006 */ sltiu $v0, $v0, 6 +/* E2E17C 802BB84C 10400002 */ beqz $v0, .L802BB858 +/* E2E180 802BB850 24020006 */ addiu $v0, $zero, 6 +/* E2E184 802BB854 A202000B */ sb $v0, 0xb($s0) +.L802BB858: +/* E2E188 802BB858 C6000054 */ lwc1 $f0, 0x54($s0) +/* E2E18C 802BB85C 3C01802C */ lui $at, %hi(D_802BCDD8) +/* E2E190 802BB860 D422CDD8 */ ldc1 $f2, %lo(D_802BCDD8)($at) +/* E2E194 802BB864 46000021 */ cvt.d.s $f0, $f0 +/* E2E198 802BB868 46220001 */ sub.d $f0, $f0, $f2 +/* E2E19C 802BB86C 3C01802C */ lui $at, %hi(D_802BCDE0) +/* E2E1A0 802BB870 D424CDE0 */ ldc1 $f4, %lo(D_802BCDE0)($at) +/* E2E1A4 802BB874 46200020 */ cvt.s.d $f0, $f0 +/* E2E1A8 802BB878 460000A1 */ cvt.d.s $f2, $f0 +/* E2E1AC 802BB87C 4624103E */ c.le.d $f2, $f4 +/* E2E1B0 802BB880 00000000 */ nop +/* E2E1B4 802BB884 45000003 */ bc1f .L802BB894 +/* E2E1B8 802BB888 E6000054 */ swc1 $f0, 0x54($s0) +/* E2E1BC 802BB88C A6200002 */ sh $zero, 2($s1) +/* E2E1C0 802BB890 AE000054 */ sw $zero, 0x54($s0) +.L802BB894: +/* E2E1C4 802BB894 C6000054 */ lwc1 $f0, 0x54($s0) +/* E2E1C8 802BB898 46000086 */ mov.s $f2, $f0 +/* E2E1CC 802BB89C E6000058 */ swc1 $f0, 0x58($s0) +/* E2E1D0 802BB8A0 E602005C */ swc1 $f2, 0x5c($s0) +.L802BB8A4: +/* E2E1D4 802BB8A4 0C04417A */ jal get_entity_by_index +/* E2E1D8 802BB8A8 96240004 */ lhu $a0, 4($s1) +/* E2E1DC 802BB8AC C4400064 */ lwc1 $f0, 0x64($v0) +/* E2E1E0 802BB8B0 E6200008 */ swc1 $f0, 8($s1) +/* E2E1E4 802BB8B4 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E2E1E8 802BB8B8 C4201DEC */ lwc1 $f0, %lo(D_800B1DEC)($at) +/* E2E1EC 802BB8BC E6000064 */ swc1 $f0, 0x64($s0) +/* E2E1F0 802BB8C0 8FBF0018 */ lw $ra, 0x18($sp) +/* E2E1F4 802BB8C4 8FB10014 */ lw $s1, 0x14($sp) +/* E2E1F8 802BB8C8 8FB00010 */ lw $s0, 0x10($sp) +/* E2E1FC 802BB8CC 03E00008 */ jr $ra +/* E2E200 802BB8D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E2D730/func_802BB8D4_E2E204.s b/asm/nonmatchings/code_E2D730/func_802BB8D4_E2E204.s new file mode 100644 index 0000000000..86cb7da7d9 --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB8D4_E2E204.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB8D4_E2E204 +/* E2E204 802BB8D4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E2E208 802BB8D8 AFB00010 */ sw $s0, 0x10($sp) +/* E2E20C 802BB8DC 0080802D */ daddu $s0, $a0, $zero +/* E2E210 802BB8E0 AFBF001C */ sw $ra, 0x1c($sp) +/* E2E214 802BB8E4 AFB20018 */ sw $s2, 0x18($sp) +/* E2E218 802BB8E8 AFB10014 */ sw $s1, 0x14($sp) +/* E2E21C 802BB8EC F7B40020 */ sdc1 $f20, 0x20($sp) +/* E2E220 802BB8F0 C60C0048 */ lwc1 $f12, 0x48($s0) +/* E2E224 802BB8F4 3C014000 */ lui $at, 0x4000 +/* E2E228 802BB8F8 4481A000 */ mtc1 $at, $f20 +/* E2E22C 802BB8FC 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E2E230 802BB900 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E2E234 802BB904 46146301 */ sub.s $f12, $f12, $f20 +/* E2E238 802BB908 C60E0050 */ lwc1 $f14, 0x50($s0) +/* E2E23C 802BB90C 8E260028 */ lw $a2, 0x28($s1) +/* E2E240 802BB910 8E270030 */ lw $a3, 0x30($s1) +/* E2E244 802BB914 8E120040 */ lw $s2, 0x40($s0) +/* E2E248 802BB918 0C00A7B5 */ jal dist2D +/* E2E24C 802BB91C 46147381 */ sub.s $f14, $f14, $f20 +/* E2E250 802BB920 3C013FD0 */ lui $at, 0x3fd0 +/* E2E254 802BB924 44811800 */ mtc1 $at, $f3 +/* E2E258 802BB928 44801000 */ mtc1 $zero, $f2 +/* E2E25C 802BB92C 46000021 */ cvt.d.s $f0, $f0 +/* E2E260 802BB930 46220002 */ mul.d $f0, $f0, $f2 +/* E2E264 802BB934 00000000 */ nop +/* E2E268 802BB938 46200005 */ abs.d $f0, $f0 +/* E2E26C 802BB93C 46200020 */ cvt.s.d $f0, $f0 +/* E2E270 802BB940 E6400008 */ swc1 $f0, 8($s2) +/* E2E274 802BB944 C6000048 */ lwc1 $f0, 0x48($s0) +/* E2E278 802BB948 46140001 */ sub.s $f0, $f0, $f20 +/* E2E27C 802BB94C 44060000 */ mfc1 $a2, $f0 +/* E2E280 802BB950 C6000050 */ lwc1 $f0, 0x50($s0) +/* E2E284 802BB954 46140001 */ sub.s $f0, $f0, $f20 +/* E2E288 802BB958 C62C0028 */ lwc1 $f12, 0x28($s1) +/* E2E28C 802BB95C C62E0030 */ lwc1 $f14, 0x30($s1) +/* E2E290 802BB960 44070000 */ mfc1 $a3, $f0 +/* E2E294 802BB964 0C00A720 */ jal atan2 +/* E2E298 802BB968 00000000 */ nop +/* E2E29C 802BB96C E6400004 */ swc1 $f0, 4($s2) +/* E2E2A0 802BB970 8FBF001C */ lw $ra, 0x1c($sp) +/* E2E2A4 802BB974 8FB20018 */ lw $s2, 0x18($sp) +/* E2E2A8 802BB978 8FB10014 */ lw $s1, 0x14($sp) +/* E2E2AC 802BB97C 8FB00010 */ lw $s0, 0x10($sp) +/* E2E2B0 802BB980 D7B40020 */ ldc1 $f20, 0x20($sp) +/* E2E2B4 802BB984 03E00008 */ jr $ra +/* E2E2B8 802BB988 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_E2D730/func_802BB98C_E2E2BC.s b/asm/nonmatchings/code_E2D730/func_802BB98C_E2E2BC.s new file mode 100644 index 0000000000..ca92b6cba1 --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB98C_E2E2BC.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB98C_E2E2BC +/* E2E2BC 802BB98C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2E2C0 802BB990 3C058011 */ lui $a1, %hi(gPlayerStatus) +/* E2E2C4 802BB994 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) +/* E2E2C8 802BB998 3C02800B */ lui $v0, %hi(gCameras) +/* E2E2CC 802BB99C 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* E2E2D0 802BB9A0 AFBF0010 */ sw $ra, 0x10($sp) +/* E2E2D4 802BB9A4 8C830040 */ lw $v1, 0x40($a0) +/* E2E2D8 802BB9A8 C4A00028 */ lwc1 $f0, 0x28($a1) +/* E2E2DC 802BB9AC C4A2002C */ lwc1 $f2, 0x2c($a1) +/* E2E2E0 802BB9B0 C4A40030 */ lwc1 $f4, 0x30($a1) +/* E2E2E4 802BB9B4 24A40028 */ addiu $a0, $a1, 0x28 +/* E2E2E8 802BB9B8 E4400060 */ swc1 $f0, 0x60($v0) +/* E2E2EC 802BB9BC E4420064 */ swc1 $f2, 0x64($v0) +/* E2E2F0 802BB9C0 E4440068 */ swc1 $f4, 0x68($v0) +/* E2E2F4 802BB9C4 8C660008 */ lw $a2, 8($v1) +/* E2E2F8 802BB9C8 8C670004 */ lw $a3, 4($v1) +/* E2E2FC 802BB9CC 0C00A7E7 */ jal add_vec2D_polar +/* E2E300 802BB9D0 24A50030 */ addiu $a1, $a1, 0x30 +/* E2E304 802BB9D4 8FBF0010 */ lw $ra, 0x10($sp) +/* E2E308 802BB9D8 03E00008 */ jr $ra +/* E2E30C 802BB9DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s b/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s new file mode 100644 index 0000000000..cd05c63852 --- /dev/null +++ b/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s @@ -0,0 +1,193 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB9E0_E2E310 +/* E2E310 802BB9E0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E2E314 802BB9E4 AFB20028 */ sw $s2, 0x28($sp) +/* E2E318 802BB9E8 0080902D */ daddu $s2, $a0, $zero +/* E2E31C 802BB9EC AFBF002C */ sw $ra, 0x2c($sp) +/* E2E320 802BB9F0 AFB10024 */ sw $s1, 0x24($sp) +/* E2E324 802BB9F4 AFB00020 */ sw $s0, 0x20($sp) +/* E2E328 802BB9F8 8E500040 */ lw $s0, 0x40($s2) +/* E2E32C 802BB9FC 3C048011 */ lui $a0, %hi(D_8010EBB0) +/* E2E330 802BBA00 2484EBB0 */ addiu $a0, $a0, %lo(D_8010EBB0) +/* E2E334 802BBA04 92030000 */ lbu $v1, ($s0) +/* E2E338 802BBA08 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* E2E33C 802BBA0C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* E2E340 802BBA10 2C620007 */ sltiu $v0, $v1, 7 +/* E2E344 802BBA14 104000A2 */ beqz $v0, .L802BBCA0 +/* E2E348 802BBA18 00031080 */ sll $v0, $v1, 2 +/* E2E34C 802BBA1C 3C01802C */ lui $at, %hi(D_802BCDE8) +/* E2E350 802BBA20 00220821 */ addu $at, $at, $v0 +/* E2E354 802BBA24 8C22CDE8 */ lw $v0, %lo(D_802BCDE8)($at) +/* E2E358 802BBA28 00400008 */ jr $v0 +/* E2E35C 802BBA2C 00000000 */ nop +/* E2E360 802BBA30 92420006 */ lbu $v0, 6($s2) +/* E2E364 802BBA34 30420001 */ andi $v0, $v0, 1 +/* E2E368 802BBA38 50400099 */ beql $v0, $zero, .L802BBCA0 +/* E2E36C 802BBA3C A2000001 */ sb $zero, 1($s0) +/* E2E370 802BBA40 80820003 */ lb $v0, 3($a0) +/* E2E374 802BBA44 10400004 */ beqz $v0, .L802BBA58 +/* E2E378 802BBA48 00000000 */ nop +/* E2E37C 802BBA4C 8E220004 */ lw $v0, 4($s1) +/* E2E380 802BBA50 34420004 */ ori $v0, $v0, 4 +/* E2E384 802BBA54 AE220004 */ sw $v0, 4($s1) +.L802BBA58: +/* E2E388 802BBA58 0C03BCC0 */ jal func_800EF300 +/* E2E38C 802BBA5C 00000000 */ nop +/* E2E390 802BBA60 8E220004 */ lw $v0, 4($s1) +/* E2E394 802BBA64 3C030004 */ lui $v1, 4 +/* E2E398 802BBA68 00431025 */ or $v0, $v0, $v1 +/* E2E39C 802BBA6C AE220004 */ sw $v0, 4($s1) +/* E2E3A0 802BBA70 24020004 */ addiu $v0, $zero, 4 +/* E2E3A4 802BBA74 A6020002 */ sh $v0, 2($s0) +/* E2E3A8 802BBA78 92020001 */ lbu $v0, 1($s0) +/* E2E3AC 802BBA7C 92030000 */ lbu $v1, ($s0) +/* E2E3B0 802BBA80 24420001 */ addiu $v0, $v0, 1 +/* E2E3B4 802BBA84 24630001 */ addiu $v1, $v1, 1 +/* E2E3B8 802BBA88 A2020001 */ sb $v0, 1($s0) +/* E2E3BC 802BBA8C 0C03805E */ jal disable_player_input +/* E2E3C0 802BBA90 A2030000 */ sb $v1, ($s0) +/* E2E3C4 802BBA94 0C039769 */ jal set_action_state +/* E2E3C8 802BBA98 0000202D */ daddu $a0, $zero, $zero +/* E2E3CC 802BBA9C 86440014 */ lh $a0, 0x14($s2) +/* E2E3D0 802BBAA0 3C050000 */ lui $a1, 0 +/* E2E3D4 802BBAA4 24A50214 */ addiu $a1, $a1, 0x214 +/* E2E3D8 802BBAA8 0C048052 */ jal play_model_animation +/* E2E3DC 802BBAAC 00000000 */ nop +/* E2E3E0 802BBAB0 0C05272D */ jal play_sound +/* E2E3E4 802BBAB4 240400F2 */ addiu $a0, $zero, 0xf2 +/* E2E3E8 802BBAB8 0C0AEE35 */ jal func_802BB8D4_E2E204 +/* E2E3EC 802BBABC 0240202D */ daddu $a0, $s2, $zero +/* E2E3F0 802BBAC0 080AEF28 */ j .L802BBCA0 +/* E2E3F4 802BBAC4 00000000 */ nop +/* E2E3F8 802BBAC8 8E220004 */ lw $v0, 4($s1) +/* E2E3FC 802BBACC 3C030004 */ lui $v1, 4 +/* E2E400 802BBAD0 00431025 */ or $v0, $v0, $v1 +/* E2E404 802BBAD4 AE220004 */ sw $v0, 4($s1) +/* E2E408 802BBAD8 96020002 */ lhu $v0, 2($s0) +/* E2E40C 802BBADC 2442FFFF */ addiu $v0, $v0, -1 +/* E2E410 802BBAE0 A6020002 */ sh $v0, 2($s0) +/* E2E414 802BBAE4 00021400 */ sll $v0, $v0, 0x10 +/* E2E418 802BBAE8 14400012 */ bnez $v0, .L802BBB34 +/* E2E41C 802BBAEC 24040080 */ addiu $a0, $zero, 0x80 +/* E2E420 802BBAF0 0C00A3C2 */ jal start_rumble +/* E2E424 802BBAF4 2405000A */ addiu $a1, $zero, 0xa +/* E2E428 802BBAF8 92020000 */ lbu $v0, ($s0) +/* E2E42C 802BBAFC 3C0142A0 */ lui $at, 0x42a0 +/* E2E430 802BBB00 44810000 */ mtc1 $at, $f0 +/* E2E434 802BBB04 2403001E */ addiu $v1, $zero, 0x1e +/* E2E438 802BBB08 A6030002 */ sh $v1, 2($s0) +/* E2E43C 802BBB0C 24420001 */ addiu $v0, $v0, 1 +/* E2E440 802BBB10 A2020000 */ sb $v0, ($s0) +/* E2E444 802BBB14 C62200A8 */ lwc1 $f2, 0xa8($s1) +/* E2E448 802BBB18 8E220000 */ lw $v0, ($s1) +/* E2E44C 802BBB1C 3C030010 */ lui $v1, 0x10 +/* E2E450 802BBB20 E62000A8 */ swc1 $f0, 0xa8($s1) +/* E2E454 802BBB24 00431025 */ or $v0, $v0, $v1 +/* E2E458 802BBB28 AE220000 */ sw $v0, ($s1) +/* E2E45C 802BBB2C 3C01802C */ lui $at, %hi(D_802BCE20) +/* E2E460 802BBB30 E422CE20 */ swc1 $f2, %lo(D_802BCE20)($at) +.L802BBB34: +/* E2E464 802BBB34 0C0AEE63 */ jal func_802BB98C_E2E2BC +/* E2E468 802BBB38 0240202D */ daddu $a0, $s2, $zero +/* E2E46C 802BBB3C 080AEF28 */ j .L802BBCA0 +/* E2E470 802BBB40 00000000 */ nop +/* E2E474 802BBB44 96020002 */ lhu $v0, 2($s0) +/* E2E478 802BBB48 2442FFFF */ addiu $v0, $v0, -1 +/* E2E47C 802BBB4C A6020002 */ sh $v0, 2($s0) +/* E2E480 802BBB50 00021400 */ sll $v0, $v0, 0x10 +/* E2E484 802BBB54 14400052 */ bnez $v0, .L802BBCA0 +/* E2E488 802BBB58 0000202D */ daddu $a0, $zero, $zero +/* E2E48C 802BBB5C 2405FFFF */ addiu $a1, $zero, -1 +/* E2E490 802BBB60 0080302D */ daddu $a2, $a0, $zero +/* E2E494 802BBB64 92020000 */ lbu $v0, ($s0) +/* E2E498 802BBB68 0080382D */ daddu $a3, $a0, $zero +/* E2E49C 802BBB6C 24420001 */ addiu $v0, $v0, 1 +/* E2E4A0 802BBB70 A2020000 */ sb $v0, ($s0) +/* E2E4A4 802BBB74 AFA00010 */ sw $zero, 0x10($sp) +/* E2E4A8 802BBB78 AFA00014 */ sw $zero, 0x14($sp) +/* E2E4AC 802BBB7C AFA00018 */ sw $zero, 0x18($sp) +/* E2E4B0 802BBB80 0C0B77B9 */ jal func_802DDEE4 +/* E2E4B4 802BBB84 AFA0001C */ sw $zero, 0x1c($sp) +/* E2E4B8 802BBB88 3C040001 */ lui $a0, 1 +/* E2E4BC 802BBB8C 34840002 */ ori $a0, $a0, 2 +/* E2E4C0 802BBB90 24050005 */ addiu $a1, $zero, 5 +/* E2E4C4 802BBB94 24060013 */ addiu $a2, $zero, 0x13 +/* E2E4C8 802BBB98 24070001 */ addiu $a3, $zero, 1 +/* E2E4CC 802BBB9C 00E0102D */ daddu $v0, $a3, $zero +/* E2E4D0 802BBBA0 AFA20010 */ sw $v0, 0x10($sp) +/* E2E4D4 802BBBA4 AFA00014 */ sw $zero, 0x14($sp) +/* E2E4D8 802BBBA8 0C0B77FE */ jal func_802DDFF8 +/* E2E4DC 802BBBAC AFA00018 */ sw $zero, 0x18($sp) +/* E2E4E0 802BBBB0 080AEF28 */ j .L802BBCA0 +/* E2E4E4 802BBBB4 00000000 */ nop +/* E2E4E8 802BBBB8 92020000 */ lbu $v0, ($s0) +/* E2E4EC 802BBBBC 080AEF02 */ j .L802BBC08 +/* E2E4F0 802BBBC0 24420001 */ addiu $v0, $v0, 1 +/* E2E4F4 802BBBC4 3C01802C */ lui $at, %hi(D_802BCE20) +/* E2E4F8 802BBBC8 C420CE20 */ lwc1 $f0, %lo(D_802BCE20)($at) +/* E2E4FC 802BBBCC 44801000 */ mtc1 $zero, $f2 +/* E2E500 802BBBD0 3C014387 */ lui $at, 0x4387 +/* E2E504 802BBBD4 44812000 */ mtc1 $at, $f4 +/* E2E508 802BBBD8 46020032 */ c.eq.s $f0, $f2 +/* E2E50C 802BBBDC 00000000 */ nop +/* E2E510 802BBBE0 45010004 */ bc1t .L802BBBF4 +/* E2E514 802BBBE4 E62000A8 */ swc1 $f0, 0xa8($s1) +/* E2E518 802BBBE8 3C0142B4 */ lui $at, 0x42b4 +/* E2E51C 802BBBEC 44812000 */ mtc1 $at, $f4 +/* E2E520 802BBBF0 00000000 */ nop +.L802BBBF4: +/* E2E524 802BBBF4 E6240080 */ swc1 $f4, 0x80($s1) +/* E2E528 802BBBF8 92020000 */ lbu $v0, ($s0) +/* E2E52C 802BBBFC 24030050 */ addiu $v1, $zero, 0x50 +/* E2E530 802BBC00 A6030002 */ sh $v1, 2($s0) +/* E2E534 802BBC04 24420001 */ addiu $v0, $v0, 1 +.L802BBC08: +/* E2E538 802BBC08 080AEF28 */ j .L802BBCA0 +/* E2E53C 802BBC0C A2020000 */ sb $v0, ($s0) +/* E2E540 802BBC10 96020002 */ lhu $v0, 2($s0) +/* E2E544 802BBC14 2442FFFF */ addiu $v0, $v0, -1 +/* E2E548 802BBC18 A6020002 */ sh $v0, 2($s0) +/* E2E54C 802BBC1C 00021400 */ sll $v0, $v0, 0x10 +/* E2E550 802BBC20 1440001F */ bnez $v0, .L802BBCA0 +/* E2E554 802BBC24 0000202D */ daddu $a0, $zero, $zero +/* E2E558 802BBC28 2405FFFF */ addiu $a1, $zero, -1 +/* E2E55C 802BBC2C 0080302D */ daddu $a2, $a0, $zero +/* E2E560 802BBC30 92020000 */ lbu $v0, ($s0) +/* E2E564 802BBC34 0080382D */ daddu $a3, $a0, $zero +/* E2E568 802BBC38 24420001 */ addiu $v0, $v0, 1 +/* E2E56C 802BBC3C A2020000 */ sb $v0, ($s0) +/* E2E570 802BBC40 AFA00010 */ sw $zero, 0x10($sp) +/* E2E574 802BBC44 AFA00014 */ sw $zero, 0x14($sp) +/* E2E578 802BBC48 AFA00018 */ sw $zero, 0x18($sp) +/* E2E57C 802BBC4C 0C0B77B9 */ jal func_802DDEE4 +/* E2E580 802BBC50 AFA0001C */ sw $zero, 0x1c($sp) +/* E2E584 802BBC54 0C038069 */ jal enable_player_input +/* E2E588 802BBC58 00000000 */ nop +/* E2E58C 802BBC5C 3C03FFEF */ lui $v1, 0xffef +/* E2E590 802BBC60 8E220000 */ lw $v0, ($s1) +/* E2E594 802BBC64 3463FFFF */ ori $v1, $v1, 0xffff +/* E2E598 802BBC68 00431024 */ and $v0, $v0, $v1 +/* E2E59C 802BBC6C 080AEF28 */ j .L802BBCA0 +/* E2E5A0 802BBC70 AE220000 */ sw $v0, ($s1) +/* E2E5A4 802BBC74 92420006 */ lbu $v0, 6($s2) +/* E2E5A8 802BBC78 30420001 */ andi $v0, $v0, 1 +/* E2E5AC 802BBC7C 14400008 */ bnez $v0, .L802BBCA0 +/* E2E5B0 802BBC80 00000000 */ nop +/* E2E5B4 802BBC84 80820000 */ lb $v0, ($a0) +/* E2E5B8 802BBC88 14400005 */ bnez $v0, .L802BBCA0 +/* E2E5BC 802BBC8C 00000000 */ nop +/* E2E5C0 802BBC90 0C03BCCA */ jal enable_partner_ai +/* E2E5C4 802BBC94 A2000000 */ sb $zero, ($s0) +/* E2E5C8 802BBC98 0C03954C */ jal func_800E5530 +/* E2E5CC 802BBC9C 00000000 */ nop +.L802BBCA0: +/* E2E5D0 802BBCA0 8FBF002C */ lw $ra, 0x2c($sp) +/* E2E5D4 802BBCA4 8FB20028 */ lw $s2, 0x28($sp) +/* E2E5D8 802BBCA8 8FB10024 */ lw $s1, 0x24($sp) +/* E2E5DC 802BBCAC 8FB00020 */ lw $s0, 0x20($sp) +/* E2E5E0 802BBCB0 03E00008 */ jr $ra +/* E2E5E4 802BBCB4 27BD0030 */ addiu $sp, $sp, 0x30 +/* E2E5E8 802BBCB8 00000000 */ nop +/* E2E5EC 802BBCBC 00000000 */ nop diff --git a/asm/nonmatchings/code_E2E5F0/func_802BBCC0_E2E5F0.s b/asm/nonmatchings/code_E2E5F0/func_802BBCC0_E2E5F0.s new file mode 100644 index 0000000000..7a7d6b9c15 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BBCC0_E2E5F0.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BBCC0_E2E5F0 +/* E2E5F0 802BBCC0 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) +/* E2E5F4 802BBCC4 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) +/* E2E5F8 802BBCC8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2E5FC 802BBCCC AFB00010 */ sw $s0, 0x10($sp) +/* E2E600 802BBCD0 0080802D */ daddu $s0, $a0, $zero +/* E2E604 802BBCD4 30420010 */ andi $v0, $v0, 0x10 +/* E2E608 802BBCD8 1040000C */ beqz $v0, .L802BBD0C +/* E2E60C 802BBCDC AFBF0014 */ sw $ra, 0x14($sp) +/* E2E610 802BBCE0 92020006 */ lbu $v0, 6($s0) +/* E2E614 802BBCE4 30420048 */ andi $v0, $v0, 0x48 +/* E2E618 802BBCE8 10400008 */ beqz $v0, .L802BBD0C +/* E2E61C 802BBCEC 00000000 */ nop +/* E2E620 802BBCF0 0C043F5A */ jal func_8010FD68 +/* E2E624 802BBCF4 00000000 */ nop +/* E2E628 802BBCF8 86040014 */ lh $a0, 0x14($s0) +/* E2E62C 802BBCFC 3C050000 */ lui $a1, 0 +/* E2E630 802BBD00 24A500F4 */ addiu $a1, $a1, 0xf4 +/* E2E634 802BBD04 0C048052 */ jal play_model_animation +/* E2E638 802BBD08 00000000 */ nop +.L802BBD0C: +/* E2E63C 802BBD0C 8FBF0014 */ lw $ra, 0x14($sp) +/* E2E640 802BBD10 8FB00010 */ lw $s0, 0x10($sp) +/* E2E644 802BBD14 03E00008 */ jr $ra +/* E2E648 802BBD18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BBD1C_E2E64C.s b/asm/nonmatchings/code_E2E5F0/func_802BBD1C_E2E64C.s new file mode 100644 index 0000000000..ce3b432e68 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BBD1C_E2E64C.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BBD1C_E2E64C +/* E2E64C 802BBD1C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) +/* E2E650 802BBD20 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) +/* E2E654 802BBD24 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2E658 802BBD28 AFB00010 */ sw $s0, 0x10($sp) +/* E2E65C 802BBD2C 0080802D */ daddu $s0, $a0, $zero +/* E2E660 802BBD30 30420010 */ andi $v0, $v0, 0x10 +/* E2E664 802BBD34 1040000C */ beqz $v0, .L802BBD68 +/* E2E668 802BBD38 AFBF0014 */ sw $ra, 0x14($sp) +/* E2E66C 802BBD3C 92020006 */ lbu $v0, 6($s0) +/* E2E670 802BBD40 30420048 */ andi $v0, $v0, 0x48 +/* E2E674 802BBD44 10400008 */ beqz $v0, .L802BBD68 +/* E2E678 802BBD48 00000000 */ nop +/* E2E67C 802BBD4C 0C043F5A */ jal func_8010FD68 +/* E2E680 802BBD50 00000000 */ nop +/* E2E684 802BBD54 86040014 */ lh $a0, 0x14($s0) +/* E2E688 802BBD58 3C050000 */ lui $a1, 0 +/* E2E68C 802BBD5C 24A50064 */ addiu $a1, $a1, 0x64 +/* E2E690 802BBD60 0C048052 */ jal play_model_animation +/* E2E694 802BBD64 00000000 */ nop +.L802BBD68: +/* E2E698 802BBD68 8FBF0014 */ lw $ra, 0x14($sp) +/* E2E69C 802BBD6C 8FB00010 */ lw $s0, 0x10($sp) +/* E2E6A0 802BBD70 03E00008 */ jr $ra +/* E2E6A4 802BBD74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BBD78_E2E6A8.s b/asm/nonmatchings/code_E2E5F0/func_802BBD78_E2E6A8.s new file mode 100644 index 0000000000..ceb19c2e15 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BBD78_E2E6A8.s @@ -0,0 +1,73 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BBD78_E2E6A8 +/* E2E6A8 802BBD78 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* E2E6AC 802BBD7C AFB00020 */ sw $s0, 0x20($sp) +/* E2E6B0 802BBD80 0080802D */ daddu $s0, $a0, $zero +/* E2E6B4 802BBD84 AFBF0024 */ sw $ra, 0x24($sp) +/* E2E6B8 802BBD88 F7B60030 */ sdc1 $f22, 0x30($sp) +/* E2E6BC 802BBD8C F7B40028 */ sdc1 $f20, 0x28($sp) +/* E2E6C0 802BBD90 0C00A6C9 */ jal clamp_angle +/* E2E6C4 802BBD94 C60C0064 */ lwc1 $f12, 0x64($s0) +/* E2E6C8 802BBD98 3C0140C9 */ lui $at, 0x40c9 +/* E2E6CC 802BBD9C 34210FD0 */ ori $at, $at, 0xfd0 +/* E2E6D0 802BBDA0 44811000 */ mtc1 $at, $f2 +/* E2E6D4 802BBDA4 00000000 */ nop +/* E2E6D8 802BBDA8 46020582 */ mul.s $f22, $f0, $f2 +/* E2E6DC 802BBDAC 00000000 */ nop +/* E2E6E0 802BBDB0 3C0143B4 */ lui $at, 0x43b4 +/* E2E6E4 802BBDB4 44810000 */ mtc1 $at, $f0 +/* E2E6E8 802BBDB8 00000000 */ nop +/* E2E6EC 802BBDBC 4600B583 */ div.s $f22, $f22, $f0 +/* E2E6F0 802BBDC0 0C00A874 */ jal cos_rad +/* E2E6F4 802BBDC4 4600B306 */ mov.s $f12, $f22 +/* E2E6F8 802BBDC8 3C01C03A */ lui $at, 0xc03a +/* E2E6FC 802BBDCC 44811800 */ mtc1 $at, $f3 +/* E2E700 802BBDD0 44801000 */ mtc1 $zero, $f2 +/* E2E704 802BBDD4 46000521 */ cvt.d.s $f20, $f0 +/* E2E708 802BBDD8 4622A502 */ mul.d $f20, $f20, $f2 +/* E2E70C 802BBDDC 00000000 */ nop +/* E2E710 802BBDE0 4600B306 */ mov.s $f12, $f22 +/* E2E714 802BBDE4 0C00A85B */ jal sin_rad +/* E2E718 802BBDE8 4620A520 */ cvt.s.d $f20, $f20 +/* E2E71C 802BBDEC 3C014018 */ lui $at, 0x4018 +/* E2E720 802BBDF0 44811800 */ mtc1 $at, $f3 +/* E2E724 802BBDF4 44801000 */ mtc1 $zero, $f2 +/* E2E728 802BBDF8 460005A1 */ cvt.d.s $f22, $f0 +/* E2E72C 802BBDFC 4622B582 */ mul.d $f22, $f22, $f2 +/* E2E730 802BBE00 00000000 */ nop +/* E2E734 802BBE04 C60C0064 */ lwc1 $f12, 0x64($s0) +/* E2E738 802BBE08 3C01802C */ lui $at, %hi(D_802BCE10) +/* E2E73C 802BBE0C D420CE10 */ ldc1 $f0, %lo(D_802BCE10)($at) +/* E2E740 802BBE10 46006321 */ cvt.d.s $f12, $f12 +/* E2E744 802BBE14 46206301 */ sub.d $f12, $f12, $f0 +/* E2E748 802BBE18 46206320 */ cvt.s.d $f12, $f12 +/* E2E74C 802BBE1C 0C00A6C9 */ jal clamp_angle +/* E2E750 802BBE20 4620B5A0 */ cvt.s.d $f22, $f22 +/* E2E754 802BBE24 C6020048 */ lwc1 $f2, 0x48($s0) +/* E2E758 802BBE28 C604004C */ lwc1 $f4, 0x4c($s0) +/* E2E75C 802BBE2C C6060050 */ lwc1 $f6, 0x50($s0) +/* E2E760 802BBE30 E7A00010 */ swc1 $f0, 0x10($sp) +/* E2E764 802BBE34 46141080 */ add.s $f2, $f2, $f20 +/* E2E768 802BBE38 3C014278 */ lui $at, 0x4278 +/* E2E76C 802BBE3C 44810000 */ mtc1 $at, $f0 +/* E2E770 802BBE40 00000000 */ nop +/* E2E774 802BBE44 46002100 */ add.s $f4, $f4, $f0 +/* E2E778 802BBE48 24020002 */ addiu $v0, $zero, 2 +/* E2E77C 802BBE4C 46163180 */ add.s $f6, $f6, $f22 +/* E2E780 802BBE50 3C014258 */ lui $at, 0x4258 +/* E2E784 802BBE54 44810000 */ mtc1 $at, $f0 +/* E2E788 802BBE58 44051000 */ mfc1 $a1, $f2 +/* E2E78C 802BBE5C 44062000 */ mfc1 $a2, $f4 +/* E2E790 802BBE60 44073000 */ mfc1 $a3, $f6 +/* E2E794 802BBE64 0000202D */ daddu $a0, $zero, $zero +/* E2E798 802BBE68 AFA20018 */ sw $v0, 0x18($sp) +/* E2E79C 802BBE6C 0C01C13C */ jal func_800704F0 +/* E2E7A0 802BBE70 E7A00014 */ swc1 $f0, 0x14($sp) +/* E2E7A4 802BBE74 8FBF0024 */ lw $ra, 0x24($sp) +/* E2E7A8 802BBE78 8FB00020 */ lw $s0, 0x20($sp) +/* E2E7AC 802BBE7C D7B60030 */ ldc1 $f22, 0x30($sp) +/* E2E7B0 802BBE80 D7B40028 */ ldc1 $f20, 0x28($sp) +/* E2E7B4 802BBE84 03E00008 */ jr $ra +/* E2E7B8 802BBE88 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BBE8C_E2E7BC.s b/asm/nonmatchings/code_E2E5F0/func_802BBE8C_E2E7BC.s new file mode 100644 index 0000000000..8ce850c7fd --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BBE8C_E2E7BC.s @@ -0,0 +1,101 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BBE8C_E2E7BC +/* E2E7BC 802BBE8C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* E2E7C0 802BBE90 AFB10024 */ sw $s1, 0x24($sp) +/* E2E7C4 802BBE94 0080882D */ daddu $s1, $a0, $zero +/* E2E7C8 802BBE98 AFBF0028 */ sw $ra, 0x28($sp) +/* E2E7CC 802BBE9C AFB00020 */ sw $s0, 0x20($sp) +/* E2E7D0 802BBEA0 F7B60038 */ sdc1 $f22, 0x38($sp) +/* E2E7D4 802BBEA4 F7B40030 */ sdc1 $f20, 0x30($sp) +/* E2E7D8 802BBEA8 0C0AEF5E */ jal func_802BBD78_E2E6A8 +/* E2E7DC 802BBEAC 8E300040 */ lw $s0, 0x40($s1) +/* E2E7E0 802BBEB0 8E020000 */ lw $v0, ($s0) +/* E2E7E4 802BBEB4 28420003 */ slti $v0, $v0, 3 +/* E2E7E8 802BBEB8 1040004D */ beqz $v0, .L802BBFF0 +/* E2E7EC 802BBEBC 00000000 */ nop +/* E2E7F0 802BBEC0 0C00A6C9 */ jal clamp_angle +/* E2E7F4 802BBEC4 C62C0064 */ lwc1 $f12, 0x64($s1) +/* E2E7F8 802BBEC8 3C0140C9 */ lui $at, 0x40c9 +/* E2E7FC 802BBECC 34210FD0 */ ori $at, $at, 0xfd0 +/* E2E800 802BBED0 44811000 */ mtc1 $at, $f2 +/* E2E804 802BBED4 00000000 */ nop +/* E2E808 802BBED8 46020502 */ mul.s $f20, $f0, $f2 +/* E2E80C 802BBEDC 00000000 */ nop +/* E2E810 802BBEE0 3C0143B4 */ lui $at, 0x43b4 +/* E2E814 802BBEE4 44810000 */ mtc1 $at, $f0 +/* E2E818 802BBEE8 00000000 */ nop +/* E2E81C 802BBEEC 4600A503 */ div.s $f20, $f20, $f0 +/* E2E820 802BBEF0 0C00A874 */ jal cos_rad +/* E2E824 802BBEF4 4600A306 */ mov.s $f12, $f20 +/* E2E828 802BBEF8 3C01C03A */ lui $at, 0xc03a +/* E2E82C 802BBEFC 44811800 */ mtc1 $at, $f3 +/* E2E830 802BBF00 44801000 */ mtc1 $zero, $f2 +/* E2E834 802BBF04 46000021 */ cvt.d.s $f0, $f0 +/* E2E838 802BBF08 46220002 */ mul.d $f0, $f0, $f2 +/* E2E83C 802BBF0C 00000000 */ nop +/* E2E840 802BBF10 4600A306 */ mov.s $f12, $f20 +/* E2E844 802BBF14 0C00A85B */ jal sin_rad +/* E2E848 802BBF18 46200520 */ cvt.s.d $f20, $f0 +/* E2E84C 802BBF1C 3C014018 */ lui $at, 0x4018 +/* E2E850 802BBF20 44811800 */ mtc1 $at, $f3 +/* E2E854 802BBF24 44801000 */ mtc1 $zero, $f2 +/* E2E858 802BBF28 46000021 */ cvt.d.s $f0, $f0 +/* E2E85C 802BBF2C 46220002 */ mul.d $f0, $f0, $f2 +/* E2E860 802BBF30 00000000 */ nop +/* E2E864 802BBF34 24040020 */ addiu $a0, $zero, 0x20 +/* E2E868 802BBF38 0C00A67F */ jal rand_int +/* E2E86C 802BBF3C 462005A0 */ cvt.s.d $f22, $f0 +/* E2E870 802BBF40 28420011 */ slti $v0, $v0, 0x11 +/* E2E874 802BBF44 1440002A */ bnez $v0, .L802BBFF0 +/* E2E878 802BBF48 3C025555 */ lui $v0, 0x5555 +/* E2E87C 802BBF4C 8E050000 */ lw $a1, ($s0) +/* E2E880 802BBF50 34425556 */ ori $v0, $v0, 0x5556 +/* E2E884 802BBF54 00A20018 */ mult $a1, $v0 +/* E2E888 802BBF58 C6260064 */ lwc1 $f6, 0x64($s1) +/* E2E88C 802BBF5C 3C0142DC */ lui $at, 0x42dc +/* E2E890 802BBF60 44810000 */ mtc1 $at, $f0 +/* E2E894 802BBF64 24A20001 */ addiu $v0, $a1, 1 +/* E2E898 802BBF68 46003181 */ sub.s $f6, $f6, $f0 +/* E2E89C 802BBF6C AE020000 */ sw $v0, ($s0) +/* E2E8A0 802BBF70 C6240050 */ lwc1 $f4, 0x50($s1) +/* E2E8A4 802BBF74 46162100 */ add.s $f4, $f4, $f22 +/* E2E8A8 802BBF78 00051FC3 */ sra $v1, $a1, 0x1f +/* E2E8AC 802BBF7C 00004010 */ mfhi $t0 +/* E2E8B0 802BBF80 01031823 */ subu $v1, $t0, $v1 +/* E2E8B4 802BBF84 00031040 */ sll $v0, $v1, 1 +/* E2E8B8 802BBF88 00431021 */ addu $v0, $v0, $v1 +/* E2E8BC 802BBF8C 00A22823 */ subu $a1, $a1, $v0 +/* E2E8C0 802BBF90 00051100 */ sll $v0, $a1, 4 +/* E2E8C4 802BBF94 00451023 */ subu $v0, $v0, $a1 +/* E2E8C8 802BBF98 00021040 */ sll $v0, $v0, 1 +/* E2E8CC 802BBF9C 44820000 */ mtc1 $v0, $f0 +/* E2E8D0 802BBFA0 00000000 */ nop +/* E2E8D4 802BBFA4 46800020 */ cvt.s.w $f0, $f0 +/* E2E8D8 802BBFA8 46003180 */ add.s $f6, $f6, $f0 +/* E2E8DC 802BBFAC C6200048 */ lwc1 $f0, 0x48($s1) +/* E2E8E0 802BBFB0 46140000 */ add.s $f0, $f0, $f20 +/* E2E8E4 802BBFB4 C622004C */ lwc1 $f2, 0x4c($s1) +/* E2E8E8 802BBFB8 44072000 */ mfc1 $a3, $f4 +/* E2E8EC 802BBFBC 44050000 */ mfc1 $a1, $f0 +/* E2E8F0 802BBFC0 3C014278 */ lui $at, 0x4278 +/* E2E8F4 802BBFC4 44810000 */ mtc1 $at, $f0 +/* E2E8F8 802BBFC8 24020003 */ addiu $v0, $zero, 3 +/* E2E8FC 802BBFCC AFA20010 */ sw $v0, 0x10($sp) +/* E2E900 802BBFD0 46001080 */ add.s $f2, $f2, $f0 +/* E2E904 802BBFD4 AFA00014 */ sw $zero, 0x14($sp) +/* E2E908 802BBFD8 AFA0001C */ sw $zero, 0x1c($sp) +/* E2E90C 802BBFDC 44061000 */ mfc1 $a2, $f2 +/* E2E910 802BBFE0 4600320D */ trunc.w.s $f8, $f6 +/* E2E914 802BBFE4 E7A80018 */ swc1 $f8, 0x18($sp) +/* E2E918 802BBFE8 0C04C4FD */ jal make_item_entity +/* E2E91C 802BBFEC 24040157 */ addiu $a0, $zero, 0x157 +.L802BBFF0: +/* E2E920 802BBFF0 8FBF0028 */ lw $ra, 0x28($sp) +/* E2E924 802BBFF4 8FB10024 */ lw $s1, 0x24($sp) +/* E2E928 802BBFF8 8FB00020 */ lw $s0, 0x20($sp) +/* E2E92C 802BBFFC D7B60038 */ ldc1 $f22, 0x38($sp) +/* E2E930 802BC000 D7B40030 */ ldc1 $f20, 0x30($sp) +/* E2E934 802BC004 03E00008 */ jr $ra +/* E2E938 802BC008 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC00C_E2E93C.s b/asm/nonmatchings/code_E2E5F0/func_802BC00C_E2E93C.s new file mode 100644 index 0000000000..e41336e383 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC00C_E2E93C.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC00C_E2E93C +/* E2E93C 802BC00C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E2E940 802BC010 AFBF0018 */ sw $ra, 0x18($sp) +/* E2E944 802BC014 C482004C */ lwc1 $f2, 0x4c($a0) +/* E2E948 802BC018 3C0141F0 */ lui $at, 0x41f0 +/* E2E94C 802BC01C 44810000 */ mtc1 $at, $f0 +/* E2E950 802BC020 24020013 */ addiu $v0, $zero, 0x13 +/* E2E954 802BC024 AFA20010 */ sw $v0, 0x10($sp) +/* E2E958 802BC028 AFA00014 */ sw $zero, 0x14($sp) +/* E2E95C 802BC02C 46001080 */ add.s $f2, $f2, $f0 +/* E2E960 802BC030 8C850048 */ lw $a1, 0x48($a0) +/* E2E964 802BC034 8C870050 */ lw $a3, 0x50($a0) +/* E2E968 802BC038 44061000 */ mfc1 $a2, $f2 +/* E2E96C 802BC03C 0C04C6A5 */ jal make_item_entity_nodelay +/* E2E970 802BC040 24040157 */ addiu $a0, $zero, 0x157 +/* E2E974 802BC044 8FBF0018 */ lw $ra, 0x18($sp) +/* E2E978 802BC048 03E00008 */ jr $ra +/* E2E97C 802BC04C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC050_E2E980.s b/asm/nonmatchings/code_E2E5F0/func_802BC050_E2E980.s new file mode 100644 index 0000000000..9e85d685e7 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC050_E2E980.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC050_E2E980 +/* E2E980 802BC050 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2E984 802BC054 AFB00010 */ sw $s0, 0x10($sp) +/* E2E988 802BC058 0080802D */ daddu $s0, $a0, $zero +/* E2E98C 802BC05C AFBF0014 */ sw $ra, 0x14($sp) +/* E2E990 802BC060 92020006 */ lbu $v0, 6($s0) +/* E2E994 802BC064 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* E2E998 802BC068 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* E2E99C 802BC06C 30420001 */ andi $v0, $v0, 1 +/* E2E9A0 802BC070 1040000D */ beqz $v0, .L802BC0A8 +/* E2E9A4 802BC074 00000000 */ nop +/* E2E9A8 802BC078 8C620004 */ lw $v0, 4($v1) +/* E2E9AC 802BC07C 34420004 */ ori $v0, $v0, 4 +/* E2E9B0 802BC080 0C03BCC0 */ jal func_800EF300 +/* E2E9B4 802BC084 AC620004 */ sw $v0, 4($v1) +/* E2E9B8 802BC088 8E020040 */ lw $v0, 0x40($s0) +/* E2E9BC 802BC08C 0C04417A */ jal get_entity_by_index +/* E2E9C0 802BC090 8C440000 */ lw $a0, ($v0) +/* E2E9C4 802BC094 0200202D */ daddu $a0, $s0, $zero +/* E2E9C8 802BC098 0C043F5A */ jal func_8010FD68 +/* E2E9CC 802BC09C 0040802D */ daddu $s0, $v0, $zero +/* E2E9D0 802BC0A0 0C043F5A */ jal func_8010FD68 +/* E2E9D4 802BC0A4 0200202D */ daddu $a0, $s0, $zero +.L802BC0A8: +/* E2E9D8 802BC0A8 8FBF0014 */ lw $ra, 0x14($sp) +/* E2E9DC 802BC0AC 8FB00010 */ lw $s0, 0x10($sp) +/* E2E9E0 802BC0B0 03E00008 */ jr $ra +/* E2E9E4 802BC0B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC0B8_E2E9E8.s b/asm/nonmatchings/code_E2E5F0/func_802BC0B8_E2E9E8.s new file mode 100644 index 0000000000..e52ae9d060 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC0B8_E2E9E8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC0B8_E2E9E8 +/* E2E9E8 802BC0B8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2E9EC 802BC0BC AFBF0010 */ sw $ra, 0x10($sp) +/* E2E9F0 802BC0C0 84840014 */ lh $a0, 0x14($a0) +/* E2E9F4 802BC0C4 3C050000 */ lui $a1, 0 +/* E2E9F8 802BC0C8 24A50060 */ addiu $a1, $a1, 0x60 +/* E2E9FC 802BC0CC 0C048052 */ jal play_model_animation +/* E2EA00 802BC0D0 00000000 */ nop +/* E2EA04 802BC0D4 0C03805E */ jal disable_player_input +/* E2EA08 802BC0D8 00000000 */ nop +/* E2EA0C 802BC0DC 0C038039 */ jal disable_player_shadow +/* E2EA10 802BC0E0 00000000 */ nop +/* E2EA14 802BC0E4 8FBF0010 */ lw $ra, 0x10($sp) +/* E2EA18 802BC0E8 03E00008 */ jr $ra +/* E2EA1C 802BC0EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC0F0_E2EA20.s b/asm/nonmatchings/code_E2E5F0/func_802BC0F0_E2EA20.s new file mode 100644 index 0000000000..1b126e24bd --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC0F0_E2EA20.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC0F0_E2EA20 +/* E2EA20 802BC0F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E2EA24 802BC0F4 AFB10014 */ sw $s1, 0x14($sp) +/* E2EA28 802BC0F8 0080882D */ daddu $s1, $a0, $zero +/* E2EA2C 802BC0FC AFB00010 */ sw $s0, 0x10($sp) +/* E2EA30 802BC100 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* E2EA34 802BC104 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* E2EA38 802BC108 AFBF001C */ sw $ra, 0x1c($sp) +/* E2EA3C 802BC10C AFB20018 */ sw $s2, 0x18($sp) +/* E2EA40 802BC110 C62C0048 */ lwc1 $f12, 0x48($s1) +/* E2EA44 802BC114 C62E0050 */ lwc1 $f14, 0x50($s1) +/* E2EA48 802BC118 8E060028 */ lw $a2, 0x28($s0) +/* E2EA4C 802BC11C 8E070030 */ lw $a3, 0x30($s0) +/* E2EA50 802BC120 0C00A7B5 */ jal dist2D +/* E2EA54 802BC124 8E320040 */ lw $s2, 0x40($s1) +/* E2EA58 802BC128 3C013FD0 */ lui $at, 0x3fd0 +/* E2EA5C 802BC12C 44811800 */ mtc1 $at, $f3 +/* E2EA60 802BC130 44801000 */ mtc1 $zero, $f2 +/* E2EA64 802BC134 46000021 */ cvt.d.s $f0, $f0 +/* E2EA68 802BC138 46220002 */ mul.d $f0, $f0, $f2 +/* E2EA6C 802BC13C 00000000 */ nop +/* E2EA70 802BC140 46200005 */ abs.d $f0, $f0 +/* E2EA74 802BC144 46200020 */ cvt.s.d $f0, $f0 +/* E2EA78 802BC148 E6400018 */ swc1 $f0, 0x18($s2) +/* E2EA7C 802BC14C C60C0028 */ lwc1 $f12, 0x28($s0) +/* E2EA80 802BC150 C60E0030 */ lwc1 $f14, 0x30($s0) +/* E2EA84 802BC154 8E260048 */ lw $a2, 0x48($s1) +/* E2EA88 802BC158 0C00A720 */ jal atan2 +/* E2EA8C 802BC15C 8E270050 */ lw $a3, 0x50($s1) +/* E2EA90 802BC160 E6400014 */ swc1 $f0, 0x14($s2) +/* E2EA94 802BC164 8FBF001C */ lw $ra, 0x1c($sp) +/* E2EA98 802BC168 8FB20018 */ lw $s2, 0x18($sp) +/* E2EA9C 802BC16C 8FB10014 */ lw $s1, 0x14($sp) +/* E2EAA0 802BC170 8FB00010 */ lw $s0, 0x10($sp) +/* E2EAA4 802BC174 03E00008 */ jr $ra +/* E2EAA8 802BC178 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC17C_E2EAAC.s b/asm/nonmatchings/code_E2E5F0/func_802BC17C_E2EAAC.s new file mode 100644 index 0000000000..783153909a --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC17C_E2EAAC.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC17C_E2EAAC +/* E2EAAC 802BC17C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2EAB0 802BC180 3C058011 */ lui $a1, %hi(gPlayerStatus) +/* E2EAB4 802BC184 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) +/* E2EAB8 802BC188 3C02800B */ lui $v0, %hi(gCameras) +/* E2EABC 802BC18C 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* E2EAC0 802BC190 AFBF0010 */ sw $ra, 0x10($sp) +/* E2EAC4 802BC194 8C830040 */ lw $v1, 0x40($a0) +/* E2EAC8 802BC198 C4A00028 */ lwc1 $f0, 0x28($a1) +/* E2EACC 802BC19C C4A2002C */ lwc1 $f2, 0x2c($a1) +/* E2EAD0 802BC1A0 C4A40030 */ lwc1 $f4, 0x30($a1) +/* E2EAD4 802BC1A4 24A40028 */ addiu $a0, $a1, 0x28 +/* E2EAD8 802BC1A8 E4400060 */ swc1 $f0, 0x60($v0) +/* E2EADC 802BC1AC E4420064 */ swc1 $f2, 0x64($v0) +/* E2EAE0 802BC1B0 E4440068 */ swc1 $f4, 0x68($v0) +/* E2EAE4 802BC1B4 8C660018 */ lw $a2, 0x18($v1) +/* E2EAE8 802BC1B8 8C670014 */ lw $a3, 0x14($v1) +/* E2EAEC 802BC1BC 0C00A7E7 */ jal add_vec2D_polar +/* E2EAF0 802BC1C0 24A50030 */ addiu $a1, $a1, 0x30 +/* E2EAF4 802BC1C4 8FBF0010 */ lw $ra, 0x10($sp) +/* E2EAF8 802BC1C8 03E00008 */ jr $ra +/* E2EAFC 802BC1CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC1D0_E2EB00.s b/asm/nonmatchings/code_E2E5F0/func_802BC1D0_E2EB00.s new file mode 100644 index 0000000000..00c7b774c1 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC1D0_E2EB00.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC1D0_E2EB00 +/* E2EB00 802BC1D0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E2EB04 802BC1D4 AFBF0018 */ sw $ra, 0x18($sp) +/* E2EB08 802BC1D8 C4840048 */ lwc1 $f4, 0x48($a0) +/* E2EB0C 802BC1DC C486004C */ lwc1 $f6, 0x4c($a0) +/* E2EB10 802BC1E0 C4800064 */ lwc1 $f0, 0x64($a0) +/* E2EB14 802BC1E4 C4820050 */ lwc1 $f2, 0x50($a0) +/* E2EB18 802BC1E8 00A0202D */ daddu $a0, $a1, $zero +/* E2EB1C 802BC1EC 4600020D */ trunc.w.s $f8, $f0 +/* E2EB20 802BC1F0 E7A80010 */ swc1 $f8, 0x10($sp) +/* E2EB24 802BC1F4 4600220D */ trunc.w.s $f8, $f4 +/* E2EB28 802BC1F8 44054000 */ mfc1 $a1, $f8 +/* E2EB2C 802BC1FC 4600320D */ trunc.w.s $f8, $f6 +/* E2EB30 802BC200 44064000 */ mfc1 $a2, $f8 +/* E2EB34 802BC204 4600120D */ trunc.w.s $f8, $f2 +/* E2EB38 802BC208 44074000 */ mfc1 $a3, $f8 +/* E2EB3C 802BC20C 0C044631 */ jal create_entity +/* E2EB40 802BC210 00000000 */ nop +/* E2EB44 802BC214 8FBF0018 */ lw $ra, 0x18($sp) +/* E2EB48 802BC218 03E00008 */ jr $ra +/* E2EB4C 802BC21C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC220_E2EB50.s b/asm/nonmatchings/code_E2E5F0/func_802BC220_E2EB50.s new file mode 100644 index 0000000000..1af042c0fd --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC220_E2EB50.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC220_E2EB50 +/* E2EB50 802BC220 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2EB54 802BC224 3C05802C */ lui $a1, %hi(D_802BCC44) +/* E2EB58 802BC228 24A5CC44 */ addiu $a1, $a1, %lo(D_802BCC44) +/* E2EB5C 802BC22C AFBF0014 */ sw $ra, 0x14($sp) +/* E2EB60 802BC230 AFB00010 */ sw $s0, 0x10($sp) +/* E2EB64 802BC234 0C0AF074 */ jal func_802BC1D0_E2EB00 +/* E2EB68 802BC238 8C900040 */ lw $s0, 0x40($a0) +/* E2EB6C 802BC23C AE020000 */ sw $v0, ($s0) +/* E2EB70 802BC240 8FBF0014 */ lw $ra, 0x14($sp) +/* E2EB74 802BC244 8FB00010 */ lw $s0, 0x10($sp) +/* E2EB78 802BC248 03E00008 */ jr $ra +/* E2EB7C 802BC24C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC250_E2EB80.s b/asm/nonmatchings/code_E2E5F0/func_802BC250_E2EB80.s new file mode 100644 index 0000000000..ee56fa8df9 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC250_E2EB80.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC250_E2EB80 +/* E2EB80 802BC250 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2EB84 802BC254 3C05802C */ lui $a1, %hi(D_802BCC68) +/* E2EB88 802BC258 24A5CC68 */ addiu $a1, $a1, %lo(D_802BCC68) +/* E2EB8C 802BC25C AFBF0010 */ sw $ra, 0x10($sp) +/* E2EB90 802BC260 0C0AF074 */ jal func_802BC1D0_E2EB00 +/* E2EB94 802BC264 00000000 */ nop +/* E2EB98 802BC268 8FBF0010 */ lw $ra, 0x10($sp) +/* E2EB9C 802BC26C 03E00008 */ jr $ra +/* E2EBA0 802BC270 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC274_E2EBA4.s b/asm/nonmatchings/code_E2E5F0/func_802BC274_E2EBA4.s new file mode 100644 index 0000000000..ca7b1db991 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC274_E2EBA4.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC274_E2EBA4 +/* E2EBA4 802BC274 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2EBA8 802BC278 AFB00010 */ sw $s0, 0x10($sp) +/* E2EBAC 802BC27C 0080802D */ daddu $s0, $a0, $zero +/* E2EBB0 802BC280 AFBF0014 */ sw $ra, 0x14($sp) +/* E2EBB4 802BC284 0C03A8CD */ jal subtract_hp +/* E2EBB8 802BC288 24040001 */ addiu $a0, $zero, 1 +/* E2EBBC 802BC28C 3C05802C */ lui $a1, %hi(D_802BCC8C) +/* E2EBC0 802BC290 24A5CC8C */ addiu $a1, $a1, %lo(D_802BCC8C) +/* E2EBC4 802BC294 0C0AF074 */ jal func_802BC1D0_E2EB00 +/* E2EBC8 802BC298 0200202D */ daddu $a0, $s0, $zero +/* E2EBCC 802BC29C 0C039769 */ jal set_action_state +/* E2EBD0 802BC2A0 24040026 */ addiu $a0, $zero, 0x26 +/* E2EBD4 802BC2A4 8FBF0014 */ lw $ra, 0x14($sp) +/* E2EBD8 802BC2A8 8FB00010 */ lw $s0, 0x10($sp) +/* E2EBDC 802BC2AC 03E00008 */ jr $ra +/* E2EBE0 802BC2B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC2B4_E2EBE4.s b/asm/nonmatchings/code_E2E5F0/func_802BC2B4_E2EBE4.s new file mode 100644 index 0000000000..ee9dd75511 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC2B4_E2EBE4.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC2B4_E2EBE4 +/* E2EBE4 802BC2B4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2EBE8 802BC2B8 3C05802C */ lui $a1, %hi(D_802BCCB0) +/* E2EBEC 802BC2BC 24A5CCB0 */ addiu $a1, $a1, %lo(D_802BCCB0) +/* E2EBF0 802BC2C0 AFBF0010 */ sw $ra, 0x10($sp) +/* E2EBF4 802BC2C4 0C0AF074 */ jal func_802BC1D0_E2EB00 +/* E2EBF8 802BC2C8 00000000 */ nop +/* E2EBFC 802BC2CC 3C027FFF */ lui $v0, 0x7fff +/* E2EC00 802BC2D0 3442FFFF */ ori $v0, $v0, 0xffff +/* E2EC04 802BC2D4 3C040008 */ lui $a0, 8 +/* E2EC08 802BC2D8 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* E2EC0C 802BC2DC 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* E2EC10 802BC2E0 8C650000 */ lw $a1, ($v1) +/* E2EC14 802BC2E4 3484001F */ ori $a0, $a0, 0x1f +/* E2EC18 802BC2E8 A06000B5 */ sb $zero, 0xb5($v1) +/* E2EC1C 802BC2EC A06000B4 */ sb $zero, 0xb4($v1) +/* E2EC20 802BC2F0 00A22824 */ and $a1, $a1, $v0 +/* E2EC24 802BC2F4 0C037FDE */ jal func_800DFF78 +/* E2EC28 802BC2F8 AC650000 */ sw $a1, ($v1) +/* E2EC2C 802BC2FC 8FBF0010 */ lw $ra, 0x10($sp) +/* E2EC30 802BC300 03E00008 */ jr $ra +/* E2EC34 802BC304 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC308_E2EC38.s b/asm/nonmatchings/code_E2E5F0/func_802BC308_E2EC38.s new file mode 100644 index 0000000000..ab2db49af6 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC308_E2EC38.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC308_E2EC38 +/* E2EC38 802BC308 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2EC3C 802BC30C 3C05802C */ lui $a1, %hi(D_802BCCD4) +/* E2EC40 802BC310 24A5CCD4 */ addiu $a1, $a1, %lo(D_802BCCD4) +/* E2EC44 802BC314 AFBF0010 */ sw $ra, 0x10($sp) +/* E2EC48 802BC318 0C0AF074 */ jal func_802BC1D0_E2EB00 +/* E2EC4C 802BC31C 00000000 */ nop +/* E2EC50 802BC320 8FBF0010 */ lw $ra, 0x10($sp) +/* E2EC54 802BC324 03E00008 */ jr $ra +/* E2EC58 802BC328 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC32C_E2EC5C.s b/asm/nonmatchings/code_E2E5F0/func_802BC32C_E2EC5C.s new file mode 100644 index 0000000000..cbb8ae7551 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC32C_E2EC5C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC32C_E2EC5C +/* E2EC5C 802BC32C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2EC60 802BC330 3C05802C */ lui $a1, %hi(D_802BCCF8) +/* E2EC64 802BC334 24A5CCF8 */ addiu $a1, $a1, %lo(D_802BCCF8) +/* E2EC68 802BC338 AFBF0010 */ sw $ra, 0x10($sp) +/* E2EC6C 802BC33C 0C0AF074 */ jal func_802BC1D0_E2EB00 +/* E2EC70 802BC340 00000000 */ nop +/* E2EC74 802BC344 0C03BCCA */ jal enable_partner_ai +/* E2EC78 802BC348 00000000 */ nop +/* E2EC7C 802BC34C 8FBF0010 */ lw $ra, 0x10($sp) +/* E2EC80 802BC350 03E00008 */ jr $ra +/* E2EC84 802BC354 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC358_E2EC88.s b/asm/nonmatchings/code_E2E5F0/func_802BC358_E2EC88.s new file mode 100644 index 0000000000..a35436f148 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC358_E2EC88.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC358_E2EC88 +/* E2EC88 802BC358 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2EC8C 802BC35C 3C05802C */ lui $a1, %hi(D_802BCD1C) +/* E2EC90 802BC360 24A5CD1C */ addiu $a1, $a1, %lo(D_802BCD1C) +/* E2EC94 802BC364 AFBF0010 */ sw $ra, 0x10($sp) +/* E2EC98 802BC368 0C0AF074 */ jal func_802BC1D0_E2EB00 +/* E2EC9C 802BC36C 00000000 */ nop +/* E2ECA0 802BC370 8FBF0010 */ lw $ra, 0x10($sp) +/* E2ECA4 802BC374 03E00008 */ jr $ra +/* E2ECA8 802BC378 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC37C_E2ECAC.s b/asm/nonmatchings/code_E2E5F0/func_802BC37C_E2ECAC.s new file mode 100644 index 0000000000..000ff70d86 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC37C_E2ECAC.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC37C_E2ECAC +/* E2ECAC 802BC37C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2ECB0 802BC380 3C05802C */ lui $a1, %hi(D_802BCD40) +/* E2ECB4 802BC384 24A5CD40 */ addiu $a1, $a1, %lo(D_802BCD40) +/* E2ECB8 802BC388 AFBF0010 */ sw $ra, 0x10($sp) +/* E2ECBC 802BC38C 0C0AF074 */ jal func_802BC1D0_E2EB00 +/* E2ECC0 802BC390 00000000 */ nop +/* E2ECC4 802BC394 8FBF0010 */ lw $ra, 0x10($sp) +/* E2ECC8 802BC398 03E00008 */ jr $ra +/* E2ECCC 802BC39C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC3A0_E2ECD0.s b/asm/nonmatchings/code_E2E5F0/func_802BC3A0_E2ECD0.s new file mode 100644 index 0000000000..5c7250f3bb --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC3A0_E2ECD0.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC3A0_E2ECD0 +/* E2ECD0 802BC3A0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2ECD4 802BC3A4 AFBF0010 */ sw $ra, 0x10($sp) +/* E2ECD8 802BC3A8 0C038069 */ jal enable_player_input +/* E2ECDC 802BC3AC 00000000 */ nop +/* E2ECE0 802BC3B0 0C03802C */ jal enable_player_shadow +/* E2ECE4 802BC3B4 00000000 */ nop +/* E2ECE8 802BC3B8 0C039769 */ jal set_action_state +/* E2ECEC 802BC3BC 2404001E */ addiu $a0, $zero, 0x1e +/* E2ECF0 802BC3C0 8FBF0010 */ lw $ra, 0x10($sp) +/* E2ECF4 802BC3C4 03E00008 */ jr $ra +/* E2ECF8 802BC3C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC3CC_E2ECFC.s b/asm/nonmatchings/code_E2E5F0/func_802BC3CC_E2ECFC.s new file mode 100644 index 0000000000..735883e7ed --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC3CC_E2ECFC.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC3CC_E2ECFC +/* E2ECFC 802BC3CC 8C820040 */ lw $v0, 0x40($a0) +/* E2ED00 802BC3D0 3C018011 */ lui $at, %hi(gPlayerStatus+0x2C) +/* E2ED04 802BC3D4 C420EFF4 */ lwc1 $f0, %lo(gPlayerStatus+0x2C)($at) +/* E2ED08 802BC3D8 E440000C */ swc1 $f0, 0xc($v0) +/* E2ED0C 802BC3DC 03E00008 */ jr $ra +/* E2ED10 802BC3E0 AC400010 */ sw $zero, 0x10($v0) diff --git a/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s b/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s new file mode 100644 index 0000000000..0a1c7e5f55 --- /dev/null +++ b/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s @@ -0,0 +1,57 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC3E4_E2ED14 +/* E2ED14 802BC3E4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E2ED18 802BC3E8 AFBF0014 */ sw $ra, 0x14($sp) +/* E2ED1C 802BC3EC AFB00010 */ sw $s0, 0x10($sp) +/* E2ED20 802BC3F0 F7B40018 */ sdc1 $f20, 0x18($sp) +/* E2ED24 802BC3F4 8C900040 */ lw $s0, 0x40($a0) +/* E2ED28 802BC3F8 3C0140C9 */ lui $at, 0x40c9 +/* E2ED2C 802BC3FC 34210FD0 */ ori $at, $at, 0xfd0 +/* E2ED30 802BC400 44810000 */ mtc1 $at, $f0 +/* E2ED34 802BC404 C60C0010 */ lwc1 $f12, 0x10($s0) +/* E2ED38 802BC408 46006302 */ mul.s $f12, $f12, $f0 +/* E2ED3C 802BC40C 00000000 */ nop +/* E2ED40 802BC410 3C0143B4 */ lui $at, 0x43b4 +/* E2ED44 802BC414 4481A000 */ mtc1 $at, $f20 +/* E2ED48 802BC418 0C00A85B */ jal sin_rad +/* E2ED4C 802BC41C 46146303 */ div.s $f12, $f12, $f20 +/* E2ED50 802BC420 3C014040 */ lui $at, 0x4040 +/* E2ED54 802BC424 44811000 */ mtc1 $at, $f2 +/* E2ED58 802BC428 00000000 */ nop +/* E2ED5C 802BC42C 46020002 */ mul.s $f0, $f0, $f2 +/* E2ED60 802BC430 00000000 */ nop +/* E2ED64 802BC434 C602000C */ lwc1 $f2, 0xc($s0) +/* E2ED68 802BC438 46001080 */ add.s $f2, $f2, $f0 +/* E2ED6C 802BC43C 3C0141C0 */ lui $at, 0x41c0 +/* E2ED70 802BC440 44810000 */ mtc1 $at, $f0 +/* E2ED74 802BC444 3C018011 */ lui $at, %hi(gPlayerStatus+0x2C) +/* E2ED78 802BC448 E422EFF4 */ swc1 $f2, %lo(gPlayerStatus+0x2C)($at) +/* E2ED7C 802BC44C C6020010 */ lwc1 $f2, 0x10($s0) +/* E2ED80 802BC450 46001000 */ add.s $f0, $f2, $f0 +/* E2ED84 802BC454 4600A03C */ c.lt.s $f20, $f0 +/* E2ED88 802BC458 00000000 */ nop +/* E2ED8C 802BC45C 45000003 */ bc1f .L802BC46C +/* E2ED90 802BC460 E6000010 */ swc1 $f0, 0x10($s0) +/* E2ED94 802BC464 46140001 */ sub.s $f0, $f0, $f20 +/* E2ED98 802BC468 E6000010 */ swc1 $f0, 0x10($s0) +.L802BC46C: +/* E2ED9C 802BC46C C6020010 */ lwc1 $f2, 0x10($s0) +/* E2EDA0 802BC470 3C0142C0 */ lui $at, 0x42c0 +/* E2EDA4 802BC474 44810000 */ mtc1 $at, $f0 +/* E2EDA8 802BC478 00000000 */ nop +/* E2EDAC 802BC47C 46001032 */ c.eq.s $f2, $f0 +/* E2EDB0 802BC480 00000000 */ nop +/* E2EDB4 802BC484 45000003 */ bc1f .L802BC494 +/* E2EDB8 802BC488 00000000 */ nop +/* E2EDBC 802BC48C 0C05272D */ jal play_sound +/* E2EDC0 802BC490 24040392 */ addiu $a0, $zero, 0x392 +.L802BC494: +/* E2EDC4 802BC494 8FBF0014 */ lw $ra, 0x14($sp) +/* E2EDC8 802BC498 8FB00010 */ lw $s0, 0x10($sp) +/* E2EDCC 802BC49C D7B40018 */ ldc1 $f20, 0x18($sp) +/* E2EDD0 802BC4A0 03E00008 */ jr $ra +/* E2EDD4 802BC4A4 27BD0020 */ addiu $sp, $sp, 0x20 +/* E2EDD8 802BC4A8 00000000 */ nop +/* E2EDDC 802BC4AC 00000000 */ nop diff --git a/asm/nonmatchings/code_E2EDE0/func_802BC4B0_E2EDE0.s b/asm/nonmatchings/code_E2EDE0/func_802BC4B0_E2EDE0.s new file mode 100644 index 0000000000..b8f1bae3c9 --- /dev/null +++ b/asm/nonmatchings/code_E2EDE0/func_802BC4B0_E2EDE0.s @@ -0,0 +1,98 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC4B0_E2EDE0 +/* E2EDE0 802BC4B0 27BDFF48 */ addiu $sp, $sp, -0xb8 +/* E2EDE4 802BC4B4 AFB500AC */ sw $s5, 0xac($sp) +/* E2EDE8 802BC4B8 3C15800A */ lui $s5, %hi(gMasterGfxPos) +/* E2EDEC 802BC4BC 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) +/* E2EDF0 802BC4C0 AFBF00B0 */ sw $ra, 0xb0($sp) +/* E2EDF4 802BC4C4 AFB400A8 */ sw $s4, 0xa8($sp) +/* E2EDF8 802BC4C8 AFB300A4 */ sw $s3, 0xa4($sp) +/* E2EDFC 802BC4CC AFB200A0 */ sw $s2, 0xa0($sp) +/* E2EE00 802BC4D0 AFB1009C */ sw $s1, 0x9c($sp) +/* E2EE04 802BC4D4 AFB00098 */ sw $s0, 0x98($sp) +/* E2EE08 802BC4D8 8EB10000 */ lw $s1, ($s5) +/* E2EE0C 802BC4DC 0C04417A */ jal get_entity_by_index +/* E2EE10 802BC4E0 3C140001 */ lui $s4, 1 +/* E2EE14 802BC4E4 27A40018 */ addiu $a0, $sp, 0x18 +/* E2EE18 802BC4E8 0040902D */ daddu $s2, $v0, $zero +/* E2EE1C 802BC4EC 3C050A00 */ lui $a1, 0xa00 +/* E2EE20 802BC4F0 24A50B28 */ addiu $a1, $a1, 0xb28 +/* E2EE24 802BC4F4 30A5FFFF */ andi $a1, $a1, 0xffff +/* E2EE28 802BC4F8 8E420044 */ lw $v0, 0x44($s2) +/* E2EE2C 802BC4FC 8E500040 */ lw $s0, 0x40($s2) +/* E2EE30 802BC500 0C019D60 */ jal guMtxL2F +/* E2EE34 802BC504 00452821 */ addu $a1, $v0, $a1 +/* E2EE38 802BC508 C6000004 */ lwc1 $f0, 4($s0) +/* E2EE3C 802BC50C 3C0142B4 */ lui $at, 0x42b4 +/* E2EE40 802BC510 44816000 */ mtc1 $at, $f12 +/* E2EE44 802BC514 00000000 */ nop +/* E2EE48 802BC518 460C0301 */ sub.s $f12, $f0, $f12 +/* E2EE4C 802BC51C 0C00A6C9 */ jal clamp_angle +/* E2EE50 802BC520 36941630 */ ori $s4, $s4, 0x1630 +/* E2EE54 802BC524 27B00058 */ addiu $s0, $sp, 0x58 +/* E2EE58 802BC528 44801000 */ mtc1 $zero, $f2 +/* E2EE5C 802BC52C 44050000 */ mfc1 $a1, $f0 +/* E2EE60 802BC530 3C013F80 */ lui $at, 0x3f80 +/* E2EE64 802BC534 44810000 */ mtc1 $at, $f0 +/* E2EE68 802BC538 44061000 */ mfc1 $a2, $f2 +/* E2EE6C 802BC53C 0200202D */ daddu $a0, $s0, $zero +/* E2EE70 802BC540 E7A00010 */ swc1 $f0, 0x10($sp) +/* E2EE74 802BC544 0C019EC8 */ jal guRotateF +/* E2EE78 802BC548 00C0382D */ daddu $a3, $a2, $zero +/* E2EE7C 802BC54C 0200202D */ daddu $a0, $s0, $zero +/* E2EE80 802BC550 27A50018 */ addiu $a1, $sp, 0x18 +/* E2EE84 802BC554 0C019D80 */ jal guMtxCatF +/* E2EE88 802BC558 00A0302D */ daddu $a2, $a1, $zero +/* E2EE8C 802BC55C 27A40018 */ addiu $a0, $sp, 0x18 +/* E2EE90 802BC560 3C108007 */ lui $s0, %hi(gMatrixListPos) +/* E2EE94 802BC564 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) +/* E2EE98 802BC568 3C13800A */ lui $s3, %hi(gDisplayContext) +/* E2EE9C 802BC56C 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) +/* E2EEA0 802BC570 96050000 */ lhu $a1, ($s0) +/* E2EEA4 802BC574 8E620000 */ lw $v0, ($s3) +/* E2EEA8 802BC578 00052980 */ sll $a1, $a1, 6 +/* E2EEAC 802BC57C 00B42821 */ addu $a1, $a1, $s4 +/* E2EEB0 802BC580 0C019D40 */ jal guMtxF2L +/* E2EEB4 802BC584 00452821 */ addu $a1, $v0, $a1 +/* E2EEB8 802BC588 0220202D */ daddu $a0, $s1, $zero +/* E2EEBC 802BC58C 26310008 */ addiu $s1, $s1, 8 +/* E2EEC0 802BC590 0220282D */ daddu $a1, $s1, $zero +/* E2EEC4 802BC594 26310008 */ addiu $s1, $s1, 8 +/* E2EEC8 802BC598 0220302D */ daddu $a2, $s1, $zero +/* E2EECC 802BC59C 26310008 */ addiu $s1, $s1, 8 +/* E2EED0 802BC5A0 3C07D838 */ lui $a3, 0xd838 +/* E2EED4 802BC5A4 34E70002 */ ori $a3, $a3, 2 +/* E2EED8 802BC5A8 96020000 */ lhu $v0, ($s0) +/* E2EEDC 802BC5AC 3C03DA38 */ lui $v1, 0xda38 +/* E2EEE0 802BC5B0 AC830000 */ sw $v1, ($a0) +/* E2EEE4 802BC5B4 AEB10000 */ sw $s1, ($s5) +/* E2EEE8 802BC5B8 24430001 */ addiu $v1, $v0, 1 +/* E2EEEC 802BC5BC 3042FFFF */ andi $v0, $v0, 0xffff +/* E2EEF0 802BC5C0 00021180 */ sll $v0, $v0, 6 +/* E2EEF4 802BC5C4 A6030000 */ sh $v1, ($s0) +/* E2EEF8 802BC5C8 8E630000 */ lw $v1, ($s3) +/* E2EEFC 802BC5CC 00541021 */ addu $v0, $v0, $s4 +/* E2EF00 802BC5D0 00621821 */ addu $v1, $v1, $v0 +/* E2EF04 802BC5D4 AC830004 */ sw $v1, 4($a0) +/* E2EF08 802BC5D8 8E430044 */ lw $v1, 0x44($s2) +/* E2EF0C 802BC5DC 3C02DE00 */ lui $v0, 0xde00 +/* E2EF10 802BC5E0 ACA20000 */ sw $v0, ($a1) +/* E2EF14 802BC5E4 3C020A00 */ lui $v0, 0xa00 +/* E2EF18 802BC5E8 24420BC8 */ addiu $v0, $v0, 0xbc8 +/* E2EF1C 802BC5EC 3042FFFF */ andi $v0, $v0, 0xffff +/* E2EF20 802BC5F0 00621821 */ addu $v1, $v1, $v0 +/* E2EF24 802BC5F4 24020040 */ addiu $v0, $zero, 0x40 +/* E2EF28 802BC5F8 ACA30004 */ sw $v1, 4($a1) +/* E2EF2C 802BC5FC ACC70000 */ sw $a3, ($a2) +/* E2EF30 802BC600 ACC20004 */ sw $v0, 4($a2) +/* E2EF34 802BC604 8FBF00B0 */ lw $ra, 0xb0($sp) +/* E2EF38 802BC608 8FB500AC */ lw $s5, 0xac($sp) +/* E2EF3C 802BC60C 8FB400A8 */ lw $s4, 0xa8($sp) +/* E2EF40 802BC610 8FB300A4 */ lw $s3, 0xa4($sp) +/* E2EF44 802BC614 8FB200A0 */ lw $s2, 0xa0($sp) +/* E2EF48 802BC618 8FB1009C */ lw $s1, 0x9c($sp) +/* E2EF4C 802BC61C 8FB00098 */ lw $s0, 0x98($sp) +/* E2EF50 802BC620 03E00008 */ jr $ra +/* E2EF54 802BC624 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/asm/nonmatchings/code_E2EDE0/func_802BC628_E2EF58.s b/asm/nonmatchings/code_E2EDE0/func_802BC628_E2EF58.s new file mode 100644 index 0000000000..7d9c55c77a --- /dev/null +++ b/asm/nonmatchings/code_E2EDE0/func_802BC628_E2EF58.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC628_E2EF58 +/* E2EF58 802BC628 03E00008 */ jr $ra +/* E2EF5C 802BC62C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2EDE0/func_802BC630_E2EF60.s b/asm/nonmatchings/code_E2EDE0/func_802BC630_E2EF60.s new file mode 100644 index 0000000000..46c700ed4b --- /dev/null +++ b/asm/nonmatchings/code_E2EDE0/func_802BC630_E2EF60.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC630_E2EF60 +/* E2EF60 802BC630 8C820040 */ lw $v0, 0x40($a0) +/* E2EF64 802BC634 3C018016 */ lui $at, %hi(D_8015C7D0) +/* E2EF68 802BC638 C420C7D0 */ lwc1 $f0, %lo(D_8015C7D0)($at) +/* E2EF6C 802BC63C 46800020 */ cvt.s.w $f0, $f0 +/* E2EF70 802BC640 E4400004 */ swc1 $f0, 4($v0) +/* E2EF74 802BC644 E4400008 */ swc1 $f0, 8($v0) +/* E2EF78 802BC648 3C02802C */ lui $v0, %hi(func_802BC4B0_E2EDE0) +/* E2EF7C 802BC64C 2442C4B0 */ addiu $v0, $v0, %lo(func_802BC4B0_E2EDE0) +/* E2EF80 802BC650 03E00008 */ jr $ra +/* E2EF84 802BC654 AC82003C */ sw $v0, 0x3c($a0) diff --git a/asm/nonmatchings/code_E2EDE0/func_802BC658_E2EF88.s b/asm/nonmatchings/code_E2EDE0/func_802BC658_E2EF88.s new file mode 100644 index 0000000000..36d8828fe7 --- /dev/null +++ b/asm/nonmatchings/code_E2EDE0/func_802BC658_E2EF88.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC658_E2EF88 +/* E2EF88 802BC658 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) +/* E2EF8C 802BC65C 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) +/* E2EF90 802BC660 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E2EF94 802BC664 30420001 */ andi $v0, $v0, 1 +/* E2EF98 802BC668 14400007 */ bnez $v0, .L802BC688 +/* E2EF9C 802BC66C AFBF0010 */ sw $ra, 0x10($sp) +/* E2EFA0 802BC670 90820006 */ lbu $v0, 6($a0) +/* E2EFA4 802BC674 30420008 */ andi $v0, $v0, 8 +/* E2EFA8 802BC678 10400003 */ beqz $v0, .L802BC688 +/* E2EFAC 802BC67C 00000000 */ nop +/* E2EFB0 802BC680 0C04419E */ jal func_80110678 +/* E2EFB4 802BC684 00000000 */ nop +.L802BC688: +/* E2EFB8 802BC688 8FBF0010 */ lw $ra, 0x10($sp) +/* E2EFBC 802BC68C 03E00008 */ jr $ra +/* E2EFC0 802BC690 27BD0018 */ addiu $sp, $sp, 0x18 +/* E2EFC4 802BC694 00000000 */ nop +/* E2EFC8 802BC698 00000000 */ nop +/* E2EFCC 802BC69C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2F750/func_802BAE00_E2F750.s b/asm/nonmatchings/code_E2F750/func_802BAE00_E2F750.s new file mode 100644 index 0000000000..b2264e04d9 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BAE00_E2F750.s @@ -0,0 +1,102 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BAE00_E2F750 +/* E2F750 802BAE00 27BDFF58 */ addiu $sp, $sp, -0xa8 +/* E2F754 802BAE04 AFBF00A4 */ sw $ra, 0xa4($sp) +/* E2F758 802BAE08 AFB200A0 */ sw $s2, 0xa0($sp) +/* E2F75C 802BAE0C AFB1009C */ sw $s1, 0x9c($sp) +/* E2F760 802BAE10 0C04417A */ jal get_entity_by_index +/* E2F764 802BAE14 AFB00098 */ sw $s0, 0x98($sp) +/* E2F768 802BAE18 27A40018 */ addiu $a0, $sp, 0x18 +/* E2F76C 802BAE1C 0040902D */ daddu $s2, $v0, $zero +/* E2F770 802BAE20 3C050A00 */ lui $a1, 0xa00 +/* E2F774 802BAE24 24A51968 */ addiu $a1, $a1, 0x1968 +/* E2F778 802BAE28 30A5FFFF */ andi $a1, $a1, 0xffff +/* E2F77C 802BAE2C 8E420044 */ lw $v0, 0x44($s2) +/* E2F780 802BAE30 8E510040 */ lw $s1, 0x40($s2) +/* E2F784 802BAE34 0C019D60 */ jal guMtxL2F +/* E2F788 802BAE38 00452821 */ addu $a1, $v0, $a1 +/* E2F78C 802BAE3C 44800000 */ mtc1 $zero, $f0 +/* E2F790 802BAE40 3C073F80 */ lui $a3, 0x3f80 +/* E2F794 802BAE44 27B00058 */ addiu $s0, $sp, 0x58 +/* E2F798 802BAE48 E7A00010 */ swc1 $f0, 0x10($sp) +/* E2F79C 802BAE4C 8E250008 */ lw $a1, 8($s1) +/* E2F7A0 802BAE50 44060000 */ mfc1 $a2, $f0 +/* E2F7A4 802BAE54 0C019EC8 */ jal guRotateF +/* E2F7A8 802BAE58 0200202D */ daddu $a0, $s0, $zero +/* E2F7AC 802BAE5C 0200202D */ daddu $a0, $s0, $zero +/* E2F7B0 802BAE60 27A50018 */ addiu $a1, $sp, 0x18 +/* E2F7B4 802BAE64 0C019D80 */ jal guMtxCatF +/* E2F7B8 802BAE68 00A0302D */ daddu $a2, $a1, $zero +/* E2F7BC 802BAE6C 27A40018 */ addiu $a0, $sp, 0x18 +/* E2F7C0 802BAE70 26300010 */ addiu $s0, $s1, 0x10 +/* E2F7C4 802BAE74 0C019D40 */ jal guMtxF2L +/* E2F7C8 802BAE78 0200282D */ daddu $a1, $s0, $zero +/* E2F7CC 802BAE7C 3C040001 */ lui $a0, 1 +/* E2F7D0 802BAE80 34841630 */ ori $a0, $a0, 0x1630 +/* E2F7D4 802BAE84 26310050 */ addiu $s1, $s1, 0x50 +/* E2F7D8 802BAE88 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* E2F7DC 802BAE8C 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) +/* E2F7E0 802BAE90 3C03800A */ lui $v1, %hi(gDisplayContext) +/* E2F7E4 802BAE94 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) +/* E2F7E8 802BAE98 00021180 */ sll $v0, $v0, 6 +/* E2F7EC 802BAE9C 00621821 */ addu $v1, $v1, $v0 +/* E2F7F0 802BAEA0 00641821 */ addu $v1, $v1, $a0 +.L802BAEA4: +/* E2F7F4 802BAEA4 8E0A0000 */ lw $t2, ($s0) +/* E2F7F8 802BAEA8 8E0B0004 */ lw $t3, 4($s0) +/* E2F7FC 802BAEAC 8E0C0008 */ lw $t4, 8($s0) +/* E2F800 802BAEB0 8E0D000C */ lw $t5, 0xc($s0) +/* E2F804 802BAEB4 AC6A0000 */ sw $t2, ($v1) +/* E2F808 802BAEB8 AC6B0004 */ sw $t3, 4($v1) +/* E2F80C 802BAEBC AC6C0008 */ sw $t4, 8($v1) +/* E2F810 802BAEC0 AC6D000C */ sw $t5, 0xc($v1) +/* E2F814 802BAEC4 26100010 */ addiu $s0, $s0, 0x10 +/* E2F818 802BAEC8 1611FFF6 */ bne $s0, $s1, .L802BAEA4 +/* E2F81C 802BAECC 24630010 */ addiu $v1, $v1, 0x10 +/* E2F820 802BAED0 3C080001 */ lui $t0, 1 +/* E2F824 802BAED4 35081630 */ ori $t0, $t0, 0x1630 +/* E2F828 802BAED8 3C09D838 */ lui $t1, 0xd838 +/* E2F82C 802BAEDC 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* E2F830 802BAEE0 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) +/* E2F834 802BAEE4 35290002 */ ori $t1, $t1, 2 +/* E2F838 802BAEE8 8CC40000 */ lw $a0, ($a2) +/* E2F83C 802BAEEC 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* E2F840 802BAEF0 24A541F0 */ addiu $a1, $a1, %lo(gMatrixListPos) +/* E2F844 802BAEF4 0080382D */ daddu $a3, $a0, $zero +/* E2F848 802BAEF8 24840008 */ addiu $a0, $a0, 8 +/* E2F84C 802BAEFC ACC40000 */ sw $a0, ($a2) +/* E2F850 802BAF00 94A20000 */ lhu $v0, ($a1) +/* E2F854 802BAF04 3C03DA38 */ lui $v1, 0xda38 +/* E2F858 802BAF08 ACE30000 */ sw $v1, ($a3) +/* E2F85C 802BAF0C 24430001 */ addiu $v1, $v0, 1 +/* E2F860 802BAF10 3042FFFF */ andi $v0, $v0, 0xffff +/* E2F864 802BAF14 00021180 */ sll $v0, $v0, 6 +/* E2F868 802BAF18 A4A30000 */ sh $v1, ($a1) +/* E2F86C 802BAF1C 3C03800A */ lui $v1, %hi(gDisplayContext) +/* E2F870 802BAF20 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) +/* E2F874 802BAF24 00481021 */ addu $v0, $v0, $t0 +/* E2F878 802BAF28 00621821 */ addu $v1, $v1, $v0 +/* E2F87C 802BAF2C 24820008 */ addiu $v0, $a0, 8 +/* E2F880 802BAF30 ACE30004 */ sw $v1, 4($a3) +/* E2F884 802BAF34 ACC20000 */ sw $v0, ($a2) +/* E2F888 802BAF38 8E430044 */ lw $v1, 0x44($s2) +/* E2F88C 802BAF3C 3C02DE00 */ lui $v0, 0xde00 +/* E2F890 802BAF40 AC820000 */ sw $v0, ($a0) +/* E2F894 802BAF44 24820010 */ addiu $v0, $a0, 0x10 +/* E2F898 802BAF48 ACC20000 */ sw $v0, ($a2) +/* E2F89C 802BAF4C 24020040 */ addiu $v0, $zero, 0x40 +/* E2F8A0 802BAF50 AC82000C */ sw $v0, 0xc($a0) +/* E2F8A4 802BAF54 3C020A00 */ lui $v0, 0xa00 +/* E2F8A8 802BAF58 24421CF0 */ addiu $v0, $v0, 0x1cf0 +/* E2F8AC 802BAF5C 3042FFFF */ andi $v0, $v0, 0xffff +/* E2F8B0 802BAF60 AC890008 */ sw $t1, 8($a0) +/* E2F8B4 802BAF64 00621821 */ addu $v1, $v1, $v0 +/* E2F8B8 802BAF68 AC830004 */ sw $v1, 4($a0) +/* E2F8BC 802BAF6C 8FBF00A4 */ lw $ra, 0xa4($sp) +/* E2F8C0 802BAF70 8FB200A0 */ lw $s2, 0xa0($sp) +/* E2F8C4 802BAF74 8FB1009C */ lw $s1, 0x9c($sp) +/* E2F8C8 802BAF78 8FB00098 */ lw $s0, 0x98($sp) +/* E2F8CC 802BAF7C 03E00008 */ jr $ra +/* E2F8D0 802BAF80 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/asm/nonmatchings/code_E2F750/func_802BAF84_E2F8D4.s b/asm/nonmatchings/code_E2F750/func_802BAF84_E2F8D4.s new file mode 100644 index 0000000000..dbbfbbc7d9 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BAF84_E2F8D4.s @@ -0,0 +1,102 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BAF84_E2F8D4 +/* E2F8D4 802BAF84 27BDFF58 */ addiu $sp, $sp, -0xa8 +/* E2F8D8 802BAF88 AFBF00A4 */ sw $ra, 0xa4($sp) +/* E2F8DC 802BAF8C AFB200A0 */ sw $s2, 0xa0($sp) +/* E2F8E0 802BAF90 AFB1009C */ sw $s1, 0x9c($sp) +/* E2F8E4 802BAF94 0C04417A */ jal get_entity_by_index +/* E2F8E8 802BAF98 AFB00098 */ sw $s0, 0x98($sp) +/* E2F8EC 802BAF9C 27A40018 */ addiu $a0, $sp, 0x18 +/* E2F8F0 802BAFA0 0040902D */ daddu $s2, $v0, $zero +/* E2F8F4 802BAFA4 3C050A00 */ lui $a1, 0xa00 +/* E2F8F8 802BAFA8 24A519A8 */ addiu $a1, $a1, 0x19a8 +/* E2F8FC 802BAFAC 30A5FFFF */ andi $a1, $a1, 0xffff +/* E2F900 802BAFB0 8E420044 */ lw $v0, 0x44($s2) +/* E2F904 802BAFB4 8E510040 */ lw $s1, 0x40($s2) +/* E2F908 802BAFB8 0C019D60 */ jal guMtxL2F +/* E2F90C 802BAFBC 00452821 */ addu $a1, $v0, $a1 +/* E2F910 802BAFC0 44800000 */ mtc1 $zero, $f0 +/* E2F914 802BAFC4 3C073F80 */ lui $a3, 0x3f80 +/* E2F918 802BAFC8 27B00058 */ addiu $s0, $sp, 0x58 +/* E2F91C 802BAFCC E7A00010 */ swc1 $f0, 0x10($sp) +/* E2F920 802BAFD0 8E25000C */ lw $a1, 0xc($s1) +/* E2F924 802BAFD4 44060000 */ mfc1 $a2, $f0 +/* E2F928 802BAFD8 0C019EC8 */ jal guRotateF +/* E2F92C 802BAFDC 0200202D */ daddu $a0, $s0, $zero +/* E2F930 802BAFE0 0200202D */ daddu $a0, $s0, $zero +/* E2F934 802BAFE4 27A50018 */ addiu $a1, $sp, 0x18 +/* E2F938 802BAFE8 0C019D80 */ jal guMtxCatF +/* E2F93C 802BAFEC 00A0302D */ daddu $a2, $a1, $zero +/* E2F940 802BAFF0 27A40018 */ addiu $a0, $sp, 0x18 +/* E2F944 802BAFF4 26300050 */ addiu $s0, $s1, 0x50 +/* E2F948 802BAFF8 0C019D40 */ jal guMtxF2L +/* E2F94C 802BAFFC 0200282D */ daddu $a1, $s0, $zero +/* E2F950 802BB000 3C040001 */ lui $a0, 1 +/* E2F954 802BB004 34841630 */ ori $a0, $a0, 0x1630 +/* E2F958 802BB008 26310090 */ addiu $s1, $s1, 0x90 +/* E2F95C 802BB00C 3C028007 */ lui $v0, %hi(gMatrixListPos) +/* E2F960 802BB010 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) +/* E2F964 802BB014 3C03800A */ lui $v1, %hi(gDisplayContext) +/* E2F968 802BB018 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) +/* E2F96C 802BB01C 00021180 */ sll $v0, $v0, 6 +/* E2F970 802BB020 00621821 */ addu $v1, $v1, $v0 +/* E2F974 802BB024 00641821 */ addu $v1, $v1, $a0 +.L802BB028: +/* E2F978 802BB028 8E0A0000 */ lw $t2, ($s0) +/* E2F97C 802BB02C 8E0B0004 */ lw $t3, 4($s0) +/* E2F980 802BB030 8E0C0008 */ lw $t4, 8($s0) +/* E2F984 802BB034 8E0D000C */ lw $t5, 0xc($s0) +/* E2F988 802BB038 AC6A0000 */ sw $t2, ($v1) +/* E2F98C 802BB03C AC6B0004 */ sw $t3, 4($v1) +/* E2F990 802BB040 AC6C0008 */ sw $t4, 8($v1) +/* E2F994 802BB044 AC6D000C */ sw $t5, 0xc($v1) +/* E2F998 802BB048 26100010 */ addiu $s0, $s0, 0x10 +/* E2F99C 802BB04C 1611FFF6 */ bne $s0, $s1, .L802BB028 +/* E2F9A0 802BB050 24630010 */ addiu $v1, $v1, 0x10 +/* E2F9A4 802BB054 3C080001 */ lui $t0, 1 +/* E2F9A8 802BB058 35081630 */ ori $t0, $t0, 0x1630 +/* E2F9AC 802BB05C 3C09D838 */ lui $t1, 0xd838 +/* E2F9B0 802BB060 3C06800A */ lui $a2, %hi(gMasterGfxPos) +/* E2F9B4 802BB064 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) +/* E2F9B8 802BB068 35290002 */ ori $t1, $t1, 2 +/* E2F9BC 802BB06C 8CC40000 */ lw $a0, ($a2) +/* E2F9C0 802BB070 3C058007 */ lui $a1, %hi(gMatrixListPos) +/* E2F9C4 802BB074 24A541F0 */ addiu $a1, $a1, %lo(gMatrixListPos) +/* E2F9C8 802BB078 0080382D */ daddu $a3, $a0, $zero +/* E2F9CC 802BB07C 24840008 */ addiu $a0, $a0, 8 +/* E2F9D0 802BB080 ACC40000 */ sw $a0, ($a2) +/* E2F9D4 802BB084 94A20000 */ lhu $v0, ($a1) +/* E2F9D8 802BB088 3C03DA38 */ lui $v1, 0xda38 +/* E2F9DC 802BB08C ACE30000 */ sw $v1, ($a3) +/* E2F9E0 802BB090 24430001 */ addiu $v1, $v0, 1 +/* E2F9E4 802BB094 3042FFFF */ andi $v0, $v0, 0xffff +/* E2F9E8 802BB098 00021180 */ sll $v0, $v0, 6 +/* E2F9EC 802BB09C A4A30000 */ sh $v1, ($a1) +/* E2F9F0 802BB0A0 3C03800A */ lui $v1, %hi(gDisplayContext) +/* E2F9F4 802BB0A4 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) +/* E2F9F8 802BB0A8 00481021 */ addu $v0, $v0, $t0 +/* E2F9FC 802BB0AC 00621821 */ addu $v1, $v1, $v0 +/* E2FA00 802BB0B0 24820008 */ addiu $v0, $a0, 8 +/* E2FA04 802BB0B4 ACE30004 */ sw $v1, 4($a3) +/* E2FA08 802BB0B8 ACC20000 */ sw $v0, ($a2) +/* E2FA0C 802BB0BC 8E430044 */ lw $v1, 0x44($s2) +/* E2FA10 802BB0C0 3C02DE00 */ lui $v0, 0xde00 +/* E2FA14 802BB0C4 AC820000 */ sw $v0, ($a0) +/* E2FA18 802BB0C8 24820010 */ addiu $v0, $a0, 0x10 +/* E2FA1C 802BB0CC ACC20000 */ sw $v0, ($a2) +/* E2FA20 802BB0D0 24020040 */ addiu $v0, $zero, 0x40 +/* E2FA24 802BB0D4 AC82000C */ sw $v0, 0xc($a0) +/* E2FA28 802BB0D8 3C020A00 */ lui $v0, 0xa00 +/* E2FA2C 802BB0DC 24421B68 */ addiu $v0, $v0, 0x1b68 +/* E2FA30 802BB0E0 3042FFFF */ andi $v0, $v0, 0xffff +/* E2FA34 802BB0E4 AC890008 */ sw $t1, 8($a0) +/* E2FA38 802BB0E8 00621821 */ addu $v1, $v1, $v0 +/* E2FA3C 802BB0EC AC830004 */ sw $v1, 4($a0) +/* E2FA40 802BB0F0 8FBF00A4 */ lw $ra, 0xa4($sp) +/* E2FA44 802BB0F4 8FB200A0 */ lw $s2, 0xa0($sp) +/* E2FA48 802BB0F8 8FB1009C */ lw $s1, 0x9c($sp) +/* E2FA4C 802BB0FC 8FB00098 */ lw $s0, 0x98($sp) +/* E2FA50 802BB100 03E00008 */ jr $ra +/* E2FA54 802BB104 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/asm/nonmatchings/code_E2F750/func_802BB108_E2FA58.s b/asm/nonmatchings/code_E2F750/func_802BB108_E2FA58.s new file mode 100644 index 0000000000..b114b2fdbb --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BB108_E2FA58.s @@ -0,0 +1,176 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB108_E2FA58 +/* E2FA58 802BB108 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E2FA5C 802BB10C AFBF002C */ sw $ra, 0x2c($sp) +/* E2FA60 802BB110 AFB60028 */ sw $s6, 0x28($sp) +/* E2FA64 802BB114 AFB50024 */ sw $s5, 0x24($sp) +/* E2FA68 802BB118 AFB40020 */ sw $s4, 0x20($sp) +/* E2FA6C 802BB11C AFB3001C */ sw $s3, 0x1c($sp) +/* E2FA70 802BB120 AFB20018 */ sw $s2, 0x18($sp) +/* E2FA74 802BB124 AFB10014 */ sw $s1, 0x14($sp) +/* E2FA78 802BB128 0C04417A */ jal get_entity_by_index +/* E2FA7C 802BB12C AFB00010 */ sw $s0, 0x10($sp) +/* E2FA80 802BB130 3C07E300 */ lui $a3, 0xe300 +/* E2FA84 802BB134 34E71001 */ ori $a3, $a3, 0x1001 +/* E2FA88 802BB138 3C08F500 */ lui $t0, 0xf500 +/* E2FA8C 802BB13C 35080100 */ ori $t0, $t0, 0x100 +/* E2FA90 802BB140 3C090703 */ lui $t1, 0x703 +/* E2FA94 802BB144 3529C000 */ ori $t1, $t1, 0xc000 +/* E2FA98 802BB148 3C0AD700 */ lui $t2, 0xd700 +/* E2FA9C 802BB14C 354A0002 */ ori $t2, $t2, 2 +/* E2FAA0 802BB150 3C0DFC12 */ lui $t5, 0xfc12 +/* E2FAA4 802BB154 35AD1824 */ ori $t5, $t5, 0x1824 +/* E2FAA8 802BB158 3C0CFF33 */ lui $t4, 0xff33 +/* E2FAAC 802BB15C 358CFFFF */ ori $t4, $t4, 0xffff +/* E2FAB0 802BB160 3C0EE300 */ lui $t6, 0xe300 +/* E2FAB4 802BB164 35CE0D01 */ ori $t6, $t6, 0xd01 +/* E2FAB8 802BB168 3C0FE300 */ lui $t7, 0xe300 +/* E2FABC 802BB16C 35EF0F00 */ ori $t7, $t7, 0xf00 +/* E2FAC0 802BB170 3C100709 */ lui $s0, 0x709 +/* E2FAC4 802BB174 36104060 */ ori $s0, $s0, 0x4060 +/* E2FAC8 802BB178 3C11071F */ lui $s1, 0x71f +/* E2FACC 802BB17C 3631F200 */ ori $s1, $s1, 0xf200 +/* E2FAD0 802BB180 3C13F540 */ lui $s3, 0xf540 +/* E2FAD4 802BB184 36730800 */ ori $s3, $s3, 0x800 +/* E2FAD8 802BB188 3C120009 */ lui $s2, 9 +/* E2FADC 802BB18C 36524060 */ ori $s2, $s2, 0x4060 +/* E2FAE0 802BB190 3C14000F */ lui $s4, 0xf +/* E2FAE4 802BB194 3694C07C */ ori $s4, $s4, 0xc07c +/* E2FAE8 802BB198 3C15E300 */ lui $s5, 0xe300 +/* E2FAEC 802BB19C 36B50C00 */ ori $s5, $s5, 0xc00 +/* E2FAF0 802BB1A0 3C16E300 */ lui $s6, 0xe300 +/* E2FAF4 802BB1A4 3C04800A */ lui $a0, %hi(gMasterGfxPos) +/* E2FAF8 802BB1A8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) +/* E2FAFC 802BB1AC 36D61201 */ ori $s6, $s6, 0x1201 +/* E2FB00 802BB1B0 8C830000 */ lw $v1, ($a0) +/* E2FB04 802BB1B4 3C06E700 */ lui $a2, 0xe700 +/* E2FB08 802BB1B8 0060282D */ daddu $a1, $v1, $zero +/* E2FB0C 802BB1BC 24630008 */ addiu $v1, $v1, 8 +/* E2FB10 802BB1C0 AC830000 */ sw $v1, ($a0) +/* E2FB14 802BB1C4 8C4B0040 */ lw $t3, 0x40($v0) +/* E2FB18 802BB1C8 24620008 */ addiu $v0, $v1, 8 +/* E2FB1C 802BB1CC ACA60000 */ sw $a2, ($a1) +/* E2FB20 802BB1D0 ACA00004 */ sw $zero, 4($a1) +/* E2FB24 802BB1D4 AC820000 */ sw $v0, ($a0) +/* E2FB28 802BB1D8 34028000 */ ori $v0, $zero, 0x8000 +/* E2FB2C 802BB1DC AC620004 */ sw $v0, 4($v1) +/* E2FB30 802BB1E0 24620010 */ addiu $v0, $v1, 0x10 +/* E2FB34 802BB1E4 AC670000 */ sw $a3, ($v1) +/* E2FB38 802BB1E8 AC820000 */ sw $v0, ($a0) +/* E2FB3C 802BB1EC 3C02FD10 */ lui $v0, 0xfd10 +/* E2FB40 802BB1F0 AC620008 */ sw $v0, 8($v1) +/* E2FB44 802BB1F4 3C020A00 */ lui $v0, 0xa00 +/* E2FB48 802BB1F8 244218A0 */ addiu $v0, $v0, 0x18a0 +/* E2FB4C 802BB1FC AC62000C */ sw $v0, 0xc($v1) +/* E2FB50 802BB200 24620018 */ addiu $v0, $v1, 0x18 +/* E2FB54 802BB204 AC820000 */ sw $v0, ($a0) +/* E2FB58 802BB208 3C02E800 */ lui $v0, 0xe800 +/* E2FB5C 802BB20C AC620010 */ sw $v0, 0x10($v1) +/* E2FB60 802BB210 24620020 */ addiu $v0, $v1, 0x20 +/* E2FB64 802BB214 AC600014 */ sw $zero, 0x14($v1) +/* E2FB68 802BB218 AC820000 */ sw $v0, ($a0) +/* E2FB6C 802BB21C 3C020700 */ lui $v0, 0x700 +/* E2FB70 802BB220 AC62001C */ sw $v0, 0x1c($v1) +/* E2FB74 802BB224 24620028 */ addiu $v0, $v1, 0x28 +/* E2FB78 802BB228 3C05E600 */ lui $a1, 0xe600 +/* E2FB7C 802BB22C AC680018 */ sw $t0, 0x18($v1) +/* E2FB80 802BB230 AC820000 */ sw $v0, ($a0) +/* E2FB84 802BB234 24620030 */ addiu $v0, $v1, 0x30 +/* E2FB88 802BB238 AC650020 */ sw $a1, 0x20($v1) +/* E2FB8C 802BB23C AC600024 */ sw $zero, 0x24($v1) +/* E2FB90 802BB240 AC820000 */ sw $v0, ($a0) +/* E2FB94 802BB244 3C02F000 */ lui $v0, 0xf000 +/* E2FB98 802BB248 AC620028 */ sw $v0, 0x28($v1) +/* E2FB9C 802BB24C 24620038 */ addiu $v0, $v1, 0x38 +/* E2FBA0 802BB250 AC69002C */ sw $t1, 0x2c($v1) +/* E2FBA4 802BB254 AC820000 */ sw $v0, ($a0) +/* E2FBA8 802BB258 24620040 */ addiu $v0, $v1, 0x40 +/* E2FBAC 802BB25C AC660030 */ sw $a2, 0x30($v1) +/* E2FBB0 802BB260 AC600034 */ sw $zero, 0x34($v1) +/* E2FBB4 802BB264 AC820000 */ sw $v0, ($a0) +/* E2FBB8 802BB268 2402FFFF */ addiu $v0, $zero, -1 +/* E2FBBC 802BB26C AC62003C */ sw $v0, 0x3c($v1) +/* E2FBC0 802BB270 24620048 */ addiu $v0, $v1, 0x48 +/* E2FBC4 802BB274 AC6A0038 */ sw $t2, 0x38($v1) +/* E2FBC8 802BB278 AC820000 */ sw $v0, ($a0) +/* E2FBCC 802BB27C 24620050 */ addiu $v0, $v1, 0x50 +/* E2FBD0 802BB280 AC6D0040 */ sw $t5, 0x40($v1) +/* E2FBD4 802BB284 AC6C0044 */ sw $t4, 0x44($v1) +/* E2FBD8 802BB288 AC820000 */ sw $v0, ($a0) +/* E2FBDC 802BB28C 24620058 */ addiu $v0, $v1, 0x58 +/* E2FBE0 802BB290 AC6E0048 */ sw $t6, 0x48($v1) +/* E2FBE4 802BB294 AC60004C */ sw $zero, 0x4c($v1) +/* E2FBE8 802BB298 AC820000 */ sw $v0, ($a0) +/* E2FBEC 802BB29C 24620060 */ addiu $v0, $v1, 0x60 +/* E2FBF0 802BB2A0 AC6F0050 */ sw $t7, 0x50($v1) +/* E2FBF4 802BB2A4 AC600054 */ sw $zero, 0x54($v1) +/* E2FBF8 802BB2A8 AC820000 */ sw $v0, ($a0) +/* E2FBFC 802BB2AC 3C02FD50 */ lui $v0, 0xfd50 +/* E2FC00 802BB2B0 AC620058 */ sw $v0, 0x58($v1) +/* E2FC04 802BB2B4 3C020A00 */ lui $v0, 0xa00 +/* E2FC08 802BB2B8 244214A0 */ addiu $v0, $v0, 0x14a0 +/* E2FC0C 802BB2BC AC62005C */ sw $v0, 0x5c($v1) +/* E2FC10 802BB2C0 24620068 */ addiu $v0, $v1, 0x68 +/* E2FC14 802BB2C4 AC820000 */ sw $v0, ($a0) +/* E2FC18 802BB2C8 3C02F550 */ lui $v0, 0xf550 +/* E2FC1C 802BB2CC AC620060 */ sw $v0, 0x60($v1) +/* E2FC20 802BB2D0 24620070 */ addiu $v0, $v1, 0x70 +/* E2FC24 802BB2D4 AC700064 */ sw $s0, 0x64($v1) +/* E2FC28 802BB2D8 AC820000 */ sw $v0, ($a0) +/* E2FC2C 802BB2DC 24620078 */ addiu $v0, $v1, 0x78 +/* E2FC30 802BB2E0 AC650068 */ sw $a1, 0x68($v1) +/* E2FC34 802BB2E4 AC60006C */ sw $zero, 0x6c($v1) +/* E2FC38 802BB2E8 AC820000 */ sw $v0, ($a0) +/* E2FC3C 802BB2EC 3C02F300 */ lui $v0, 0xf300 +/* E2FC40 802BB2F0 AC620070 */ sw $v0, 0x70($v1) +/* E2FC44 802BB2F4 24620080 */ addiu $v0, $v1, 0x80 +/* E2FC48 802BB2F8 AC710074 */ sw $s1, 0x74($v1) +/* E2FC4C 802BB2FC AC820000 */ sw $v0, ($a0) +/* E2FC50 802BB300 24620088 */ addiu $v0, $v1, 0x88 +/* E2FC54 802BB304 AC660078 */ sw $a2, 0x78($v1) +/* E2FC58 802BB308 AC60007C */ sw $zero, 0x7c($v1) +/* E2FC5C 802BB30C AC820000 */ sw $v0, ($a0) +/* E2FC60 802BB310 24620090 */ addiu $v0, $v1, 0x90 +/* E2FC64 802BB314 3C05F200 */ lui $a1, 0xf200 +/* E2FC68 802BB318 AC730080 */ sw $s3, 0x80($v1) +/* E2FC6C 802BB31C AC720084 */ sw $s2, 0x84($v1) +/* E2FC70 802BB320 AC820000 */ sw $v0, ($a0) +/* E2FC74 802BB324 24620098 */ addiu $v0, $v1, 0x98 +/* E2FC78 802BB328 AC650088 */ sw $a1, 0x88($v1) +/* E2FC7C 802BB32C AC74008C */ sw $s4, 0x8c($v1) +/* E2FC80 802BB330 AC820000 */ sw $v0, ($a0) +/* E2FC84 802BB334 3C020008 */ lui $v0, 8 +/* E2FC88 802BB338 AC620094 */ sw $v0, 0x94($v1) +/* E2FC8C 802BB33C 246200A0 */ addiu $v0, $v1, 0xa0 +/* E2FC90 802BB340 AC750090 */ sw $s5, 0x90($v1) +/* E2FC94 802BB344 AC820000 */ sw $v0, ($a0) +/* E2FC98 802BB348 24022000 */ addiu $v0, $zero, 0x2000 +/* E2FC9C 802BB34C AC62009C */ sw $v0, 0x9c($v1) +/* E2FCA0 802BB350 246200A8 */ addiu $v0, $v1, 0xa8 +/* E2FCA4 802BB354 AC760098 */ sw $s6, 0x98($v1) +/* E2FCA8 802BB358 AC820000 */ sw $v0, ($a0) +/* E2FCAC 802BB35C 81620003 */ lb $v0, 3($t3) +/* E2FCB0 802BB360 00021080 */ sll $v0, $v0, 2 +/* E2FCB4 802BB364 30420FFF */ andi $v0, $v0, 0xfff +/* E2FCB8 802BB368 00021300 */ sll $v0, $v0, 0xc +/* E2FCBC 802BB36C 00451025 */ or $v0, $v0, $a1 +/* E2FCC0 802BB370 AC6200A0 */ sw $v0, 0xa0($v1) +/* E2FCC4 802BB374 81620003 */ lb $v0, 3($t3) +/* E2FCC8 802BB378 2442007C */ addiu $v0, $v0, 0x7c +/* E2FCCC 802BB37C 00021080 */ sll $v0, $v0, 2 +/* E2FCD0 802BB380 30420FFF */ andi $v0, $v0, 0xfff +/* E2FCD4 802BB384 00021300 */ sll $v0, $v0, 0xc +/* E2FCD8 802BB388 3442007C */ ori $v0, $v0, 0x7c +/* E2FCDC 802BB38C AC6200A4 */ sw $v0, 0xa4($v1) +/* E2FCE0 802BB390 8FBF002C */ lw $ra, 0x2c($sp) +/* E2FCE4 802BB394 8FB60028 */ lw $s6, 0x28($sp) +/* E2FCE8 802BB398 8FB50024 */ lw $s5, 0x24($sp) +/* E2FCEC 802BB39C 8FB40020 */ lw $s4, 0x20($sp) +/* E2FCF0 802BB3A0 8FB3001C */ lw $s3, 0x1c($sp) +/* E2FCF4 802BB3A4 8FB20018 */ lw $s2, 0x18($sp) +/* E2FCF8 802BB3A8 8FB10014 */ lw $s1, 0x14($sp) +/* E2FCFC 802BB3AC 8FB00010 */ lw $s0, 0x10($sp) +/* E2FD00 802BB3B0 03E00008 */ jr $ra +/* E2FD04 802BB3B4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_E2F750/func_802BB3B8_E2FD08.s b/asm/nonmatchings/code_E2F750/func_802BB3B8_E2FD08.s new file mode 100644 index 0000000000..4abfc4e2a9 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BB3B8_E2FD08.s @@ -0,0 +1,215 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB3B8_E2FD08 +/* E2FD08 802BB3B8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* E2FD0C 802BB3BC AFB40020 */ sw $s4, 0x20($sp) +/* E2FD10 802BB3C0 0080A02D */ daddu $s4, $a0, $zero +/* E2FD14 802BB3C4 AFBF0030 */ sw $ra, 0x30($sp) +/* E2FD18 802BB3C8 AFB7002C */ sw $s7, 0x2c($sp) +/* E2FD1C 802BB3CC AFB60028 */ sw $s6, 0x28($sp) +/* E2FD20 802BB3D0 AFB50024 */ sw $s5, 0x24($sp) +/* E2FD24 802BB3D4 AFB3001C */ sw $s3, 0x1c($sp) +/* E2FD28 802BB3D8 AFB20018 */ sw $s2, 0x18($sp) +/* E2FD2C 802BB3DC AFB10014 */ sw $s1, 0x14($sp) +/* E2FD30 802BB3E0 0C04417A */ jal get_entity_by_index +/* E2FD34 802BB3E4 AFB00010 */ sw $s0, 0x10($sp) +/* E2FD38 802BB3E8 3C05E300 */ lui $a1, 0xe300 +/* E2FD3C 802BB3EC 34A51001 */ ori $a1, $a1, 0x1001 +/* E2FD40 802BB3F0 3C06D700 */ lui $a2, 0xd700 +/* E2FD44 802BB3F4 34C60002 */ ori $a2, $a2, 2 +/* E2FD48 802BB3F8 3C08FC20 */ lui $t0, 0xfc20 +/* E2FD4C 802BB3FC 3508A204 */ ori $t0, $t0, 0xa204 +/* E2FD50 802BB400 3C07FF13 */ lui $a3, 0xff13 +/* E2FD54 802BB404 34E7FFFF */ ori $a3, $a3, 0xffff +/* E2FD58 802BB408 3C09E300 */ lui $t1, 0xe300 +/* E2FD5C 802BB40C 35290D01 */ ori $t1, $t1, 0xd01 +/* E2FD60 802BB410 3C0BE300 */ lui $t3, 0xe300 +/* E2FD64 802BB414 356B0F00 */ ori $t3, $t3, 0xf00 +/* E2FD68 802BB418 3C0CFD88 */ lui $t4, 0xfd88 +/* E2FD6C 802BB41C 358C001F */ ori $t4, $t4, 0x1f +/* E2FD70 802BB420 3C0AF588 */ lui $t2, 0xf588 +/* E2FD74 802BB424 354A0800 */ ori $t2, $t2, 0x800 +/* E2FD78 802BB428 3C0D0701 */ lui $t5, 0x701 +/* E2FD7C 802BB42C 35AD4050 */ ori $t5, $t5, 0x4050 +/* E2FD80 802BB430 3C0E0707 */ lui $t6, 0x707 +/* E2FD84 802BB434 35CEC07C */ ori $t6, $t6, 0xc07c +/* E2FD88 802BB438 3C120001 */ lui $s2, 1 +/* E2FD8C 802BB43C 36524050 */ ori $s2, $s2, 0x4050 +/* E2FD90 802BB440 3C150007 */ lui $s5, 7 +/* E2FD94 802BB444 36B5C07C */ ori $s5, $s5, 0xc07c +/* E2FD98 802BB448 3C0FF588 */ lui $t7, 0xf588 +/* E2FD9C 802BB44C 35EF0880 */ ori $t7, $t7, 0x880 +/* E2FDA0 802BB450 3C160101 */ lui $s6, 0x101 +/* E2FDA4 802BB454 36D64050 */ ori $s6, $s6, 0x4050 +/* E2FDA8 802BB458 3C170107 */ lui $s7, 0x107 +/* E2FDAC 802BB45C 36F7C07C */ ori $s7, $s7, 0xc07c +/* E2FDB0 802BB460 3C18E300 */ lui $t8, 0xe300 +/* E2FDB4 802BB464 37180C00 */ ori $t8, $t8, 0xc00 +/* E2FDB8 802BB468 3C19E300 */ lui $t9, 0xe300 +/* E2FDBC 802BB46C 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* E2FDC0 802BB470 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) +/* E2FDC4 802BB474 37391201 */ ori $t9, $t9, 0x1201 +/* E2FDC8 802BB478 8E030000 */ lw $v1, ($s0) +/* E2FDCC 802BB47C 3C13E700 */ lui $s3, 0xe700 +/* E2FDD0 802BB480 0060202D */ daddu $a0, $v1, $zero +/* E2FDD4 802BB484 24630008 */ addiu $v1, $v1, 8 +/* E2FDD8 802BB488 AE030000 */ sw $v1, ($s0) +/* E2FDDC 802BB48C 8C510040 */ lw $s1, 0x40($v0) +/* E2FDE0 802BB490 24620008 */ addiu $v0, $v1, 8 +/* E2FDE4 802BB494 AC930000 */ sw $s3, ($a0) +/* E2FDE8 802BB498 AC800004 */ sw $zero, 4($a0) +/* E2FDEC 802BB49C AE020000 */ sw $v0, ($s0) +/* E2FDF0 802BB4A0 24620010 */ addiu $v0, $v1, 0x10 +/* E2FDF4 802BB4A4 AC650000 */ sw $a1, ($v1) +/* E2FDF8 802BB4A8 AC600004 */ sw $zero, 4($v1) +/* E2FDFC 802BB4AC AE020000 */ sw $v0, ($s0) +/* E2FE00 802BB4B0 2402FFFF */ addiu $v0, $zero, -1 +/* E2FE04 802BB4B4 AC62000C */ sw $v0, 0xc($v1) +/* E2FE08 802BB4B8 24620018 */ addiu $v0, $v1, 0x18 +/* E2FE0C 802BB4BC AC660008 */ sw $a2, 8($v1) +/* E2FE10 802BB4C0 AE020000 */ sw $v0, ($s0) +/* E2FE14 802BB4C4 24620020 */ addiu $v0, $v1, 0x20 +/* E2FE18 802BB4C8 AC680010 */ sw $t0, 0x10($v1) +/* E2FE1C 802BB4CC AC670014 */ sw $a3, 0x14($v1) +/* E2FE20 802BB4D0 AE020000 */ sw $v0, ($s0) +/* E2FE24 802BB4D4 24620028 */ addiu $v0, $v1, 0x28 +/* E2FE28 802BB4D8 AC690018 */ sw $t1, 0x18($v1) +/* E2FE2C 802BB4DC AC60001C */ sw $zero, 0x1c($v1) +/* E2FE30 802BB4E0 AE020000 */ sw $v0, ($s0) +/* E2FE34 802BB4E4 24620030 */ addiu $v0, $v1, 0x30 +/* E2FE38 802BB4E8 AC6B0020 */ sw $t3, 0x20($v1) +/* E2FE3C 802BB4EC AC600024 */ sw $zero, 0x24($v1) +/* E2FE40 802BB4F0 AE020000 */ sw $v0, ($s0) +/* E2FE44 802BB4F4 3C020A00 */ lui $v0, 0xa00 +/* E2FE48 802BB4F8 24420BF0 */ addiu $v0, $v0, 0xbf0 +/* E2FE4C 802BB4FC AC62002C */ sw $v0, 0x2c($v1) +/* E2FE50 802BB500 24620038 */ addiu $v0, $v1, 0x38 +/* E2FE54 802BB504 AC6C0028 */ sw $t4, 0x28($v1) +/* E2FE58 802BB508 AE020000 */ sw $v0, ($s0) +/* E2FE5C 802BB50C 24620040 */ addiu $v0, $v1, 0x40 +/* E2FE60 802BB510 3C05E600 */ lui $a1, 0xe600 +/* E2FE64 802BB514 AC6A0030 */ sw $t2, 0x30($v1) +/* E2FE68 802BB518 AC6D0034 */ sw $t5, 0x34($v1) +/* E2FE6C 802BB51C AE020000 */ sw $v0, ($s0) +/* E2FE70 802BB520 24620048 */ addiu $v0, $v1, 0x48 +/* E2FE74 802BB524 3C04F400 */ lui $a0, 0xf400 +/* E2FE78 802BB528 AC650038 */ sw $a1, 0x38($v1) +/* E2FE7C 802BB52C AC60003C */ sw $zero, 0x3c($v1) +/* E2FE80 802BB530 AE020000 */ sw $v0, ($s0) +/* E2FE84 802BB534 24620050 */ addiu $v0, $v1, 0x50 +/* E2FE88 802BB538 AC640040 */ sw $a0, 0x40($v1) +/* E2FE8C 802BB53C AC6E0044 */ sw $t6, 0x44($v1) +/* E2FE90 802BB540 AE020000 */ sw $v0, ($s0) +/* E2FE94 802BB544 24620058 */ addiu $v0, $v1, 0x58 +/* E2FE98 802BB548 AC730048 */ sw $s3, 0x48($v1) +/* E2FE9C 802BB54C AC60004C */ sw $zero, 0x4c($v1) +/* E2FEA0 802BB550 AE020000 */ sw $v0, ($s0) +/* E2FEA4 802BB554 24620060 */ addiu $v0, $v1, 0x60 +/* E2FEA8 802BB558 AC720054 */ sw $s2, 0x54($v1) +/* E2FEAC 802BB55C 3C12F200 */ lui $s2, 0xf200 +/* E2FEB0 802BB560 AC6A0050 */ sw $t2, 0x50($v1) +/* E2FEB4 802BB564 AE020000 */ sw $v0, ($s0) +/* E2FEB8 802BB568 24620068 */ addiu $v0, $v1, 0x68 +/* E2FEBC 802BB56C AC720058 */ sw $s2, 0x58($v1) +/* E2FEC0 802BB570 AC75005C */ sw $s5, 0x5c($v1) +/* E2FEC4 802BB574 AE020000 */ sw $v0, ($s0) +/* E2FEC8 802BB578 3C020A00 */ lui $v0, 0xa00 +/* E2FECC 802BB57C 24420FF0 */ addiu $v0, $v0, 0xff0 +/* E2FED0 802BB580 AC620064 */ sw $v0, 0x64($v1) +/* E2FED4 802BB584 24620070 */ addiu $v0, $v1, 0x70 +/* E2FED8 802BB588 AC6C0060 */ sw $t4, 0x60($v1) +/* E2FEDC 802BB58C AE020000 */ sw $v0, ($s0) +/* E2FEE0 802BB590 24620078 */ addiu $v0, $v1, 0x78 +/* E2FEE4 802BB594 AC6F0068 */ sw $t7, 0x68($v1) +/* E2FEE8 802BB598 AC6D006C */ sw $t5, 0x6c($v1) +/* E2FEEC 802BB59C AE020000 */ sw $v0, ($s0) +/* E2FEF0 802BB5A0 24620080 */ addiu $v0, $v1, 0x80 +/* E2FEF4 802BB5A4 AC650070 */ sw $a1, 0x70($v1) +/* E2FEF8 802BB5A8 AC600074 */ sw $zero, 0x74($v1) +/* E2FEFC 802BB5AC AE020000 */ sw $v0, ($s0) +/* E2FF00 802BB5B0 24620088 */ addiu $v0, $v1, 0x88 +/* E2FF04 802BB5B4 AC640078 */ sw $a0, 0x78($v1) +/* E2FF08 802BB5B8 AC6E007C */ sw $t6, 0x7c($v1) +/* E2FF0C 802BB5BC AE020000 */ sw $v0, ($s0) +/* E2FF10 802BB5C0 24620090 */ addiu $v0, $v1, 0x90 +/* E2FF14 802BB5C4 AC730080 */ sw $s3, 0x80($v1) +/* E2FF18 802BB5C8 AC600084 */ sw $zero, 0x84($v1) +/* E2FF1C 802BB5CC AE020000 */ sw $v0, ($s0) +/* E2FF20 802BB5D0 24620098 */ addiu $v0, $v1, 0x98 +/* E2FF24 802BB5D4 AC6F0088 */ sw $t7, 0x88($v1) +/* E2FF28 802BB5D8 AC76008C */ sw $s6, 0x8c($v1) +/* E2FF2C 802BB5DC AE020000 */ sw $v0, ($s0) +/* E2FF30 802BB5E0 246200A0 */ addiu $v0, $v1, 0xa0 +/* E2FF34 802BB5E4 AC720090 */ sw $s2, 0x90($v1) +/* E2FF38 802BB5E8 AC770094 */ sw $s7, 0x94($v1) +/* E2FF3C 802BB5EC AE020000 */ sw $v0, ($s0) +/* E2FF40 802BB5F0 3C020008 */ lui $v0, 8 +/* E2FF44 802BB5F4 AC62009C */ sw $v0, 0x9c($v1) +/* E2FF48 802BB5F8 246200A8 */ addiu $v0, $v1, 0xa8 +/* E2FF4C 802BB5FC AC780098 */ sw $t8, 0x98($v1) +/* E2FF50 802BB600 AE020000 */ sw $v0, ($s0) +/* E2FF54 802BB604 24022000 */ addiu $v0, $zero, 0x2000 +/* E2FF58 802BB608 0280202D */ daddu $a0, $s4, $zero +/* E2FF5C 802BB60C AC7900A0 */ sw $t9, 0xa0($v1) +/* E2FF60 802BB610 AC6200A4 */ sw $v0, 0xa4($v1) +/* E2FF64 802BB614 96220090 */ lhu $v0, 0x90($s1) +/* E2FF68 802BB618 96250092 */ lhu $a1, 0x92($s1) +/* E2FF6C 802BB61C 30420FFF */ andi $v0, $v0, 0xfff +/* E2FF70 802BB620 00021300 */ sll $v0, $v0, 0xc +/* E2FF74 802BB624 30A50FFF */ andi $a1, $a1, 0xfff +/* E2FF78 802BB628 00B22825 */ or $a1, $a1, $s2 +/* E2FF7C 802BB62C 00451025 */ or $v0, $v0, $a1 +/* E2FF80 802BB630 AC6200A8 */ sw $v0, 0xa8($v1) +/* E2FF84 802BB634 86220090 */ lh $v0, 0x90($s1) +/* E2FF88 802BB638 246500B0 */ addiu $a1, $v1, 0xb0 +/* E2FF8C 802BB63C AE050000 */ sw $a1, ($s0) +/* E2FF90 802BB640 86250092 */ lh $a1, 0x92($s1) +/* E2FF94 802BB644 2442007C */ addiu $v0, $v0, 0x7c +/* E2FF98 802BB648 30420FFF */ andi $v0, $v0, 0xfff +/* E2FF9C 802BB64C 00021300 */ sll $v0, $v0, 0xc +/* E2FFA0 802BB650 24A5007C */ addiu $a1, $a1, 0x7c +/* E2FFA4 802BB654 30A50FFF */ andi $a1, $a1, 0xfff +/* E2FFA8 802BB658 00451025 */ or $v0, $v0, $a1 +/* E2FFAC 802BB65C 0C0AEB80 */ jal func_802BAE00_E2F750 +/* E2FFB0 802BB660 AC6200AC */ sw $v0, 0xac($v1) +/* E2FFB4 802BB664 8E050000 */ lw $a1, ($s0) +/* E2FFB8 802BB668 0280202D */ daddu $a0, $s4, $zero +/* E2FFBC 802BB66C 00A0102D */ daddu $v0, $a1, $zero +/* E2FFC0 802BB670 AC530000 */ sw $s3, ($v0) +/* E2FFC4 802BB674 AC400004 */ sw $zero, 4($v0) +/* E2FFC8 802BB678 96230094 */ lhu $v1, 0x94($s1) +/* E2FFCC 802BB67C 24A50008 */ addiu $a1, $a1, 8 +/* E2FFD0 802BB680 AE050000 */ sw $a1, ($s0) +/* E2FFD4 802BB684 96220096 */ lhu $v0, 0x96($s1) +/* E2FFD8 802BB688 30630FFF */ andi $v1, $v1, 0xfff +/* E2FFDC 802BB68C 00031B00 */ sll $v1, $v1, 0xc +/* E2FFE0 802BB690 30420FFF */ andi $v0, $v0, 0xfff +/* E2FFE4 802BB694 00521025 */ or $v0, $v0, $s2 +/* E2FFE8 802BB698 00621825 */ or $v1, $v1, $v0 +/* E2FFEC 802BB69C ACA30000 */ sw $v1, ($a1) +/* E2FFF0 802BB6A0 86220094 */ lh $v0, 0x94($s1) +/* E2FFF4 802BB6A4 24A30008 */ addiu $v1, $a1, 8 +/* E2FFF8 802BB6A8 AE030000 */ sw $v1, ($s0) +/* E2FFFC 802BB6AC 86230096 */ lh $v1, 0x96($s1) +/* E30000 802BB6B0 2442007C */ addiu $v0, $v0, 0x7c +/* E30004 802BB6B4 30420FFF */ andi $v0, $v0, 0xfff +/* E30008 802BB6B8 00021300 */ sll $v0, $v0, 0xc +/* E3000C 802BB6BC 2463007C */ addiu $v1, $v1, 0x7c +/* E30010 802BB6C0 30630FFF */ andi $v1, $v1, 0xfff +/* E30014 802BB6C4 00431025 */ or $v0, $v0, $v1 +/* E30018 802BB6C8 0C0AEBE1 */ jal func_802BAF84_E2F8D4 +/* E3001C 802BB6CC ACA20004 */ sw $v0, 4($a1) +/* E30020 802BB6D0 0C0AEC42 */ jal func_802BB108_E2FA58 +/* E30024 802BB6D4 0280202D */ daddu $a0, $s4, $zero +/* E30028 802BB6D8 8FBF0030 */ lw $ra, 0x30($sp) +/* E3002C 802BB6DC 8FB7002C */ lw $s7, 0x2c($sp) +/* E30030 802BB6E0 8FB60028 */ lw $s6, 0x28($sp) +/* E30034 802BB6E4 8FB50024 */ lw $s5, 0x24($sp) +/* E30038 802BB6E8 8FB40020 */ lw $s4, 0x20($sp) +/* E3003C 802BB6EC 8FB3001C */ lw $s3, 0x1c($sp) +/* E30040 802BB6F0 8FB20018 */ lw $s2, 0x18($sp) +/* E30044 802BB6F4 8FB10014 */ lw $s1, 0x14($sp) +/* E30048 802BB6F8 8FB00010 */ lw $s0, 0x10($sp) +/* E3004C 802BB6FC 03E00008 */ jr $ra +/* E30050 802BB700 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_E2F750/func_802BB704_E30054.s b/asm/nonmatchings/code_E2F750/func_802BB704_E30054.s new file mode 100644 index 0000000000..b2e2f3d71a --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BB704_E30054.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB704_E30054 +/* E30054 802BB704 8C860040 */ lw $a2, 0x40($a0) +/* E30058 802BB708 90C20002 */ lbu $v0, 2($a2) +/* E3005C 802BB70C 2442FFFF */ addiu $v0, $v0, -1 +/* E30060 802BB710 A0C20002 */ sb $v0, 2($a2) +/* E30064 802BB714 00021600 */ sll $v0, $v0, 0x18 +/* E30068 802BB718 1C400012 */ bgtz $v0, .L802BB764 +/* E3006C 802BB71C 240200FF */ addiu $v0, $zero, 0xff +/* E30070 802BB720 80C40001 */ lb $a0, 1($a2) +/* E30074 802BB724 3C05802C */ lui $a1, %hi(D_802BCA30) +/* E30078 802BB728 24A5CA30 */ addiu $a1, $a1, %lo(D_802BCA30) +/* E3007C 802BB72C 3C03802C */ lui $v1, %hi(D_802BCA30) +/* E30080 802BB730 00641821 */ addu $v1, $v1, $a0 +/* E30084 802BB734 9063CA30 */ lbu $v1, %lo(D_802BCA30)($v1) +/* E30088 802BB738 50620001 */ beql $v1, $v0, .L802BB740 +/* E3008C 802BB73C 0000202D */ daddu $a0, $zero, $zero +.L802BB740: +/* E30090 802BB740 00851021 */ addu $v0, $a0, $a1 +/* E30094 802BB744 90420000 */ lbu $v0, ($v0) +/* E30098 802BB748 24840001 */ addiu $a0, $a0, 1 +/* E3009C 802BB74C A0C20003 */ sb $v0, 3($a2) +/* E300A0 802BB750 00851021 */ addu $v0, $a0, $a1 +/* E300A4 802BB754 90420000 */ lbu $v0, ($v0) +/* E300A8 802BB758 24840001 */ addiu $a0, $a0, 1 +/* E300AC 802BB75C A0C40001 */ sb $a0, 1($a2) +/* E300B0 802BB760 A0C20002 */ sb $v0, 2($a2) +.L802BB764: +/* E300B4 802BB764 03E00008 */ jr $ra +/* E300B8 802BB768 00000000 */ nop diff --git a/asm/nonmatchings/code_E2F750/func_802BB76C_E300BC.s b/asm/nonmatchings/code_E2F750/func_802BB76C_E300BC.s new file mode 100644 index 0000000000..90168597a7 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BB76C_E300BC.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB76C_E300BC +/* E300BC 802BB76C 8C830040 */ lw $v1, 0x40($a0) +/* E300C0 802BB770 846200A4 */ lh $v0, 0xa4($v1) +/* E300C4 802BB774 C4800048 */ lwc1 $f0, 0x48($a0) +/* E300C8 802BB778 44821000 */ mtc1 $v0, $f2 +/* E300CC 802BB77C 00000000 */ nop +/* E300D0 802BB780 468010A0 */ cvt.s.w $f2, $f2 +/* E300D4 802BB784 846200A8 */ lh $v0, 0xa8($v1) +/* E300D8 802BB788 46001081 */ sub.s $f2, $f2, $f0 +/* E300DC 802BB78C C4840050 */ lwc1 $f4, 0x50($a0) +/* E300E0 802BB790 44820000 */ mtc1 $v0, $f0 +/* E300E4 802BB794 00000000 */ nop +/* E300E8 802BB798 46800020 */ cvt.s.w $f0, $f0 +/* E300EC 802BB79C 46040001 */ sub.s $f0, $f0, $f4 +/* E300F0 802BB7A0 0000102D */ daddu $v0, $zero, $zero +/* E300F4 802BB7A4 3C014120 */ lui $at, 0x4120 +/* E300F8 802BB7A8 44812000 */ mtc1 $at, $f4 +/* E300FC 802BB7AC 46001085 */ abs.s $f2, $f2 +/* E30100 802BB7B0 4604103E */ c.le.s $f2, $f4 +/* E30104 802BB7B4 00000000 */ nop +/* E30108 802BB7B8 45000002 */ bc1f .L802BB7C4 +/* E3010C 802BB7BC 46000005 */ abs.s $f0, $f0 +/* E30110 802BB7C0 24020001 */ addiu $v0, $zero, 1 +.L802BB7C4: +/* E30114 802BB7C4 4604003E */ c.le.s $f0, $f4 +/* E30118 802BB7C8 00000000 */ nop +/* E3011C 802BB7CC 45030001 */ bc1tl .L802BB7D4 +/* E30120 802BB7D0 24420001 */ addiu $v0, $v0, 1 +.L802BB7D4: +/* E30124 802BB7D4 28420002 */ slti $v0, $v0, 2 +/* E30128 802BB7D8 03E00008 */ jr $ra +/* E3012C 802BB7DC 38420001 */ xori $v0, $v0, 1 diff --git a/asm/nonmatchings/code_E2F750/func_802BB7E0_E30130.s b/asm/nonmatchings/code_E2F750/func_802BB7E0_E30130.s new file mode 100644 index 0000000000..cd323b1a3b --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BB7E0_E30130.s @@ -0,0 +1,75 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB7E0_E30130 +/* E30130 802BB7E0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E30134 802BB7E4 AFBF0018 */ sw $ra, 0x18($sp) +/* E30138 802BB7E8 AFB10014 */ sw $s1, 0x14($sp) +/* E3013C 802BB7EC AFB00010 */ sw $s0, 0x10($sp) +/* E30140 802BB7F0 8C900040 */ lw $s0, 0x40($a0) +/* E30144 802BB7F4 861100AA */ lh $s1, 0xaa($s0) +/* E30148 802BB7F8 8E0400A0 */ lw $a0, 0xa0($s0) +/* E3014C 802BB7FC 1620001A */ bnez $s1, .L802BB868 +/* E30150 802BB800 2402FFFF */ addiu $v0, $zero, -1 +/* E30154 802BB804 8C830000 */ lw $v1, ($a0) +/* E30158 802BB808 10620006 */ beq $v1, $v0, .L802BB824 +/* E3015C 802BB80C 0000282D */ daddu $a1, $zero, $zero +/* E30160 802BB810 0040182D */ daddu $v1, $v0, $zero +.L802BB814: +/* E30164 802BB814 24840004 */ addiu $a0, $a0, 4 +/* E30168 802BB818 8C820000 */ lw $v0, ($a0) +/* E3016C 802BB81C 1443FFFD */ bne $v0, $v1, .L802BB814 +/* E30170 802BB820 24A50001 */ addiu $a1, $a1, 1 +.L802BB824: +/* E30174 802BB824 00052080 */ sll $a0, $a1, 2 +/* E30178 802BB828 00852021 */ addu $a0, $a0, $a1 +/* E3017C 802BB82C 00042040 */ sll $a0, $a0, 1 +/* E30180 802BB830 0C00A67F */ jal rand_int +/* E30184 802BB834 2484FFFF */ addiu $a0, $a0, -1 +/* E30188 802BB838 3C036666 */ lui $v1, 0x6666 +/* E3018C 802BB83C 34636667 */ ori $v1, $v1, 0x6667 +/* E30190 802BB840 00430018 */ mult $v0, $v1 +/* E30194 802BB844 000217C3 */ sra $v0, $v0, 0x1f +/* E30198 802BB848 8E0400A0 */ lw $a0, 0xa0($s0) +/* E3019C 802BB84C 00003010 */ mfhi $a2 +/* E301A0 802BB850 00061883 */ sra $v1, $a2, 2 +/* E301A4 802BB854 00621823 */ subu $v1, $v1, $v0 +/* E301A8 802BB858 00031880 */ sll $v1, $v1, 2 +/* E301AC 802BB85C 00641821 */ addu $v1, $v1, $a0 +/* E301B0 802BB860 8C620000 */ lw $v0, ($v1) +/* E301B4 802BB864 AE02009C */ sw $v0, 0x9c($s0) +.L802BB868: +/* E301B8 802BB868 8E05009C */ lw $a1, 0x9c($s0) +/* E301BC 802BB86C 00111080 */ sll $v0, $s1, 2 +/* E301C0 802BB870 00A21821 */ addu $v1, $a1, $v0 +/* E301C4 802BB874 8C640000 */ lw $a0, ($v1) +/* E301C8 802BB878 3C028000 */ lui $v0, 0x8000 +/* E301CC 802BB87C 10820013 */ beq $a0, $v0, .L802BB8CC +/* E301D0 802BB880 34420001 */ ori $v0, $v0, 1 +/* E301D4 802BB884 1482000A */ bne $a0, $v0, .L802BB8B0 +/* E301D8 802BB888 26310003 */ addiu $s1, $s1, 3 +/* E301DC 802BB88C 00A0182D */ daddu $v1, $a1, $zero +/* E301E0 802BB890 94620002 */ lhu $v0, 2($v1) +/* E301E4 802BB894 24630004 */ addiu $v1, $v1, 4 +/* E301E8 802BB898 A60200A4 */ sh $v0, 0xa4($s0) +/* E301EC 802BB89C 94620002 */ lhu $v0, 2($v1) +/* E301F0 802BB8A0 A60200A6 */ sh $v0, 0xa6($s0) +/* E301F4 802BB8A4 94620006 */ lhu $v0, 6($v1) +/* E301F8 802BB8A8 080AEE32 */ j .L802BB8C8 +/* E301FC 802BB8AC 0000882D */ daddu $s1, $zero, $zero +.L802BB8B0: +/* E30200 802BB8B0 94620002 */ lhu $v0, 2($v1) +/* E30204 802BB8B4 24630004 */ addiu $v1, $v1, 4 +/* E30208 802BB8B8 A60200A4 */ sh $v0, 0xa4($s0) +/* E3020C 802BB8BC 94620002 */ lhu $v0, 2($v1) +/* E30210 802BB8C0 A60200A6 */ sh $v0, 0xa6($s0) +/* E30214 802BB8C4 94620006 */ lhu $v0, 6($v1) +.L802BB8C8: +/* E30218 802BB8C8 A60200A8 */ sh $v0, 0xa8($s0) +.L802BB8CC: +/* E3021C 802BB8CC A61100AA */ sh $s1, 0xaa($s0) +/* E30220 802BB8D0 8FBF0018 */ lw $ra, 0x18($sp) +/* E30224 802BB8D4 8FB10014 */ lw $s1, 0x14($sp) +/* E30228 802BB8D8 8FB00010 */ lw $s0, 0x10($sp) +/* E3022C 802BB8DC 03E00008 */ jr $ra +/* E30230 802BB8E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_E2F750/func_802BB8E4_E30234.s b/asm/nonmatchings/code_E2F750/func_802BB8E4_E30234.s new file mode 100644 index 0000000000..9173aaedcd --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BB8E4_E30234.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BB8E4_E30234 +/* E30234 802BB8E4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E30238 802BB8E8 AFB10014 */ sw $s1, 0x14($sp) +/* E3023C 802BB8EC 0080882D */ daddu $s1, $a0, $zero +/* E30240 802BB8F0 AFBF0018 */ sw $ra, 0x18($sp) +/* E30244 802BB8F4 AFB00010 */ sw $s0, 0x10($sp) +/* E30248 802BB8F8 F7B40020 */ sdc1 $f20, 0x20($sp) +/* E3024C 802BB8FC 8E300040 */ lw $s0, 0x40($s1) +/* E30250 802BB900 C62C0048 */ lwc1 $f12, 0x48($s1) +/* E30254 802BB904 860200A4 */ lh $v0, 0xa4($s0) +/* E30258 802BB908 C62E0050 */ lwc1 $f14, 0x50($s1) +/* E3025C 802BB90C 44823000 */ mtc1 $v0, $f6 +/* E30260 802BB910 00000000 */ nop +/* E30264 802BB914 468031A0 */ cvt.s.w $f6, $f6 +/* E30268 802BB918 860200A8 */ lh $v0, 0xa8($s0) +/* E3026C 802BB91C 44063000 */ mfc1 $a2, $f6 +/* E30270 802BB920 44823000 */ mtc1 $v0, $f6 +/* E30274 802BB924 00000000 */ nop +/* E30278 802BB928 468031A0 */ cvt.s.w $f6, $f6 +/* E3027C 802BB92C 44073000 */ mfc1 $a3, $f6 +/* E30280 802BB930 0C00A720 */ jal atan2 +/* E30284 802BB934 00000000 */ nop +/* E30288 802BB938 C60200B8 */ lwc1 $f2, 0xb8($s0) +/* E3028C 802BB93C 46020001 */ sub.s $f0, $f0, $f2 +/* E30290 802BB940 3C013D00 */ lui $at, 0x3d00 +/* E30294 802BB944 44811000 */ mtc1 $at, $f2 +/* E30298 802BB948 00000000 */ nop +/* E3029C 802BB94C 46020102 */ mul.s $f4, $f0, $f2 +/* E302A0 802BB950 00000000 */ nop +/* E302A4 802BB954 44800000 */ mtc1 $zero, $f0 +/* E302A8 802BB958 00000000 */ nop +/* E302AC 802BB95C 4604003E */ c.le.s $f0, $f4 +/* E302B0 802BB960 00000000 */ nop +/* E302B4 802BB964 4500000D */ bc1f .L802BB99C +/* E302B8 802BB968 00000000 */ nop +/* E302BC 802BB96C 3C01802C */ lui $at, %hi(D_802BCB70) +/* E302C0 802BB970 D422CB70 */ ldc1 $f2, %lo(D_802BCB70)($at) +/* E302C4 802BB974 46002021 */ cvt.d.s $f0, $f4 +/* E302C8 802BB978 4622003C */ c.lt.d $f0, $f2 +/* E302CC 802BB97C 00000000 */ nop +/* E302D0 802BB980 45000004 */ bc1f .L802BB994 +/* E302D4 802BB984 00000000 */ nop +/* E302D8 802BB988 3C013C23 */ lui $at, 0x3c23 +/* E302DC 802BB98C 3421D70A */ ori $at, $at, 0xd70a +/* E302E0 802BB990 44812000 */ mtc1 $at, $f4 +.L802BB994: +/* E302E4 802BB994 44800000 */ mtc1 $zero, $f0 +/* E302E8 802BB998 00000000 */ nop +.L802BB99C: +/* E302EC 802BB99C 4600203C */ c.lt.s $f4, $f0 +/* E302F0 802BB9A0 00000000 */ nop +/* E302F4 802BB9A4 4500000B */ bc1f .L802BB9D4 +/* E302F8 802BB9A8 00000000 */ nop +/* E302FC 802BB9AC 3C01802C */ lui $at, %hi(D_802BCB78) +/* E30300 802BB9B0 D422CB78 */ ldc1 $f2, %lo(D_802BCB78)($at) +/* E30304 802BB9B4 46002021 */ cvt.d.s $f0, $f4 +/* E30308 802BB9B8 4620103C */ c.lt.d $f2, $f0 +/* E3030C 802BB9BC 00000000 */ nop +/* E30310 802BB9C0 45000004 */ bc1f .L802BB9D4 +/* E30314 802BB9C4 00000000 */ nop +/* E30318 802BB9C8 3C01BC23 */ lui $at, 0xbc23 +/* E3031C 802BB9CC 3421D70A */ ori $at, $at, 0xd70a +/* E30320 802BB9D0 44812000 */ mtc1 $at, $f4 +.L802BB9D4: +/* E30324 802BB9D4 C60C00B8 */ lwc1 $f12, 0xb8($s0) +/* E30328 802BB9D8 0C00A6C9 */ jal clamp_angle +/* E3032C 802BB9DC 46046300 */ add.s $f12, $f12, $f4 +/* E30330 802BB9E0 3C0140C9 */ lui $at, 0x40c9 +/* E30334 802BB9E4 34210FD0 */ ori $at, $at, 0xfd0 +/* E30338 802BB9E8 4481A000 */ mtc1 $at, $f20 +/* E3033C 802BB9EC 00000000 */ nop +/* E30340 802BB9F0 46140502 */ mul.s $f20, $f0, $f20 +/* E30344 802BB9F4 00000000 */ nop +/* E30348 802BB9F8 3C0143B4 */ lui $at, 0x43b4 +/* E3034C 802BB9FC 44811000 */ mtc1 $at, $f2 +/* E30350 802BBA00 E60000B8 */ swc1 $f0, 0xb8($s0) +/* E30354 802BBA04 4602A503 */ div.s $f20, $f20, $f2 +/* E30358 802BBA08 0C00A85B */ jal sin_rad +/* E3035C 802BBA0C 4600A306 */ mov.s $f12, $f20 +/* E30360 802BBA10 C6220048 */ lwc1 $f2, 0x48($s1) +/* E30364 802BBA14 46001080 */ add.s $f2, $f2, $f0 +/* E30368 802BBA18 4600A306 */ mov.s $f12, $f20 +/* E3036C 802BBA1C 0C00A874 */ jal cos_rad +/* E30370 802BBA20 E6220048 */ swc1 $f2, 0x48($s1) +/* E30374 802BBA24 C6220050 */ lwc1 $f2, 0x50($s1) +/* E30378 802BBA28 46001081 */ sub.s $f2, $f2, $f0 +/* E3037C 802BBA2C 0220202D */ daddu $a0, $s1, $zero +/* E30380 802BBA30 0C0AEDDB */ jal func_802BB76C_E300BC +/* E30384 802BBA34 E6220050 */ swc1 $f2, 0x50($s1) +/* E30388 802BBA38 10400003 */ beqz $v0, .L802BBA48 +/* E3038C 802BBA3C 00000000 */ nop +/* E30390 802BBA40 0C0AEDF8 */ jal func_802BB7E0_E30130 +/* E30394 802BBA44 0220202D */ daddu $a0, $s1, $zero +.L802BBA48: +/* E30398 802BBA48 8FBF0018 */ lw $ra, 0x18($sp) +/* E3039C 802BBA4C 8FB10014 */ lw $s1, 0x14($sp) +/* E303A0 802BBA50 8FB00010 */ lw $s0, 0x10($sp) +/* E303A4 802BBA54 D7B40020 */ ldc1 $f20, 0x20($sp) +/* E303A8 802BBA58 03E00008 */ jr $ra +/* E303AC 802BBA5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s b/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s new file mode 100644 index 0000000000..17fba4305d --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s @@ -0,0 +1,230 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BBA60_E303B0 +/* E303B0 802BBA60 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* E303B4 802BBA64 AFB10014 */ sw $s1, 0x14($sp) +/* E303B8 802BBA68 0080882D */ daddu $s1, $a0, $zero +/* E303BC 802BBA6C AFB20018 */ sw $s2, 0x18($sp) +/* E303C0 802BBA70 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* E303C4 802BBA74 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* E303C8 802BBA78 AFB3001C */ sw $s3, 0x1c($sp) +/* E303CC 802BBA7C 3C138011 */ lui $s3, %hi(D_8010EBB0) +/* E303D0 802BBA80 2673EBB0 */ addiu $s3, $s3, %lo(D_8010EBB0) +/* E303D4 802BBA84 AFBF0020 */ sw $ra, 0x20($sp) +/* E303D8 802BBA88 AFB00010 */ sw $s0, 0x10($sp) +/* E303DC 802BBA8C 0C009C64 */ jal func_80027190 +/* E303E0 802BBA90 8E300040 */ lw $s0, 0x40($s1) +/* E303E4 802BBA94 14400017 */ bnez $v0, .L802BBAF4 +/* E303E8 802BBA98 00000000 */ nop +/* E303EC 802BBA9C 0C04D07A */ jal func_801341E8 +/* E303F0 802BBAA0 00000000 */ nop +/* E303F4 802BBAA4 14400013 */ bnez $v0, .L802BBAF4 +/* E303F8 802BBAA8 00000000 */ nop +/* E303FC 802BBAAC 8E420000 */ lw $v0, ($s2) +/* E30400 802BBAB0 30420020 */ andi $v0, $v0, 0x20 +/* E30404 802BBAB4 1440000F */ bnez $v0, .L802BBAF4 +/* E30408 802BBAB8 00000000 */ nop +/* E3040C 802BBABC 3C028011 */ lui $v0, %hi(gPlayerData) +/* E30410 802BBAC0 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* E30414 802BBAC4 80430012 */ lb $v1, 0x12($v0) +/* E30418 802BBAC8 24020001 */ addiu $v0, $zero, 1 +/* E3041C 802BBACC 14620007 */ bne $v1, $v0, .L802BBAEC +/* E30420 802BBAD0 00000000 */ nop +/* E30424 802BBAD4 82420015 */ lb $v0, 0x15($s2) +/* E30428 802BBAD8 10400004 */ beqz $v0, .L802BBAEC +/* E3042C 802BBADC 2402001F */ addiu $v0, $zero, 0x1f +/* E30430 802BBAE0 824300B4 */ lb $v1, 0xb4($s2) +/* E30434 802BBAE4 14620003 */ bne $v1, $v0, .L802BBAF4 +/* E30438 802BBAE8 00000000 */ nop +.L802BBAEC: +/* E3043C 802BBAEC 0C0AEE39 */ jal func_802BB8E4_E30234 +/* E30440 802BBAF0 0220202D */ daddu $a0, $s1, $zero +.L802BBAF4: +/* E30444 802BBAF4 0C0AEDC1 */ jal func_802BB704_E30054 +/* E30448 802BBAF8 0220202D */ daddu $a0, $s1, $zero +/* E3044C 802BBAFC 96020098 */ lhu $v0, 0x98($s0) +/* E30450 802BBB00 24420001 */ addiu $v0, $v0, 1 +/* E30454 802BBB04 A6020098 */ sh $v0, 0x98($s0) +/* E30458 802BBB08 00021400 */ sll $v0, $v0, 0x10 +/* E3045C 802BBB0C 00021403 */ sra $v0, $v0, 0x10 +/* E30460 802BBB10 28420064 */ slti $v0, $v0, 0x64 +/* E30464 802BBB14 1040001B */ beqz $v0, .L802BBB84 +/* E30468 802BBB18 00000000 */ nop +/* E3046C 802BBB1C 3C014060 */ lui $at, 0x4060 +/* E30470 802BBB20 44813000 */ mtc1 $at, $f6 +/* E30474 802BBB24 C6080004 */ lwc1 $f8, 4($s0) +/* E30478 802BBB28 46083081 */ sub.s $f2, $f6, $f8 +/* E3047C 802BBB2C 3C0141E0 */ lui $at, 0x41e0 +/* E30480 802BBB30 44810000 */ mtc1 $at, $f0 +/* E30484 802BBB34 00000000 */ nop +/* E30488 802BBB38 46001103 */ div.s $f4, $f2, $f0 +/* E3048C 802BBB3C 3C01802C */ lui $at, %hi(D_802BCB80) +/* E30490 802BBB40 D422CB80 */ ldc1 $f2, %lo(D_802BCB80)($at) +/* E30494 802BBB44 46002021 */ cvt.d.s $f0, $f4 +/* E30498 802BBB48 4622003C */ c.lt.d $f0, $f2 +/* E3049C 802BBB4C 00000000 */ nop +/* E304A0 802BBB50 45020006 */ bc1fl .L802BBB6C +/* E304A4 802BBB54 46044000 */ add.s $f0, $f8, $f4 +/* E304A8 802BBB58 3C013CA3 */ lui $at, 0x3ca3 +/* E304AC 802BBB5C 3421D70A */ ori $at, $at, 0xd70a +/* E304B0 802BBB60 44812000 */ mtc1 $at, $f4 +/* E304B4 802BBB64 00000000 */ nop +/* E304B8 802BBB68 46044000 */ add.s $f0, $f8, $f4 +.L802BBB6C: +/* E304BC 802BBB6C 4600303E */ c.le.s $f6, $f0 +/* E304C0 802BBB70 00000000 */ nop +/* E304C4 802BBB74 4500001F */ bc1f .L802BBBF4 +/* E304C8 802BBB78 E6000004 */ swc1 $f0, 4($s0) +/* E304CC 802BBB7C 080AEEFD */ j .L802BBBF4 +/* E304D0 802BBB80 E6060004 */ swc1 $f6, 4($s0) +.L802BBB84: +/* E304D4 802BBB84 3C013FA6 */ lui $at, 0x3fa6 +/* E304D8 802BBB88 34216666 */ ori $at, $at, 0x6666 +/* E304DC 802BBB8C 44813000 */ mtc1 $at, $f6 +/* E304E0 802BBB90 C6080004 */ lwc1 $f8, 4($s0) +/* E304E4 802BBB94 46083081 */ sub.s $f2, $f6, $f8 +/* E304E8 802BBB98 3C013D80 */ lui $at, 0x3d80 +/* E304EC 802BBB9C 44810000 */ mtc1 $at, $f0 +/* E304F0 802BBBA0 00000000 */ nop +/* E304F4 802BBBA4 46001102 */ mul.s $f4, $f2, $f0 +/* E304F8 802BBBA8 00000000 */ nop +/* E304FC 802BBBAC 3C01802C */ lui $at, %hi(D_802BCB88) +/* E30500 802BBBB0 D422CB88 */ ldc1 $f2, %lo(D_802BCB88)($at) +/* E30504 802BBBB4 46002021 */ cvt.d.s $f0, $f4 +/* E30508 802BBBB8 4620103C */ c.lt.d $f2, $f0 +/* E3050C 802BBBBC 00000000 */ nop +/* E30510 802BBBC0 45020006 */ bc1fl .L802BBBDC +/* E30514 802BBBC4 46044000 */ add.s $f0, $f8, $f4 +/* E30518 802BBBC8 3C01BCA3 */ lui $at, 0xbca3 +/* E3051C 802BBBCC 3421D70A */ ori $at, $at, 0xd70a +/* E30520 802BBBD0 44812000 */ mtc1 $at, $f4 +/* E30524 802BBBD4 00000000 */ nop +/* E30528 802BBBD8 46044000 */ add.s $f0, $f8, $f4 +.L802BBBDC: +/* E3052C 802BBBDC 4606003E */ c.le.s $f0, $f6 +/* E30530 802BBBE0 00000000 */ nop +/* E30534 802BBBE4 45000003 */ bc1f .L802BBBF4 +/* E30538 802BBBE8 E6000004 */ swc1 $f0, 4($s0) +/* E3053C 802BBBEC E6060004 */ swc1 $f6, 4($s0) +/* E30540 802BBBF0 A6000098 */ sh $zero, 0x98($s0) +.L802BBBF4: +/* E30544 802BBBF4 C6000008 */ lwc1 $f0, 8($s0) +/* E30548 802BBBF8 C6020004 */ lwc1 $f2, 4($s0) +/* E3054C 802BBBFC 46020000 */ add.s $f0, $f0, $f2 +/* E30550 802BBC00 3C0143B4 */ lui $at, 0x43b4 +/* E30554 802BBC04 44814000 */ mtc1 $at, $f8 +/* E30558 802BBC08 00000000 */ nop +/* E3055C 802BBC0C 4600403C */ c.lt.s $f8, $f0 +/* E30560 802BBC10 00000000 */ nop +/* E30564 802BBC14 45000002 */ bc1f .L802BBC20 +/* E30568 802BBC18 E6000008 */ swc1 $f0, 8($s0) +/* E3056C 802BBC1C AE000008 */ sw $zero, 8($s0) +.L802BBC20: +/* E30570 802BBC20 C6000008 */ lwc1 $f0, 8($s0) +/* E30574 802BBC24 C606000C */ lwc1 $f6, 0xc($s0) +/* E30578 802BBC28 46060101 */ sub.s $f4, $f0, $f6 +/* E3057C 802BBC2C 44805000 */ mtc1 $zero, $f10 +/* E30580 802BBC30 00000000 */ nop +/* E30584 802BBC34 460A203C */ c.lt.s $f4, $f10 +/* E30588 802BBC38 00000000 */ nop +/* E3058C 802BBC3C 45030001 */ bc1tl .L802BBC44 +/* E30590 802BBC40 46082100 */ add.s $f4, $f4, $f8 +.L802BBC44: +/* E30594 802BBC44 3C013FD0 */ lui $at, 0x3fd0 +/* E30598 802BBC48 44810800 */ mtc1 $at, $f1 +/* E3059C 802BBC4C 44800000 */ mtc1 $zero, $f0 +/* E305A0 802BBC50 460020A1 */ cvt.d.s $f2, $f4 +/* E305A4 802BBC54 46201082 */ mul.d $f2, $f2, $f0 +/* E305A8 802BBC58 00000000 */ nop +/* E305AC 802BBC5C 46201120 */ cvt.s.d $f4, $f2 +/* E305B0 802BBC60 46043000 */ add.s $f0, $f6, $f4 +/* E305B4 802BBC64 4600403C */ c.lt.s $f8, $f0 +/* E305B8 802BBC68 00000000 */ nop +/* E305BC 802BBC6C 45000002 */ bc1f .L802BBC78 +/* E305C0 802BBC70 E600000C */ swc1 $f0, 0xc($s0) +/* E305C4 802BBC74 E60A000C */ swc1 $f10, 0xc($s0) +.L802BBC78: +/* E305C8 802BBC78 96020090 */ lhu $v0, 0x90($s0) +/* E305CC 802BBC7C 96030092 */ lhu $v1, 0x92($s0) +/* E305D0 802BBC80 24420004 */ addiu $v0, $v0, 4 +/* E305D4 802BBC84 A6020090 */ sh $v0, 0x90($s0) +/* E305D8 802BBC88 96020094 */ lhu $v0, 0x94($s0) +/* E305DC 802BBC8C 2463FFF8 */ addiu $v1, $v1, -8 +/* E305E0 802BBC90 A6030092 */ sh $v1, 0x92($s0) +/* E305E4 802BBC94 96030096 */ lhu $v1, 0x96($s0) +/* E305E8 802BBC98 24420004 */ addiu $v0, $v0, 4 +/* E305EC 802BBC9C 2463FFF0 */ addiu $v1, $v1, -0x10 +/* E305F0 802BBCA0 A6020094 */ sh $v0, 0x94($s0) +/* E305F4 802BBCA4 A6030096 */ sh $v1, 0x96($s0) +/* E305F8 802BBCA8 3C01800B */ lui $at, %hi(D_800B1DEC) +/* E305FC 802BBCAC C4201DEC */ lwc1 $f0, %lo(D_800B1DEC)($at) +/* E30600 802BBCB0 46000007 */ neg.s $f0, $f0 +/* E30604 802BBCB4 E6200064 */ swc1 $f0, 0x64($s1) +/* E30608 802BBCB8 82620000 */ lb $v0, ($s3) +/* E3060C 802BBCBC 10400004 */ beqz $v0, .L802BBCD0 +/* E30610 802BBCC0 24020009 */ addiu $v0, $zero, 9 +/* E30614 802BBCC4 82630003 */ lb $v1, 3($s3) +/* E30618 802BBCC8 10620034 */ beq $v1, $v0, .L802BBD9C +/* E3061C 802BBCCC 00000000 */ nop +.L802BBCD0: +/* E30620 802BBCD0 824300B4 */ lb $v1, 0xb4($s2) +/* E30624 802BBCD4 2402001F */ addiu $v0, $zero, 0x1f +/* E30628 802BBCD8 1462000E */ bne $v1, $v0, .L802BBD14 +/* E3062C 802BBCDC 00000000 */ nop +/* E30630 802BBCE0 C62C0048 */ lwc1 $f12, 0x48($s1) +/* E30634 802BBCE4 C62E004C */ lwc1 $f14, 0x4c($s1) +/* E30638 802BBCE8 8E260050 */ lw $a2, 0x50($s1) +/* E3063C 802BBCEC 0C00F431 */ jal func_8003D0C4 +/* E30640 802BBCF0 3C074248 */ lui $a3, 0x4248 +/* E30644 802BBCF4 10400007 */ beqz $v0, .L802BBD14 +/* E30648 802BBCF8 3C030400 */ lui $v1, 0x400 +/* E3064C 802BBCFC 8C420000 */ lw $v0, ($v0) +/* E30650 802BBD00 00431024 */ and $v0, $v0, $v1 +/* E30654 802BBD04 10400003 */ beqz $v0, .L802BBD14 +/* E30658 802BBD08 00000000 */ nop +/* E3065C 802BBD0C 3C018011 */ lui $at, %hi(D_8010C954) +/* E30660 802BBD10 AC31C954 */ sw $s1, %lo(D_8010C954)($at) +.L802BBD14: +/* E30664 802BBD14 0C04D07A */ jal func_801341E8 +/* E30668 802BBD18 00000000 */ nop +/* E3066C 802BBD1C 1440001F */ bnez $v0, .L802BBD9C +/* E30670 802BBD20 00000000 */ nop +/* E30674 802BBD24 8E420000 */ lw $v0, ($s2) +/* E30678 802BBD28 30420020 */ andi $v0, $v0, 0x20 +/* E3067C 802BBD2C 1440001B */ bnez $v0, .L802BBD9C +/* E30680 802BBD30 2402001F */ addiu $v0, $zero, 0x1f +/* E30684 802BBD34 824300B4 */ lb $v1, 0xb4($s2) +/* E30688 802BBD38 10620018 */ beq $v1, $v0, .L802BBD9C +/* E3068C 802BBD3C 00000000 */ nop +/* E30690 802BBD40 86420010 */ lh $v0, 0x10($s2) +/* E30694 802BBD44 14400015 */ bnez $v0, .L802BBD9C +/* E30698 802BBD48 00000000 */ nop +/* E3069C 802BBD4C C62C0048 */ lwc1 $f12, 0x48($s1) +/* E306A0 802BBD50 C62E0050 */ lwc1 $f14, 0x50($s1) +/* E306A4 802BBD54 8E460028 */ lw $a2, 0x28($s2) +/* E306A8 802BBD58 0C00A7B5 */ jal dist2D +/* E306AC 802BBD5C 8E470030 */ lw $a3, 0x30($s2) +/* E306B0 802BBD60 46000021 */ cvt.d.s $f0, $f0 +/* E306B4 802BBD64 3C014049 */ lui $at, 0x4049 +/* E306B8 802BBD68 44811800 */ mtc1 $at, $f3 +/* E306BC 802BBD6C 44801000 */ mtc1 $zero, $f2 +/* E306C0 802BBD70 46200005 */ abs.d $f0, $f0 +/* E306C4 802BBD74 4622003E */ c.le.d $f0, $f2 +/* E306C8 802BBD78 00000000 */ nop +/* E306CC 802BBD7C 45000007 */ bc1f .L802BBD9C +/* E306D0 802BBD80 2404001F */ addiu $a0, $zero, 0x1f +/* E306D4 802BBD84 8E420004 */ lw $v0, 4($s2) +/* E306D8 802BBD88 3C018011 */ lui $at, %hi(D_8010C934) +/* E306DC 802BBD8C AC31C934 */ sw $s1, %lo(D_8010C934)($at) +/* E306E0 802BBD90 34420004 */ ori $v0, $v0, 4 +/* E306E4 802BBD94 0C039769 */ jal set_action_state +/* E306E8 802BBD98 AE420004 */ sw $v0, 4($s2) +.L802BBD9C: +/* E306EC 802BBD9C 8FBF0020 */ lw $ra, 0x20($sp) +/* E306F0 802BBDA0 8FB3001C */ lw $s3, 0x1c($sp) +/* E306F4 802BBDA4 8FB20018 */ lw $s2, 0x18($sp) +/* E306F8 802BBDA8 8FB10014 */ lw $s1, 0x14($sp) +/* E306FC 802BBDAC 8FB00010 */ lw $s0, 0x10($sp) +/* E30700 802BBDB0 03E00008 */ jr $ra +/* E30704 802BBDB4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_E2F750/func_802BBDB8_E30708.s b/asm/nonmatchings/code_E2F750/func_802BBDB8_E30708.s new file mode 100644 index 0000000000..b95017b536 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BBDB8_E30708.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BBDB8_E30708 +/* E30708 802BBDB8 C4800054 */ lwc1 $f0, 0x54($a0) +/* E3070C 802BBDBC 3C01802C */ lui $at, %hi(D_802BCB90) +/* E30710 802BBDC0 D422CB90 */ ldc1 $f2, %lo(D_802BCB90)($at) +/* E30714 802BBDC4 46000021 */ cvt.d.s $f0, $f0 +/* E30718 802BBDC8 46220000 */ add.d $f0, $f0, $f2 +/* E3071C 802BBDCC 3C013FF0 */ lui $at, 0x3ff0 +/* E30720 802BBDD0 44811800 */ mtc1 $at, $f3 +/* E30724 802BBDD4 44801000 */ mtc1 $zero, $f2 +/* E30728 802BBDD8 46200020 */ cvt.s.d $f0, $f0 +/* E3072C 802BBDDC E4800054 */ swc1 $f0, 0x54($a0) +/* E30730 802BBDE0 46000021 */ cvt.d.s $f0, $f0 +/* E30734 802BBDE4 4620103E */ c.le.d $f2, $f0 +/* E30738 802BBDE8 00000000 */ nop +/* E3073C 802BBDEC 45000005 */ bc1f .L802BBE04 +/* E30740 802BBDF0 00000000 */ nop +/* E30744 802BBDF4 3C013F80 */ lui $at, 0x3f80 +/* E30748 802BBDF8 44810000 */ mtc1 $at, $f0 +/* E3074C 802BBDFC 00000000 */ nop +/* E30750 802BBE00 E4800054 */ swc1 $f0, 0x54($a0) +.L802BBE04: +/* E30754 802BBE04 C4800054 */ lwc1 $f0, 0x54($a0) +/* E30758 802BBE08 E4800058 */ swc1 $f0, 0x58($a0) +/* E3075C 802BBE0C 03E00008 */ jr $ra +/* E30760 802BBE10 E480005C */ swc1 $f0, 0x5c($a0) diff --git a/asm/nonmatchings/code_E2F750/func_802BBE14_E30764.s b/asm/nonmatchings/code_E2F750/func_802BBE14_E30764.s new file mode 100644 index 0000000000..856a6b4511 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BBE14_E30764.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BBE14_E30764 +/* E30764 802BBE14 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E30768 802BBE18 AFB00010 */ sw $s0, 0x10($sp) +/* E3076C 802BBE1C 0080802D */ daddu $s0, $a0, $zero +/* E30770 802BBE20 AFBF0018 */ sw $ra, 0x18($sp) +/* E30774 802BBE24 AFB10014 */ sw $s1, 0x14($sp) +/* E30778 802BBE28 8E110040 */ lw $s1, 0x40($s0) +/* E3077C 802BBE2C 3C028016 */ lui $v0, %hi(D_8015C7D0) +/* E30780 802BBE30 8C42C7D0 */ lw $v0, %lo(D_8015C7D0)($v0) +/* E30784 802BBE34 0C0AEDF8 */ jal func_802BB7E0_E30130 +/* E30788 802BBE38 AE2200A0 */ sw $v0, 0xa0($s1) +/* E3078C 802BBE3C 3C02802C */ lui $v0, %hi(func_802BB3B8_E2FD08) +/* E30790 802BBE40 2442B3B8 */ addiu $v0, $v0, %lo(func_802BB3B8_E2FD08) +/* E30794 802BBE44 A2200003 */ sb $zero, 3($s1) +/* E30798 802BBE48 AE02003C */ sw $v0, 0x3c($s0) +/* E3079C 802BBE4C AE000054 */ sw $zero, 0x54($s0) +/* E307A0 802BBE50 AE000058 */ sw $zero, 0x58($s0) +/* E307A4 802BBE54 AE00005C */ sw $zero, 0x5c($s0) +/* E307A8 802BBE58 8FBF0018 */ lw $ra, 0x18($sp) +/* E307AC 802BBE5C 8FB10014 */ lw $s1, 0x14($sp) +/* E307B0 802BBE60 8FB00010 */ lw $s0, 0x10($sp) +/* E307B4 802BBE64 03E00008 */ jr $ra +/* E307B8 802BBE68 27BD0020 */ addiu $sp, $sp, 0x20 +/* E307BC 802BBE6C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2F750/func_802BBE70_E307C0.s b/asm/nonmatchings/code_E2F750/func_802BBE70_E307C0.s new file mode 100644 index 0000000000..866846f052 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BBE70_E307C0.s @@ -0,0 +1,279 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BBE70_E307C0 +/* E307C0 802BBE70 27BDFEE8 */ addiu $sp, $sp, -0x118 +/* E307C4 802BBE74 AFB000F0 */ sw $s0, 0xf0($sp) +/* E307C8 802BBE78 3C10800A */ lui $s0, %hi(gMasterGfxPos) +/* E307CC 802BBE7C 8E10A66C */ lw $s0, %lo(gMasterGfxPos)($s0) +/* E307D0 802BBE80 AFBF0114 */ sw $ra, 0x114($sp) +/* E307D4 802BBE84 AFBE0110 */ sw $fp, 0x110($sp) +/* E307D8 802BBE88 AFB7010C */ sw $s7, 0x10c($sp) +/* E307DC 802BBE8C AFB60108 */ sw $s6, 0x108($sp) +/* E307E0 802BBE90 AFB50104 */ sw $s5, 0x104($sp) +/* E307E4 802BBE94 AFB40100 */ sw $s4, 0x100($sp) +/* E307E8 802BBE98 AFB300FC */ sw $s3, 0xfc($sp) +/* E307EC 802BBE9C AFB200F8 */ sw $s2, 0xf8($sp) +/* E307F0 802BBEA0 0C04417A */ jal get_entity_by_index +/* E307F4 802BBEA4 AFB100F4 */ sw $s1, 0xf4($sp) +/* E307F8 802BBEA8 0040902D */ daddu $s2, $v0, $zero +/* E307FC 802BBEAC 8E530040 */ lw $s3, 0x40($s2) +/* E30800 802BBEB0 27A40010 */ addiu $a0, $sp, 0x10 +/* E30804 802BBEB4 0C019D28 */ jal guMtxIdentF +/* E30808 802BBEB8 AFB30090 */ sw $s3, 0x90($sp) +/* E3080C 802BBEBC 27B10050 */ addiu $s1, $sp, 0x50 +/* E30810 802BBEC0 0220202D */ daddu $a0, $s1, $zero +/* E30814 802BBEC4 3C140001 */ lui $s4, 1 +/* E30818 802BBEC8 8E450048 */ lw $a1, 0x48($s2) +/* E3081C 802BBECC 8E660010 */ lw $a2, 0x10($s3) +/* E30820 802BBED0 8E470050 */ lw $a3, 0x50($s2) +/* E30824 802BBED4 36941630 */ ori $s4, $s4, 0x1630 +/* E30828 802BBED8 0C019E40 */ jal guTranslateF +/* E3082C 802BBEDC AFB40094 */ sw $s4, 0x94($sp) +/* E30830 802BBEE0 0220202D */ daddu $a0, $s1, $zero +/* E30834 802BBEE4 27A50010 */ addiu $a1, $sp, 0x10 +/* E30838 802BBEE8 0C019D80 */ jal guMtxCatF +/* E3083C 802BBEEC 0220302D */ daddu $a2, $s1, $zero +/* E30840 802BBEF0 0220202D */ daddu $a0, $s1, $zero +/* E30844 802BBEF4 3C118007 */ lui $s1, %hi(gMatrixListPos) +/* E30848 802BBEF8 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) +/* E3084C 802BBEFC 96250000 */ lhu $a1, ($s1) +/* E30850 802BBF00 3C02800A */ lui $v0, %hi(gDisplayContext) +/* E30854 802BBF04 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) +/* E30858 802BBF08 00052980 */ sll $a1, $a1, 6 +/* E3085C 802BBF0C 00B42821 */ addu $a1, $a1, $s4 +/* E30860 802BBF10 0C019D40 */ jal guMtxF2L +/* E30864 802BBF14 00452821 */ addu $a1, $v0, $a1 +/* E30868 802BBF18 0200202D */ daddu $a0, $s0, $zero +/* E3086C 802BBF1C 26100008 */ addiu $s0, $s0, 8 +/* E30870 802BBF20 3C03DA38 */ lui $v1, 0xda38 +/* E30874 802BBF24 34630002 */ ori $v1, $v1, 2 +/* E30878 802BBF28 0200A82D */ daddu $s5, $s0, $zero +/* E3087C 802BBF2C 26100008 */ addiu $s0, $s0, 8 +/* E30880 802BBF30 0200C02D */ daddu $t8, $s0, $zero +/* E30884 802BBF34 26100008 */ addiu $s0, $s0, 8 +/* E30888 802BBF38 3C13D838 */ lui $s3, 0xd838 +/* E3088C 802BBF3C 36730002 */ ori $s3, $s3, 2 +/* E30890 802BBF40 0200B02D */ daddu $s6, $s0, $zero +/* E30894 802BBF44 26100008 */ addiu $s0, $s0, 8 +/* E30898 802BBF48 0200C82D */ daddu $t9, $s0, $zero +/* E3089C 802BBF4C 26100008 */ addiu $s0, $s0, 8 +/* E308A0 802BBF50 3C14E300 */ lui $s4, 0xe300 +/* E308A4 802BBF54 36941001 */ ori $s4, $s4, 0x1001 +/* E308A8 802BBF58 0200F02D */ daddu $fp, $s0, $zero +/* E308AC 802BBF5C 26100008 */ addiu $s0, $s0, 8 +/* E308B0 802BBF60 AFB000E8 */ sw $s0, 0xe8($sp) +/* E308B4 802BBF64 26100008 */ addiu $s0, $s0, 8 +/* E308B8 802BBF68 AFB000A0 */ sw $s0, 0xa0($sp) +/* E308BC 802BBF6C 26100008 */ addiu $s0, $s0, 8 +/* E308C0 802BBF70 AFB30098 */ sw $s3, 0x98($sp) +/* E308C4 802BBF74 3C13F500 */ lui $s3, 0xf500 +/* E308C8 802BBF78 36730100 */ ori $s3, $s3, 0x100 +/* E308CC 802BBF7C AFB000A8 */ sw $s0, 0xa8($sp) +/* E308D0 802BBF80 26100008 */ addiu $s0, $s0, 8 +/* E308D4 802BBF84 AFB000AC */ sw $s0, 0xac($sp) +/* E308D8 802BBF88 26100008 */ addiu $s0, $s0, 8 +/* E308DC 802BBF8C AFB4009C */ sw $s4, 0x9c($sp) +/* E308E0 802BBF90 3C140703 */ lui $s4, 0x703 +/* E308E4 802BBF94 3694C000 */ ori $s4, $s4, 0xc000 +/* E308E8 802BBF98 AFB000EC */ sw $s0, 0xec($sp) +/* E308EC 802BBF9C 26100008 */ addiu $s0, $s0, 8 +/* E308F0 802BBFA0 AFB000B4 */ sw $s0, 0xb4($sp) +/* E308F4 802BBFA4 26100008 */ addiu $s0, $s0, 8 +/* E308F8 802BBFA8 AFB300A4 */ sw $s3, 0xa4($sp) +/* E308FC 802BBFAC 3C13D700 */ lui $s3, 0xd700 +/* E30900 802BBFB0 36730002 */ ori $s3, $s3, 2 +/* E30904 802BBFB4 0200B82D */ daddu $s7, $s0, $zero +/* E30908 802BBFB8 26100008 */ addiu $s0, $s0, 8 +/* E3090C 802BBFBC AFB400B0 */ sw $s4, 0xb0($sp) +/* E30910 802BBFC0 3C14FC12 */ lui $s4, 0xfc12 +/* E30914 802BBFC4 36941824 */ ori $s4, $s4, 0x1824 +/* E30918 802BBFC8 AFB300B8 */ sw $s3, 0xb8($sp) +/* E3091C 802BBFCC 3C13FF33 */ lui $s3, 0xff33 +/* E30920 802BBFD0 3673FFFF */ ori $s3, $s3, 0xffff +/* E30924 802BBFD4 0200782D */ daddu $t7, $s0, $zero +/* E30928 802BBFD8 26100008 */ addiu $s0, $s0, 8 +/* E3092C 802BBFDC AFB400BC */ sw $s4, 0xbc($sp) +/* E30930 802BBFE0 3C14E300 */ lui $s4, 0xe300 +/* E30934 802BBFE4 36940D01 */ ori $s4, $s4, 0xd01 +/* E30938 802BBFE8 0200582D */ daddu $t3, $s0, $zero +/* E3093C 802BBFEC 26100008 */ addiu $s0, $s0, 8 +/* E30940 802BBFF0 AFB300C0 */ sw $s3, 0xc0($sp) +/* E30944 802BBFF4 3C13E300 */ lui $s3, 0xe300 +/* E30948 802BBFF8 36730F00 */ ori $s3, $s3, 0xf00 +/* E3094C 802BBFFC 0200602D */ daddu $t4, $s0, $zero +/* E30950 802BC000 26100008 */ addiu $s0, $s0, 8 +/* E30954 802BC004 0200702D */ daddu $t6, $s0, $zero +/* E30958 802BC008 26100008 */ addiu $s0, $s0, 8 +/* E3095C 802BC00C AFB400C4 */ sw $s4, 0xc4($sp) +/* E30960 802BC010 3C140701 */ lui $s4, 0x701 +/* E30964 802BC014 36944170 */ ori $s4, $s4, 0x4170 +/* E30968 802BC018 0200502D */ daddu $t2, $s0, $zero +/* E3096C 802BC01C 26100008 */ addiu $s0, $s0, 8 +/* E30970 802BC020 0200682D */ daddu $t5, $s0, $zero +/* E30974 802BC024 26100008 */ addiu $s0, $s0, 8 +/* E30978 802BC028 AFB300C8 */ sw $s3, 0xc8($sp) +/* E3097C 802BC02C 3C13073F */ lui $s3, 0x73f +/* E30980 802BC030 3673F100 */ ori $s3, $s3, 0xf100 +/* E30984 802BC034 0200402D */ daddu $t0, $s0, $zero +/* E30988 802BC038 AFB400CC */ sw $s4, 0xcc($sp) +/* E3098C 802BC03C 3C14F540 */ lui $s4, 0xf540 +/* E30990 802BC040 36941000 */ ori $s4, $s4, 0x1000 +/* E30994 802BC044 AFB300D0 */ sw $s3, 0xd0($sp) +/* E30998 802BC048 3C130001 */ lui $s3, 1 +/* E3099C 802BC04C 36734170 */ ori $s3, $s3, 0x4170 +/* E309A0 802BC050 AFB400D4 */ sw $s4, 0xd4($sp) +/* E309A4 802BC054 3C14001F */ lui $s4, 0x1f +/* E309A8 802BC058 3694C07C */ ori $s4, $s4, 0xc07c +/* E309AC 802BC05C AFB300D8 */ sw $s3, 0xd8($sp) +/* E309B0 802BC060 3C13E300 */ lui $s3, 0xe300 +/* E309B4 802BC064 36730C00 */ ori $s3, $s3, 0xc00 +/* E309B8 802BC068 AFB400DC */ sw $s4, 0xdc($sp) +/* E309BC 802BC06C 3C14E300 */ lui $s4, 0xe300 +/* E309C0 802BC070 AFB300E0 */ sw $s3, 0xe0($sp) +/* E309C4 802BC074 96220000 */ lhu $v0, ($s1) +/* E309C8 802BC078 36941201 */ ori $s4, $s4, 0x1201 +/* E309CC 802BC07C AFB400E4 */ sw $s4, 0xe4($sp) +/* E309D0 802BC080 AC830000 */ sw $v1, ($a0) +/* E309D4 802BC084 24430001 */ addiu $v1, $v0, 1 +/* E309D8 802BC088 3042FFFF */ andi $v0, $v0, 0xffff +/* E309DC 802BC08C 00021180 */ sll $v0, $v0, 6 +/* E309E0 802BC090 A6230000 */ sh $v1, ($s1) +/* E309E4 802BC094 8FB30094 */ lw $s3, 0x94($sp) +/* E309E8 802BC098 3C03800A */ lui $v1, %hi(gDisplayContext) +/* E309EC 802BC09C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) +/* E309F0 802BC0A0 00531021 */ addu $v0, $v0, $s3 +/* E309F4 802BC0A4 00621821 */ addu $v1, $v1, $v0 +/* E309F8 802BC0A8 3C02DE00 */ lui $v0, 0xde00 +/* E309FC 802BC0AC AC830004 */ sw $v1, 4($a0) +/* E30A00 802BC0B0 AEA20000 */ sw $v0, ($s5) +/* E30A04 802BC0B4 3C020A00 */ lui $v0, 0xa00 +/* E30A08 802BC0B8 24421148 */ addiu $v0, $v0, 0x1148 +/* E30A0C 802BC0BC 8E430044 */ lw $v1, 0x44($s2) +/* E30A10 802BC0C0 3042FFFF */ andi $v0, $v0, 0xffff +/* E30A14 802BC0C4 00621821 */ addu $v1, $v1, $v0 +/* E30A18 802BC0C8 24020040 */ addiu $v0, $zero, 0x40 +/* E30A1C 802BC0CC AEA30004 */ sw $v1, 4($s5) +/* E30A20 802BC0D0 8FB40098 */ lw $s4, 0x98($sp) +/* E30A24 802BC0D4 3C03E700 */ lui $v1, 0xe700 +/* E30A28 802BC0D8 AF140000 */ sw $s4, ($t8) +/* E30A2C 802BC0DC AF020004 */ sw $v0, 4($t8) +/* E30A30 802BC0E0 AEC30000 */ sw $v1, ($s6) +/* E30A34 802BC0E4 AEC00004 */ sw $zero, 4($s6) +/* E30A38 802BC0E8 8FB3009C */ lw $s3, 0x9c($sp) +/* E30A3C 802BC0EC 34028000 */ ori $v0, $zero, 0x8000 +/* E30A40 802BC0F0 AF330000 */ sw $s3, ($t9) +/* E30A44 802BC0F4 AF220004 */ sw $v0, 4($t9) +/* E30A48 802BC0F8 3C02FD10 */ lui $v0, 0xfd10 +/* E30A4C 802BC0FC AFC20000 */ sw $v0, ($fp) +/* E30A50 802BC100 3C020A00 */ lui $v0, 0xa00 +/* E30A54 802BC104 24420D08 */ addiu $v0, $v0, 0xd08 +/* E30A58 802BC108 AFC20004 */ sw $v0, 4($fp) +/* E30A5C 802BC10C 8FB400E8 */ lw $s4, 0xe8($sp) +/* E30A60 802BC110 3C02E800 */ lui $v0, 0xe800 +/* E30A64 802BC114 AE820000 */ sw $v0, ($s4) +/* E30A68 802BC118 AE800004 */ sw $zero, 4($s4) +/* E30A6C 802BC11C 8FB400A4 */ lw $s4, 0xa4($sp) +/* E30A70 802BC120 8FB300A0 */ lw $s3, 0xa0($sp) +/* E30A74 802BC124 3C020700 */ lui $v0, 0x700 +/* E30A78 802BC128 AE740000 */ sw $s4, ($s3) +/* E30A7C 802BC12C AE620004 */ sw $v0, 4($s3) +/* E30A80 802BC130 8FB300A8 */ lw $s3, 0xa8($sp) +/* E30A84 802BC134 3C04E600 */ lui $a0, 0xe600 +/* E30A88 802BC138 AE640000 */ sw $a0, ($s3) +/* E30A8C 802BC13C AE600004 */ sw $zero, 4($s3) +/* E30A90 802BC140 8FB400AC */ lw $s4, 0xac($sp) +/* E30A94 802BC144 3C02F000 */ lui $v0, 0xf000 +/* E30A98 802BC148 AE820000 */ sw $v0, ($s4) +/* E30A9C 802BC14C 8FB300B0 */ lw $s3, 0xb0($sp) +/* E30AA0 802BC150 26100008 */ addiu $s0, $s0, 8 +/* E30AA4 802BC154 AE930004 */ sw $s3, 4($s4) +/* E30AA8 802BC158 8FB400EC */ lw $s4, 0xec($sp) +/* E30AAC 802BC15C 0200482D */ daddu $t1, $s0, $zero +/* E30AB0 802BC160 AE830000 */ sw $v1, ($s4) +/* E30AB4 802BC164 AE800004 */ sw $zero, 4($s4) +/* E30AB8 802BC168 8FB400B8 */ lw $s4, 0xb8($sp) +/* E30ABC 802BC16C 8FB300B4 */ lw $s3, 0xb4($sp) +/* E30AC0 802BC170 2402FFFF */ addiu $v0, $zero, -1 +/* E30AC4 802BC174 AE740000 */ sw $s4, ($s3) +/* E30AC8 802BC178 AE620004 */ sw $v0, 4($s3) +/* E30ACC 802BC17C 8FB300BC */ lw $s3, 0xbc($sp) +/* E30AD0 802BC180 26100008 */ addiu $s0, $s0, 8 +/* E30AD4 802BC184 AEF30000 */ sw $s3, ($s7) +/* E30AD8 802BC188 8FB400C0 */ lw $s4, 0xc0($sp) +/* E30ADC 802BC18C 0200382D */ daddu $a3, $s0, $zero +/* E30AE0 802BC190 AEF40004 */ sw $s4, 4($s7) +/* E30AE4 802BC194 8FB300C4 */ lw $s3, 0xc4($sp) +/* E30AE8 802BC198 26100008 */ addiu $s0, $s0, 8 +/* E30AEC 802BC19C ADF30000 */ sw $s3, ($t7) +/* E30AF0 802BC1A0 ADE00004 */ sw $zero, 4($t7) +/* E30AF4 802BC1A4 8FB400C8 */ lw $s4, 0xc8($sp) +/* E30AF8 802BC1A8 3C02FD50 */ lui $v0, 0xfd50 +/* E30AFC 802BC1AC AD740000 */ sw $s4, ($t3) +/* E30B00 802BC1B0 AD600004 */ sw $zero, 4($t3) +/* E30B04 802BC1B4 AD820000 */ sw $v0, ($t4) +/* E30B08 802BC1B8 3C020A00 */ lui $v0, 0xa00 +/* E30B0C 802BC1BC 24420508 */ addiu $v0, $v0, 0x508 +/* E30B10 802BC1C0 AD820004 */ sw $v0, 4($t4) +/* E30B14 802BC1C4 3C02F550 */ lui $v0, 0xf550 +/* E30B18 802BC1C8 ADC20000 */ sw $v0, ($t6) +/* E30B1C 802BC1CC 8FB300CC */ lw $s3, 0xcc($sp) +/* E30B20 802BC1D0 3C02F300 */ lui $v0, 0xf300 +/* E30B24 802BC1D4 ADD30004 */ sw $s3, 4($t6) +/* E30B28 802BC1D8 AD440000 */ sw $a0, ($t2) +/* E30B2C 802BC1DC AD400004 */ sw $zero, 4($t2) +/* E30B30 802BC1E0 ADA20000 */ sw $v0, ($t5) +/* E30B34 802BC1E4 8FB400D0 */ lw $s4, 0xd0($sp) +/* E30B38 802BC1E8 0200302D */ daddu $a2, $s0, $zero +/* E30B3C 802BC1EC ADB40004 */ sw $s4, 4($t5) +/* E30B40 802BC1F0 AD030000 */ sw $v1, ($t0) +/* E30B44 802BC1F4 AD000004 */ sw $zero, 4($t0) +/* E30B48 802BC1F8 8FB300D4 */ lw $s3, 0xd4($sp) +/* E30B4C 802BC1FC 26100008 */ addiu $s0, $s0, 8 +/* E30B50 802BC200 AD330000 */ sw $s3, ($t1) +/* E30B54 802BC204 8FB400D8 */ lw $s4, 0xd8($sp) +/* E30B58 802BC208 3C03F200 */ lui $v1, 0xf200 +/* E30B5C 802BC20C AD340004 */ sw $s4, 4($t1) +/* E30B60 802BC210 ACE30000 */ sw $v1, ($a3) +/* E30B64 802BC214 8FB300DC */ lw $s3, 0xdc($sp) +/* E30B68 802BC218 0200282D */ daddu $a1, $s0, $zero +/* E30B6C 802BC21C ACF30004 */ sw $s3, 4($a3) +/* E30B70 802BC220 8FB400E0 */ lw $s4, 0xe0($sp) +/* E30B74 802BC224 3C020008 */ lui $v0, 8 +/* E30B78 802BC228 ACD40000 */ sw $s4, ($a2) +/* E30B7C 802BC22C ACC20004 */ sw $v0, 4($a2) +/* E30B80 802BC230 8FB300E4 */ lw $s3, 0xe4($sp) +/* E30B84 802BC234 24022000 */ addiu $v0, $zero, 0x2000 +/* E30B88 802BC238 ACB30000 */ sw $s3, ($a1) +/* E30B8C 802BC23C ACA20004 */ sw $v0, 4($a1) +/* E30B90 802BC240 8FB40090 */ lw $s4, 0x90($sp) +/* E30B94 802BC244 26100008 */ addiu $s0, $s0, 8 +/* E30B98 802BC248 82820005 */ lb $v0, 5($s4) +/* E30B9C 802BC24C 0200202D */ daddu $a0, $s0, $zero +/* E30BA0 802BC250 00021080 */ sll $v0, $v0, 2 +/* E30BA4 802BC254 30420FFF */ andi $v0, $v0, 0xfff +/* E30BA8 802BC258 00021300 */ sll $v0, $v0, 0xc +/* E30BAC 802BC25C 00431025 */ or $v0, $v0, $v1 +/* E30BB0 802BC260 AC820000 */ sw $v0, ($a0) +/* E30BB4 802BC264 82820005 */ lb $v0, 5($s4) +/* E30BB8 802BC268 26100008 */ addiu $s0, $s0, 8 +/* E30BBC 802BC26C 3C01800A */ lui $at, %hi(gMasterGfxPos) +/* E30BC0 802BC270 AC30A66C */ sw $s0, %lo(gMasterGfxPos)($at) +/* E30BC4 802BC274 2442007C */ addiu $v0, $v0, 0x7c +/* E30BC8 802BC278 00021080 */ sll $v0, $v0, 2 +/* E30BCC 802BC27C 30420FFF */ andi $v0, $v0, 0xfff +/* E30BD0 802BC280 00021300 */ sll $v0, $v0, 0xc +/* E30BD4 802BC284 3442007C */ ori $v0, $v0, 0x7c +/* E30BD8 802BC288 AC820004 */ sw $v0, 4($a0) +/* E30BDC 802BC28C 8FBF0114 */ lw $ra, 0x114($sp) +/* E30BE0 802BC290 8FBE0110 */ lw $fp, 0x110($sp) +/* E30BE4 802BC294 8FB7010C */ lw $s7, 0x10c($sp) +/* E30BE8 802BC298 8FB60108 */ lw $s6, 0x108($sp) +/* E30BEC 802BC29C 8FB50104 */ lw $s5, 0x104($sp) +/* E30BF0 802BC2A0 8FB40100 */ lw $s4, 0x100($sp) +/* E30BF4 802BC2A4 8FB300FC */ lw $s3, 0xfc($sp) +/* E30BF8 802BC2A8 8FB200F8 */ lw $s2, 0xf8($sp) +/* E30BFC 802BC2AC 8FB100F4 */ lw $s1, 0xf4($sp) +/* E30C00 802BC2B0 8FB000F0 */ lw $s0, 0xf0($sp) +/* E30C04 802BC2B4 03E00008 */ jr $ra +/* E30C08 802BC2B8 27BD0118 */ addiu $sp, $sp, 0x118 diff --git a/asm/nonmatchings/code_E2F750/func_802BC2BC_E30C0C.s b/asm/nonmatchings/code_E2F750/func_802BC2BC_E30C0C.s new file mode 100644 index 0000000000..97d8d9af00 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BC2BC_E30C0C.s @@ -0,0 +1,137 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC2BC_E30C0C +/* E30C0C 802BC2BC 3C058016 */ lui $a1, %hi(gCollisionStatus+0x2) +/* E30C10 802BC2C0 94A5A552 */ lhu $a1, %lo(gCollisionStatus+0x2)($a1) +/* E30C14 802BC2C4 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* E30C18 802BC2C8 AFB20038 */ sw $s2, 0x38($sp) +/* E30C1C 802BC2CC 0080902D */ daddu $s2, $a0, $zero +/* E30C20 802BC2D0 AFB3003C */ sw $s3, 0x3c($sp) +/* E30C24 802BC2D4 AFB50044 */ sw $s5, 0x44($sp) +/* E30C28 802BC2D8 3C158011 */ lui $s5, %hi(gPlayerStatus) +/* E30C2C 802BC2DC 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) +/* E30C30 802BC2E0 AFBF0048 */ sw $ra, 0x48($sp) +/* E30C34 802BC2E4 AFB40040 */ sw $s4, 0x40($sp) +/* E30C38 802BC2E8 AFB10034 */ sw $s1, 0x34($sp) +/* E30C3C 802BC2EC AFB00030 */ sw $s0, 0x30($sp) +/* E30C40 802BC2F0 F7B40050 */ sdc1 $f20, 0x50($sp) +/* E30C44 802BC2F4 8E540040 */ lw $s4, 0x40($s2) +/* E30C48 802BC2F8 82A400B4 */ lb $a0, 0xb4($s5) +/* E30C4C 802BC2FC 30A24000 */ andi $v0, $a1, 0x4000 +/* E30C50 802BC300 1040002E */ beqz $v0, .L802BC3BC +/* E30C54 802BC304 0000982D */ daddu $s3, $zero, $zero +/* E30C58 802BC308 92430004 */ lbu $v1, 4($s2) +/* E30C5C 802BC30C 30A200FF */ andi $v0, $a1, 0xff +/* E30C60 802BC310 1443002A */ bne $v0, $v1, .L802BC3BC +/* E30C64 802BC314 24020012 */ addiu $v0, $zero, 0x12 +/* E30C68 802BC318 14820028 */ bne $a0, $v0, .L802BC3BC +/* E30C6C 802BC31C 00000000 */ nop +/* E30C70 802BC320 C6A00028 */ lwc1 $f0, 0x28($s5) +/* E30C74 802BC324 3C0140A0 */ lui $at, 0x40a0 +/* E30C78 802BC328 44811000 */ mtc1 $at, $f2 +/* E30C7C 802BC32C 3C014120 */ lui $at, 0x4120 +/* E30C80 802BC330 4481A000 */ mtc1 $at, $f20 +/* E30C84 802BC334 E7A00020 */ swc1 $f0, 0x20($sp) +/* E30C88 802BC338 C6A0002C */ lwc1 $f0, 0x2c($s5) +/* E30C8C 802BC33C C6A40030 */ lwc1 $f4, 0x30($s5) +/* E30C90 802BC340 46020000 */ add.s $f0, $f0, $f2 +/* E30C94 802BC344 E7B4002C */ swc1 $f20, 0x2c($sp) +/* E30C98 802BC348 E7A40024 */ swc1 $f4, 0x24($sp) +/* E30C9C 802BC34C 0C0394D2 */ jal func_800E5348 +/* E30CA0 802BC350 E7A00028 */ swc1 $f0, 0x28($sp) +/* E30CA4 802BC354 27B10020 */ addiu $s1, $sp, 0x20 +/* E30CA8 802BC358 0220202D */ daddu $a0, $s1, $zero +/* E30CAC 802BC35C 27B00024 */ addiu $s0, $sp, 0x24 +/* E30CB0 802BC360 4406A000 */ mfc1 $a2, $f20 +/* E30CB4 802BC364 44070000 */ mfc1 $a3, $f0 +/* E30CB8 802BC368 0C00A7E7 */ jal add_vec2D_polar +/* E30CBC 802BC36C 0200282D */ daddu $a1, $s0, $zero +/* E30CC0 802BC370 3C040001 */ lui $a0, 1 +/* E30CC4 802BC374 0220282D */ daddu $a1, $s1, $zero +/* E30CC8 802BC378 27A60028 */ addiu $a2, $sp, 0x28 +/* E30CCC 802BC37C 0200382D */ daddu $a3, $s0, $zero +/* E30CD0 802BC380 27A2002C */ addiu $v0, $sp, 0x2c +/* E30CD4 802BC384 0C0372DF */ jal func_800DCB7C +/* E30CD8 802BC388 AFA20010 */ sw $v0, 0x10($sp) +/* E30CDC 802BC38C 10400019 */ beqz $v0, .L802BC3F4 +/* E30CE0 802BC390 00000000 */ nop +/* E30CE4 802BC394 3C048011 */ lui $a0, %hi(D_8010C978) +/* E30CE8 802BC398 8C84C978 */ lw $a0, %lo(D_8010C978)($a0) +/* E30CEC 802BC39C 30824000 */ andi $v0, $a0, 0x4000 +/* E30CF0 802BC3A0 10400014 */ beqz $v0, .L802BC3F4 +/* E30CF4 802BC3A4 00000000 */ nop +/* E30CF8 802BC3A8 0C0441A9 */ jal get_entity_type +/* E30CFC 802BC3AC 00000000 */ nop +/* E30D00 802BC3B0 38420031 */ xori $v0, $v0, 0x31 +/* E30D04 802BC3B4 080AF0FD */ j .L802BC3F4 +/* E30D08 802BC3B8 2C530001 */ sltiu $s3, $v0, 1 +.L802BC3BC: +/* E30D0C 802BC3BC 92420006 */ lbu $v0, 6($s2) +/* E30D10 802BC3C0 30420001 */ andi $v0, $v0, 1 +/* E30D14 802BC3C4 10400007 */ beqz $v0, .L802BC3E4 +/* E30D18 802BC3C8 2402000E */ addiu $v0, $zero, 0xe +/* E30D1C 802BC3CC 10820003 */ beq $a0, $v0, .L802BC3DC +/* E30D20 802BC3D0 24020010 */ addiu $v0, $zero, 0x10 +/* E30D24 802BC3D4 14820003 */ bne $a0, $v0, .L802BC3E4 +/* E30D28 802BC3D8 00000000 */ nop +.L802BC3DC: +/* E30D2C 802BC3DC 080AF0FD */ j .L802BC3F4 +/* E30D30 802BC3E0 24130001 */ addiu $s3, $zero, 1 +.L802BC3E4: +/* E30D34 802BC3E4 92420006 */ lbu $v0, 6($s2) +/* E30D38 802BC3E8 30420040 */ andi $v0, $v0, 0x40 +/* E30D3C 802BC3EC 54400001 */ bnel $v0, $zero, .L802BC3F4 +/* E30D40 802BC3F0 2413FFFF */ addiu $s3, $zero, -1 +.L802BC3F4: +/* E30D44 802BC3F4 12600026 */ beqz $s3, .L802BC490 +/* E30D48 802BC3F8 00000000 */ nop +/* E30D4C 802BC3FC 92820002 */ lbu $v0, 2($s4) +/* E30D50 802BC400 3C01BF80 */ lui $at, 0xbf80 +/* E30D54 802BC404 44810000 */ mtc1 $at, $f0 +/* E30D58 802BC408 304200FE */ andi $v0, $v0, 0xfe +/* E30D5C 802BC40C A2820002 */ sb $v0, 2($s4) +/* E30D60 802BC410 C642004C */ lwc1 $f2, 0x4c($s2) +/* E30D64 802BC414 E7A00014 */ swc1 $f0, 0x14($sp) +/* E30D68 802BC418 3C01420C */ lui $at, 0x420c +/* E30D6C 802BC41C 44810000 */ mtc1 $at, $f0 +/* E30D70 802BC420 24020003 */ addiu $v0, $zero, 3 +/* E30D74 802BC424 AFA00010 */ sw $zero, 0x10($sp) +/* E30D78 802BC428 AFA00018 */ sw $zero, 0x18($sp) +/* E30D7C 802BC42C AFA2001C */ sw $v0, 0x1c($sp) +/* E30D80 802BC430 46001080 */ add.s $f2, $f2, $f0 +/* E30D84 802BC434 8E450048 */ lw $a1, 0x48($s2) +/* E30D88 802BC438 8E470050 */ lw $a3, 0x50($s2) +/* E30D8C 802BC43C 44061000 */ mfc1 $a2, $f2 +/* E30D90 802BC440 0C01C064 */ jal func_80070190 +/* E30D94 802BC444 0040202D */ daddu $a0, $v0, $zero +/* E30D98 802BC448 1A600004 */ blez $s3, .L802BC45C +/* E30D9C 802BC44C 00000000 */ nop +/* E30DA0 802BC450 92820002 */ lbu $v0, 2($s4) +/* E30DA4 802BC454 34420001 */ ori $v0, $v0, 1 +/* E30DA8 802BC458 A2820002 */ sb $v0, 2($s4) +.L802BC45C: +/* E30DAC 802BC45C C640004C */ lwc1 $f0, 0x4c($s2) +/* E30DB0 802BC460 3C014000 */ lui $at, 0x4000 +/* E30DB4 802BC464 44811000 */ mtc1 $at, $f2 +/* E30DB8 802BC468 00000000 */ nop +/* E30DBC 802BC46C 46020001 */ sub.s $f0, $f0, $f2 +/* E30DC0 802BC470 0240202D */ daddu $a0, $s2, $zero +/* E30DC4 802BC474 0C043F5A */ jal func_8010FD68 +/* E30DC8 802BC478 E480004C */ swc1 $f0, 0x4c($a0) +/* E30DCC 802BC47C 24020004 */ addiu $v0, $zero, 4 +/* E30DD0 802BC480 0C038045 */ jal disable_player_static_collisions +/* E30DD4 802BC484 A2820001 */ sb $v0, 1($s4) +/* E30DD8 802BC488 24020005 */ addiu $v0, $zero, 5 +/* E30DDC 802BC48C A2A200C5 */ sb $v0, 0xc5($s5) +.L802BC490: +/* E30DE0 802BC490 8FBF0048 */ lw $ra, 0x48($sp) +/* E30DE4 802BC494 8FB50044 */ lw $s5, 0x44($sp) +/* E30DE8 802BC498 8FB40040 */ lw $s4, 0x40($sp) +/* E30DEC 802BC49C 8FB3003C */ lw $s3, 0x3c($sp) +/* E30DF0 802BC4A0 8FB20038 */ lw $s2, 0x38($sp) +/* E30DF4 802BC4A4 8FB10034 */ lw $s1, 0x34($sp) +/* E30DF8 802BC4A8 8FB00030 */ lw $s0, 0x30($sp) +/* E30DFC 802BC4AC D7B40050 */ ldc1 $f20, 0x50($sp) +/* E30E00 802BC4B0 03E00008 */ jr $ra +/* E30E04 802BC4B4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/code_E2F750/func_802BC4B8_E30E08.s b/asm/nonmatchings/code_E2F750/func_802BC4B8_E30E08.s new file mode 100644 index 0000000000..95ae6ebe59 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BC4B8_E30E08.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC4B8_E30E08 +/* E30E08 802BC4B8 8C840040 */ lw $a0, 0x40($a0) +/* E30E0C 802BC4BC 90820004 */ lbu $v0, 4($a0) +/* E30E10 802BC4C0 2442FFFF */ addiu $v0, $v0, -1 +/* E30E14 802BC4C4 A0820004 */ sb $v0, 4($a0) +/* E30E18 802BC4C8 00021600 */ sll $v0, $v0, 0x18 +/* E30E1C 802BC4CC 1C40000F */ bgtz $v0, .L802BC50C +/* E30E20 802BC4D0 240200FF */ addiu $v0, $zero, 0xff +/* E30E24 802BC4D4 80830003 */ lb $v1, 3($a0) +/* E30E28 802BC4D8 3C06802C */ lui $a2, %hi(D_802BCAA0) +/* E30E2C 802BC4DC 24C6CAA0 */ addiu $a2, $a2, %lo(D_802BCAA0) +/* E30E30 802BC4E0 3C05802C */ lui $a1, %hi(D_802BCAA0) +/* E30E34 802BC4E4 00A32821 */ addu $a1, $a1, $v1 +/* E30E38 802BC4E8 90A5CAA0 */ lbu $a1, %lo(D_802BCAA0)($a1) +/* E30E3C 802BC4EC 10A20007 */ beq $a1, $v0, .L802BC50C +/* E30E40 802BC4F0 24630001 */ addiu $v1, $v1, 1 +/* E30E44 802BC4F4 00661021 */ addu $v0, $v1, $a2 +/* E30E48 802BC4F8 A0850005 */ sb $a1, 5($a0) +/* E30E4C 802BC4FC 90420000 */ lbu $v0, ($v0) +/* E30E50 802BC500 24630001 */ addiu $v1, $v1, 1 +/* E30E54 802BC504 A0830003 */ sb $v1, 3($a0) +/* E30E58 802BC508 A0820004 */ sb $v0, 4($a0) +.L802BC50C: +/* E30E5C 802BC50C 03E00008 */ jr $ra +/* E30E60 802BC510 00000000 */ nop diff --git a/asm/nonmatchings/code_E2F750/func_802BC514_E30E64.s b/asm/nonmatchings/code_E2F750/func_802BC514_E30E64.s new file mode 100644 index 0000000000..89d581a56b --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BC514_E30E64.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC514_E30E64 +/* E30E64 802BC514 8C830040 */ lw $v1, 0x40($a0) +/* E30E68 802BC518 90620001 */ lbu $v0, 1($v1) +/* E30E6C 802BC51C C4620008 */ lwc1 $f2, 8($v1) +/* E30E70 802BC520 30420001 */ andi $v0, $v0, 1 +/* E30E74 802BC524 3C01BF80 */ lui $at, 0xbf80 +/* E30E78 802BC528 44810000 */ mtc1 $at, $f0 +/* E30E7C 802BC52C 10400004 */ beqz $v0, .L802BC540 +/* E30E80 802BC530 24840048 */ addiu $a0, $a0, 0x48 +/* E30E84 802BC534 3C013F80 */ lui $at, 0x3f80 +/* E30E88 802BC538 44810000 */ mtc1 $at, $f0 +/* E30E8C 802BC53C 00000000 */ nop +.L802BC540: +/* E30E90 802BC540 46001000 */ add.s $f0, $f2, $f0 +/* E30E94 802BC544 E4800000 */ swc1 $f0, ($a0) +/* E30E98 802BC548 90620001 */ lbu $v0, 1($v1) +/* E30E9C 802BC54C 2442FFFF */ addiu $v0, $v0, -1 +/* E30EA0 802BC550 03E00008 */ jr $ra +/* E30EA4 802BC554 A0620001 */ sb $v0, 1($v1) diff --git a/asm/nonmatchings/code_E2F750/func_802BC558_E30EA8.s b/asm/nonmatchings/code_E2F750/func_802BC558_E30EA8.s new file mode 100644 index 0000000000..475df95a5a --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BC558_E30EA8.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC558_E30EA8 +/* E30EA8 802BC558 8C820040 */ lw $v0, 0x40($a0) +/* E30EAC 802BC55C C4400008 */ lwc1 $f0, 8($v0) +/* E30EB0 802BC560 E4800048 */ swc1 $f0, 0x48($a0) +/* E30EB4 802BC564 C440000C */ lwc1 $f0, 0xc($v0) +/* E30EB8 802BC568 03E00008 */ jr $ra +/* E30EBC 802BC56C E4800050 */ swc1 $f0, 0x50($a0) diff --git a/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s b/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s new file mode 100644 index 0000000000..216cc5690e --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s @@ -0,0 +1,279 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC570_E30EC0 +/* E30EC0 802BC570 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* E30EC4 802BC574 AFB10014 */ sw $s1, 0x14($sp) +/* E30EC8 802BC578 0080882D */ daddu $s1, $a0, $zero +/* E30ECC 802BC57C AFBF0018 */ sw $ra, 0x18($sp) +/* E30ED0 802BC580 AFB00010 */ sw $s0, 0x10($sp) +/* E30ED4 802BC584 F7BA0038 */ sdc1 $f26, 0x38($sp) +/* E30ED8 802BC588 F7B80030 */ sdc1 $f24, 0x30($sp) +/* E30EDC 802BC58C F7B60028 */ sdc1 $f22, 0x28($sp) +/* E30EE0 802BC590 F7B40020 */ sdc1 $f20, 0x20($sp) +/* E30EE4 802BC594 8E300040 */ lw $s0, 0x40($s1) +/* E30EE8 802BC598 82030000 */ lb $v1, ($s0) +/* E30EEC 802BC59C 2C620007 */ sltiu $v0, $v1, 7 +/* E30EF0 802BC5A0 104000F5 */ beqz $v0, .L802BC978 +/* E30EF4 802BC5A4 00031080 */ sll $v0, $v1, 2 +/* E30EF8 802BC5A8 3C01802C */ lui $at, %hi(D_802BCBA0) +/* E30EFC 802BC5AC 00220821 */ addu $at, $at, $v0 +/* E30F00 802BC5B0 8C22CBA0 */ lw $v0, %lo(D_802BCBA0)($at) +/* E30F04 802BC5B4 00400008 */ jr $v0 +/* E30F08 802BC5B8 00000000 */ nop +/* E30F0C 802BC5BC 92020000 */ lbu $v0, ($s0) +/* E30F10 802BC5C0 3C0142B4 */ lui $at, 0x42b4 +/* E30F14 802BC5C4 44810000 */ mtc1 $at, $f0 +/* E30F18 802BC5C8 3C03802C */ lui $v1, %hi(D_802BCAA0) +/* E30F1C 802BC5CC 2463CAA0 */ addiu $v1, $v1, %lo(D_802BCAA0) +/* E30F20 802BC5D0 A2000004 */ sb $zero, 4($s0) +/* E30F24 802BC5D4 A2000003 */ sb $zero, 3($s0) +/* E30F28 802BC5D8 24420001 */ addiu $v0, $v0, 1 +/* E30F2C 802BC5DC A2020000 */ sb $v0, ($s0) +/* E30F30 802BC5E0 E6000014 */ swc1 $f0, 0x14($s0) +/* E30F34 802BC5E4 90620000 */ lbu $v0, ($v1) +/* E30F38 802BC5E8 A2020005 */ sb $v0, 5($s0) +/* E30F3C 802BC5EC 90620001 */ lbu $v0, 1($v1) +/* E30F40 802BC5F0 24042085 */ addiu $a0, $zero, 0x2085 +/* E30F44 802BC5F4 0C05272D */ jal play_sound +/* E30F48 802BC5F8 A2020004 */ sb $v0, 4($s0) +/* E30F4C 802BC5FC C60C0014 */ lwc1 $f12, 0x14($s0) +/* E30F50 802BC600 3C0140C9 */ lui $at, 0x40c9 +/* E30F54 802BC604 34210FD0 */ ori $at, $at, 0xfd0 +/* E30F58 802BC608 44810000 */ mtc1 $at, $f0 +/* E30F5C 802BC60C 00000000 */ nop +/* E30F60 802BC610 46006302 */ mul.s $f12, $f12, $f0 +/* E30F64 802BC614 00000000 */ nop +/* E30F68 802BC618 C634004C */ lwc1 $f20, 0x4c($s1) +/* E30F6C 802BC61C 3C0143B4 */ lui $at, 0x43b4 +/* E30F70 802BC620 44810000 */ mtc1 $at, $f0 +/* E30F74 802BC624 4600A521 */ cvt.d.s $f20, $f20 +/* E30F78 802BC628 0C00A85B */ jal sin_rad +/* E30F7C 802BC62C 46006303 */ div.s $f12, $f12, $f0 +/* E30F80 802BC630 3C014020 */ lui $at, 0x4020 +/* E30F84 802BC634 44811800 */ mtc1 $at, $f3 +/* E30F88 802BC638 44801000 */ mtc1 $zero, $f2 +/* E30F8C 802BC63C 46000021 */ cvt.d.s $f0, $f0 +/* E30F90 802BC640 46220002 */ mul.d $f0, $f0, $f2 +/* E30F94 802BC644 00000000 */ nop +/* E30F98 802BC648 4620A500 */ add.d $f20, $f20, $f0 +/* E30F9C 802BC64C 3C014000 */ lui $at, 0x4000 +/* E30FA0 802BC650 44812000 */ mtc1 $at, $f4 +/* E30FA4 802BC654 4620A520 */ cvt.s.d $f20, $f20 +/* E30FA8 802BC658 E634004C */ swc1 $f20, 0x4c($s1) +/* E30FAC 802BC65C C6000014 */ lwc1 $f0, 0x14($s0) +/* E30FB0 802BC660 46040000 */ add.s $f0, $f0, $f4 +/* E30FB4 802BC664 3C014334 */ lui $at, 0x4334 +/* E30FB8 802BC668 44811000 */ mtc1 $at, $f2 +/* E30FBC 802BC66C 00000000 */ nop +/* E30FC0 802BC670 4600103E */ c.le.s $f2, $f0 +/* E30FC4 802BC674 00000000 */ nop +/* E30FC8 802BC678 45000002 */ bc1f .L802BC684 +/* E30FCC 802BC67C E6000014 */ swc1 $f0, 0x14($s0) +/* E30FD0 802BC680 E6020014 */ swc1 $f2, 0x14($s0) +.L802BC684: +/* E30FD4 802BC684 C6000010 */ lwc1 $f0, 0x10($s0) +/* E30FD8 802BC688 3C014248 */ lui $at, 0x4248 +/* E30FDC 802BC68C 44811000 */ mtc1 $at, $f2 +/* E30FE0 802BC690 00000000 */ nop +/* E30FE4 802BC694 46020080 */ add.s $f2, $f0, $f2 +/* E30FE8 802BC698 C620004C */ lwc1 $f0, 0x4c($s1) +/* E30FEC 802BC69C 4600103C */ c.lt.s $f2, $f0 +/* E30FF0 802BC6A0 00000000 */ nop +/* E30FF4 802BC6A4 450000B4 */ bc1f .L802BC978 +/* E30FF8 802BC6A8 00000000 */ nop +/* E30FFC 802BC6AC E622004C */ swc1 $f2, 0x4c($s1) +/* E31000 802BC6B0 92020000 */ lbu $v0, ($s0) +/* E31004 802BC6B4 3C014040 */ lui $at, 0x4040 +/* E31008 802BC6B8 44810000 */ mtc1 $at, $f0 +/* E3100C 802BC6BC 3C0142B4 */ lui $at, 0x42b4 +/* E31010 802BC6C0 44811000 */ mtc1 $at, $f2 +/* E31014 802BC6C4 E6040020 */ swc1 $f4, 0x20($s0) +/* E31018 802BC6C8 24420001 */ addiu $v0, $v0, 1 +/* E3101C 802BC6CC A2020000 */ sb $v0, ($s0) +/* E31020 802BC6D0 E6000018 */ swc1 $f0, 0x18($s0) +/* E31024 802BC6D4 080AF25E */ j .L802BC978 +/* E31028 802BC6D8 E602001C */ swc1 $f2, 0x1c($s0) +/* E3102C 802BC6DC C60C001C */ lwc1 $f12, 0x1c($s0) +/* E31030 802BC6E0 3C0140C9 */ lui $at, 0x40c9 +/* E31034 802BC6E4 34210FD0 */ ori $at, $at, 0xfd0 +/* E31038 802BC6E8 4481C000 */ mtc1 $at, $f24 +/* E3103C 802BC6EC 00000000 */ nop +/* E31040 802BC6F0 46186302 */ mul.s $f12, $f12, $f24 +/* E31044 802BC6F4 00000000 */ nop +/* E31048 802BC6F8 3C0143B4 */ lui $at, 0x43b4 +/* E3104C 802BC6FC 4481A000 */ mtc1 $at, $f20 +/* E31050 802BC700 0C00A85B */ jal sin_rad +/* E31054 802BC704 46146303 */ div.s $f12, $f12, $f20 +/* E31058 802BC708 C60C0020 */ lwc1 $f12, 0x20($s0) +/* E3105C 802BC70C 46006302 */ mul.s $f12, $f12, $f0 +/* E31060 802BC710 00000000 */ nop +/* E31064 802BC714 0C00A6C9 */ jal clamp_angle +/* E31068 802BC718 E62C0068 */ swc1 $f12, 0x68($s1) +/* E3106C 802BC71C C600001C */ lwc1 $f0, 0x1c($s0) +/* E31070 802BC720 3C0141F0 */ lui $at, 0x41f0 +/* E31074 802BC724 4481B000 */ mtc1 $at, $f22 +/* E31078 802BC728 00000000 */ nop +/* E3107C 802BC72C 46160000 */ add.s $f0, $f0, $f22 +/* E31080 802BC730 4600A03E */ c.le.s $f20, $f0 +/* E31084 802BC734 00000000 */ nop +/* E31088 802BC738 45000003 */ bc1f .L802BC748 +/* E3108C 802BC73C E600001C */ swc1 $f0, 0x1c($s0) +/* E31090 802BC740 46140001 */ sub.s $f0, $f0, $f20 +/* E31094 802BC744 E600001C */ swc1 $f0, 0x1c($s0) +.L802BC748: +/* E31098 802BC748 C60C0014 */ lwc1 $f12, 0x14($s0) +/* E3109C 802BC74C 46186302 */ mul.s $f12, $f12, $f24 +/* E310A0 802BC750 00000000 */ nop +/* E310A4 802BC754 0C00A874 */ jal cos_rad +/* E310A8 802BC758 46146303 */ div.s $f12, $f12, $f20 +/* E310AC 802BC75C C6020018 */ lwc1 $f2, 0x18($s0) +/* E310B0 802BC760 46001082 */ mul.s $f2, $f2, $f0 +/* E310B4 802BC764 00000000 */ nop +/* E310B8 802BC768 C620004C */ lwc1 $f0, 0x4c($s1) +/* E310BC 802BC76C 46020000 */ add.s $f0, $f0, $f2 +/* E310C0 802BC770 E620004C */ swc1 $f0, 0x4c($s1) +/* E310C4 802BC774 C6000014 */ lwc1 $f0, 0x14($s0) +/* E310C8 802BC778 46160000 */ add.s $f0, $f0, $f22 +/* E310CC 802BC77C 4600A03E */ c.le.s $f20, $f0 +/* E310D0 802BC780 00000000 */ nop +/* E310D4 802BC784 45000003 */ bc1f .L802BC794 +/* E310D8 802BC788 E6000014 */ swc1 $f0, 0x14($s0) +/* E310DC 802BC78C 46140001 */ sub.s $f0, $f0, $f20 +/* E310E0 802BC790 E6000014 */ swc1 $f0, 0x14($s0) +.L802BC794: +/* E310E4 802BC794 C6000018 */ lwc1 $f0, 0x18($s0) +/* E310E8 802BC798 3C01802C */ lui $at, %hi(D_802BCBC0) +/* E310EC 802BC79C D422CBC0 */ ldc1 $f2, %lo(D_802BCBC0)($at) +/* E310F0 802BC7A0 46000021 */ cvt.d.s $f0, $f0 +/* E310F4 802BC7A4 46220001 */ sub.d $f0, $f0, $f2 +/* E310F8 802BC7A8 3C01802C */ lui $at, %hi(D_802BCBC8) +/* E310FC 802BC7AC D424CBC8 */ ldc1 $f4, %lo(D_802BCBC8)($at) +/* E31100 802BC7B0 46200020 */ cvt.s.d $f0, $f0 +/* E31104 802BC7B4 460000A1 */ cvt.d.s $f2, $f0 +/* E31108 802BC7B8 4624103C */ c.lt.d $f2, $f4 +/* E3110C 802BC7BC 00000000 */ nop +/* E31110 802BC7C0 4500006D */ bc1f .L802BC978 +/* E31114 802BC7C4 E6000018 */ swc1 $f0, 0x18($s0) +/* E31118 802BC7C8 080AF256 */ j .L802BC958 +/* E3111C 802BC7CC 00000000 */ nop +/* E31120 802BC7D0 C6000020 */ lwc1 $f0, 0x20($s0) +/* E31124 802BC7D4 3C01802C */ lui $at, %hi(D_802BCBD0) +/* E31128 802BC7D8 D422CBD0 */ ldc1 $f2, %lo(D_802BCBD0)($at) +/* E3112C 802BC7DC 46000021 */ cvt.d.s $f0, $f0 +/* E31130 802BC7E0 46220001 */ sub.d $f0, $f0, $f2 +/* E31134 802BC7E4 4480B000 */ mtc1 $zero, $f22 +/* E31138 802BC7E8 46200020 */ cvt.s.d $f0, $f0 +/* E3113C 802BC7EC 4616003E */ c.le.s $f0, $f22 +/* E31140 802BC7F0 00000000 */ nop +/* E31144 802BC7F4 45000002 */ bc1f .L802BC800 +/* E31148 802BC7F8 E6000020 */ swc1 $f0, 0x20($s0) +/* E3114C 802BC7FC E6160020 */ swc1 $f22, 0x20($s0) +.L802BC800: +/* E31150 802BC800 C60C001C */ lwc1 $f12, 0x1c($s0) +/* E31154 802BC804 3C0140C9 */ lui $at, 0x40c9 +/* E31158 802BC808 34210FD0 */ ori $at, $at, 0xfd0 +/* E3115C 802BC80C 4481D000 */ mtc1 $at, $f26 +/* E31160 802BC810 00000000 */ nop +/* E31164 802BC814 461A6302 */ mul.s $f12, $f12, $f26 +/* E31168 802BC818 00000000 */ nop +/* E3116C 802BC81C 3C0143B4 */ lui $at, 0x43b4 +/* E31170 802BC820 4481A000 */ mtc1 $at, $f20 +/* E31174 802BC824 0C00A85B */ jal sin_rad +/* E31178 802BC828 46146303 */ div.s $f12, $f12, $f20 +/* E3117C 802BC82C C60C0020 */ lwc1 $f12, 0x20($s0) +/* E31180 802BC830 46006302 */ mul.s $f12, $f12, $f0 +/* E31184 802BC834 00000000 */ nop +/* E31188 802BC838 0C00A6C9 */ jal clamp_angle +/* E3118C 802BC83C E62C0068 */ swc1 $f12, 0x68($s1) +/* E31190 802BC840 C600001C */ lwc1 $f0, 0x1c($s0) +/* E31194 802BC844 3C0141F0 */ lui $at, 0x41f0 +/* E31198 802BC848 4481C000 */ mtc1 $at, $f24 +/* E3119C 802BC84C 00000000 */ nop +/* E311A0 802BC850 46180000 */ add.s $f0, $f0, $f24 +/* E311A4 802BC854 4600A03E */ c.le.s $f20, $f0 +/* E311A8 802BC858 00000000 */ nop +/* E311AC 802BC85C 45000003 */ bc1f .L802BC86C +/* E311B0 802BC860 E600001C */ swc1 $f0, 0x1c($s0) +/* E311B4 802BC864 46140001 */ sub.s $f0, $f0, $f20 +/* E311B8 802BC868 E600001C */ swc1 $f0, 0x1c($s0) +.L802BC86C: +/* E311BC 802BC86C 0C0AF12E */ jal func_802BC4B8_E30E08 +/* E311C0 802BC870 0220202D */ daddu $a0, $s1, $zero +/* E311C4 802BC874 C60C0014 */ lwc1 $f12, 0x14($s0) +/* E311C8 802BC878 461A6302 */ mul.s $f12, $f12, $f26 +/* E311CC 802BC87C 00000000 */ nop +/* E311D0 802BC880 0C00A874 */ jal cos_rad +/* E311D4 802BC884 46146303 */ div.s $f12, $f12, $f20 +/* E311D8 802BC888 C6020018 */ lwc1 $f2, 0x18($s0) +/* E311DC 802BC88C 46001082 */ mul.s $f2, $f2, $f0 +/* E311E0 802BC890 00000000 */ nop +/* E311E4 802BC894 C620004C */ lwc1 $f0, 0x4c($s1) +/* E311E8 802BC898 46020000 */ add.s $f0, $f0, $f2 +/* E311EC 802BC89C E620004C */ swc1 $f0, 0x4c($s1) +/* E311F0 802BC8A0 C6000014 */ lwc1 $f0, 0x14($s0) +/* E311F4 802BC8A4 46180000 */ add.s $f0, $f0, $f24 +/* E311F8 802BC8A8 4600A03E */ c.le.s $f20, $f0 +/* E311FC 802BC8AC 00000000 */ nop +/* E31200 802BC8B0 45000003 */ bc1f .L802BC8C0 +/* E31204 802BC8B4 E6000014 */ swc1 $f0, 0x14($s0) +/* E31208 802BC8B8 46140001 */ sub.s $f0, $f0, $f20 +/* E3120C 802BC8BC E6000014 */ swc1 $f0, 0x14($s0) +.L802BC8C0: +/* E31210 802BC8C0 C6000018 */ lwc1 $f0, 0x18($s0) +/* E31214 802BC8C4 3C01802C */ lui $at, %hi(D_802BCBD8) +/* E31218 802BC8C8 D422CBD8 */ ldc1 $f2, %lo(D_802BCBD8)($at) +/* E3121C 802BC8CC 46000021 */ cvt.d.s $f0, $f0 +/* E31220 802BC8D0 46220001 */ sub.d $f0, $f0, $f2 +/* E31224 802BC8D4 46200020 */ cvt.s.d $f0, $f0 +/* E31228 802BC8D8 4616003E */ c.le.s $f0, $f22 +/* E3122C 802BC8DC 00000000 */ nop +/* E31230 802BC8E0 45000025 */ bc1f .L802BC978 +/* E31234 802BC8E4 E6000018 */ swc1 $f0, 0x18($s0) +/* E31238 802BC8E8 92020000 */ lbu $v0, ($s0) +/* E3123C 802BC8EC 24030008 */ addiu $v1, $zero, 8 +/* E31240 802BC8F0 E6160018 */ swc1 $f22, 0x18($s0) +/* E31244 802BC8F4 A2030001 */ sb $v1, 1($s0) +/* E31248 802BC8F8 24420001 */ addiu $v0, $v0, 1 +/* E3124C 802BC8FC A2020000 */ sb $v0, ($s0) +/* E31250 802BC900 080AF25E */ j .L802BC978 +/* E31254 802BC904 E6360068 */ swc1 $f22, 0x68($s1) +/* E31258 802BC908 92020001 */ lbu $v0, 1($s0) +/* E3125C 802BC90C 2442FFFF */ addiu $v0, $v0, -1 +/* E31260 802BC910 A2020001 */ sb $v0, 1($s0) +/* E31264 802BC914 00021600 */ sll $v0, $v0, 0x18 +/* E31268 802BC918 1040000F */ beqz $v0, .L802BC958 +/* E3126C 802BC91C 00000000 */ nop +/* E31270 802BC920 080AF25E */ j .L802BC978 +/* E31274 802BC924 00000000 */ nop +/* E31278 802BC928 C620004C */ lwc1 $f0, 0x4c($s1) +/* E3127C 802BC92C 3C014100 */ lui $at, 0x4100 +/* E31280 802BC930 44811000 */ mtc1 $at, $f2 +/* E31284 802BC934 00000000 */ nop +/* E31288 802BC938 46020001 */ sub.s $f0, $f0, $f2 +/* E3128C 802BC93C E620004C */ swc1 $f0, 0x4c($s1) +/* E31290 802BC940 C6020010 */ lwc1 $f2, 0x10($s0) +/* E31294 802BC944 4602003E */ c.le.s $f0, $f2 +/* E31298 802BC948 00000000 */ nop +/* E3129C 802BC94C 4500000A */ bc1f .L802BC978 +/* E312A0 802BC950 00000000 */ nop +/* E312A4 802BC954 E622004C */ swc1 $f2, 0x4c($s1) +.L802BC958: +/* E312A8 802BC958 92020000 */ lbu $v0, ($s0) +/* E312AC 802BC95C 24420001 */ addiu $v0, $v0, 1 +/* E312B0 802BC960 080AF25E */ j .L802BC978 +/* E312B4 802BC964 A2020000 */ sb $v0, ($s0) +/* E312B8 802BC968 0C043F5A */ jal func_8010FD68 +/* E312BC 802BC96C 0220202D */ daddu $a0, $s1, $zero +/* E312C0 802BC970 0C038050 */ jal enable_player_static_collisions +/* E312C4 802BC974 A2000000 */ sb $zero, ($s0) +.L802BC978: +/* E312C8 802BC978 8FBF0018 */ lw $ra, 0x18($sp) +/* E312CC 802BC97C 8FB10014 */ lw $s1, 0x14($sp) +/* E312D0 802BC980 8FB00010 */ lw $s0, 0x10($sp) +/* E312D4 802BC984 D7BA0038 */ ldc1 $f26, 0x38($sp) +/* E312D8 802BC988 D7B80030 */ ldc1 $f24, 0x30($sp) +/* E312DC 802BC98C D7B60028 */ ldc1 $f22, 0x28($sp) +/* E312E0 802BC990 D7B40020 */ ldc1 $f20, 0x20($sp) +/* E312E4 802BC994 03E00008 */ jr $ra +/* E312E8 802BC998 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_E2F750/func_802BC99C_E312EC.s b/asm/nonmatchings/code_E2F750/func_802BC99C_E312EC.s new file mode 100644 index 0000000000..bc066bb5f1 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BC99C_E312EC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC99C_E312EC +/* E312EC 802BC99C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E312F0 802BC9A0 AFBF0010 */ sw $ra, 0x10($sp) +/* E312F4 802BC9A4 8C820000 */ lw $v0, ($a0) +/* E312F8 802BC9A8 3C030200 */ lui $v1, 0x200 +/* E312FC 802BC9AC 00431024 */ and $v0, $v0, $v1 +/* E31300 802BC9B0 14400003 */ bnez $v0, .L802BC9C0 +/* E31304 802BC9B4 00000000 */ nop +/* E31308 802BC9B8 0C043F5A */ jal func_8010FD68 +/* E3130C 802BC9BC 00000000 */ nop +.L802BC9C0: +/* E31310 802BC9C0 8FBF0010 */ lw $ra, 0x10($sp) +/* E31314 802BC9C4 03E00008 */ jr $ra +/* E31318 802BC9C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2F750/func_802BC9CC_E3131C.s b/asm/nonmatchings/code_E2F750/func_802BC9CC_E3131C.s new file mode 100644 index 0000000000..125ac08993 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BC9CC_E3131C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC9CC_E3131C +/* E3131C 802BC9CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E31320 802BC9D0 AFBF0010 */ sw $ra, 0x10($sp) +/* E31324 802BC9D4 8C820040 */ lw $v0, 0x40($a0) +/* E31328 802BC9D8 90420002 */ lbu $v0, 2($v0) +/* E3132C 802BC9DC 30420001 */ andi $v0, $v0, 1 +/* E31330 802BC9E0 10400003 */ beqz $v0, .L802BC9F0 +/* E31334 802BC9E4 00000000 */ nop +/* E31338 802BC9E8 0C04419E */ jal func_80110678 +/* E3133C 802BC9EC 00000000 */ nop +.L802BC9F0: +/* E31340 802BC9F0 8FBF0010 */ lw $ra, 0x10($sp) +/* E31344 802BC9F4 03E00008 */ jr $ra +/* E31348 802BC9F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_E2F750/func_802BC9FC_E3134C.s b/asm/nonmatchings/code_E2F750/func_802BC9FC_E3134C.s new file mode 100644 index 0000000000..d4bce302a7 --- /dev/null +++ b/asm/nonmatchings/code_E2F750/func_802BC9FC_E3134C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802BC9FC_E3134C +/* E3134C 802BC9FC 8C830040 */ lw $v1, 0x40($a0) +/* E31350 802BCA00 C4800048 */ lwc1 $f0, 0x48($a0) +/* E31354 802BCA04 3C02802C */ lui $v0, %hi(func_802BBE70_E307C0) +/* E31358 802BCA08 2442BE70 */ addiu $v0, $v0, %lo(func_802BBE70_E307C0) +/* E3135C 802BCA0C AC82003C */ sw $v0, 0x3c($a0) +/* E31360 802BCA10 E4600008 */ swc1 $f0, 8($v1) +/* E31364 802BCA14 C480004C */ lwc1 $f0, 0x4c($a0) +/* E31368 802BCA18 E4600010 */ swc1 $f0, 0x10($v1) +/* E3136C 802BCA1C C4800050 */ lwc1 $f0, 0x50($a0) +/* E31370 802BCA20 03E00008 */ jr $ra +/* E31374 802BCA24 E460000C */ swc1 $f0, 0xc($v1) +/* E31378 802BCA28 00000000 */ nop +/* E3137C 802BCA2C 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s index 024a48b7a5..6826bb271b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s @@ -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,7 +1008,7 @@ 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 @@ -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,13 +1349,13 @@ 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(gMasterGfxPos) /* AAC18 80114518 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) @@ -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_80116698.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s index c8fbfeddec..c79681e6ba 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s @@ -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 @@ -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 @@ -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 @@ -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 a92b136b83..5b3dcffa81 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s @@ -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_8011C80C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s index dfd9cd6181..c58afd35aa 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,26 +152,26 @@ 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(gMasterGfxPos) @@ -179,7 +179,7 @@ glabel func_8011C80C /* 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 4840d823dd..a6086b634f 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,30 +129,30 @@ 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(gMasterGfxPos) @@ -160,7 +160,7 @@ glabel func_8011CFBC /* 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_8011D9B8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s index 9e65c7719a..85c3f511d2 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 @@ -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) @@ -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 bff90b594b..c85a882d87 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F4D4.s @@ -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,7 +94,7 @@ 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 +/* 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) @@ -191,7 +191,7 @@ 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 +/* 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) @@ -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,7 +306,7 @@ 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 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s index a1301527ba..0eda9bd2da 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 @@ -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 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s index 359646fdef..5a54ce8231 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121184.s @@ -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,7 +126,7 @@ 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 +/* 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) @@ -319,7 +319,7 @@ 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 +/* 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) @@ -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,7 +434,7 @@ 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 @@ -508,7 +508,7 @@ glabel func_80121184 .L8012192C: /* B802C 8012192C 8E42005C */ lw $v0, 0x5c($s2) /* B8030 80121930 10400012 */ beqz $v0, .L8012197C -/* B8034 80121934 00000000 */ nop +/* 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) @@ -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) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s index e907275cf5..4de4accd9d 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 @@ -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,7 +115,7 @@ 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 +/* 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) @@ -308,7 +308,7 @@ 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 +/* 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) @@ -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,7 +423,7 @@ 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 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s index 5e53af357b..3c1253701b 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s @@ -38,7 +38,7 @@ glabel func_80136A80 /* 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,7 +67,7 @@ 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 @@ -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: @@ -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,7 +264,7 @@ 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: @@ -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(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 @@ -391,7 +391,7 @@ glabel func_80136A80 /* 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 @@ -411,7 +411,7 @@ glabel func_80136A80 /* 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 @@ -436,7 +436,7 @@ glabel func_80136A80 /* 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 @@ -533,7 +533,7 @@ glabel func_80136A80 /* 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,13 +713,13 @@ 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 @@ -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,7 +944,7 @@ 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: @@ -969,13 +969,13 @@ 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 @@ -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,7 +1130,7 @@ 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: @@ -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 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s index 70752c2fdb..13d4b2b25d 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 @@ -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: diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s index 0c0a0d0e21..47a141fbf9 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 @@ -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 @@ -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 +/* 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,25 +713,25 @@ 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(gMasterGfxPos) @@ -740,7 +740,7 @@ glabel func_80138E54 /* 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,7 +777,7 @@ 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 +/* 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) @@ -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,35 +853,35 @@ 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(gMasterGfxPos) @@ -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,9 +923,9 @@ 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: @@ -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,31 +1001,31 @@ 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(gMasterGfxPos) @@ -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 68a4e9d9c8..864ee1fc8d 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 +/* 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,42 +185,42 @@ 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(gMasterGfxPos) @@ -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,18 +262,18 @@ 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(gMasterGfxPos) @@ -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_8013A4D0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s index 64482b54e8..f88f9f34ba 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s @@ -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 901b8e41dd..f76725c7da 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s @@ -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 @@ -192,7 +192,7 @@ 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(gMasterGfxPos) /* D1B8C 8013B48C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) @@ -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 @@ -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 @@ -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 @@ -546,11 +546,11 @@ glabel func_8013B1B0 /* 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) @@ -652,22 +652,22 @@ 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 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s index c618cba805..4988afb5c4 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,10 +124,10 @@ 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 @@ -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 837a35a4ad..c610e91f54 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s @@ -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 7bcf7b9870..6f3dff0c6c 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s @@ -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 be5bef5019..16baa29421 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s @@ -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: diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s index 97c0e961be..3adefb8919 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s @@ -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 @@ -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 0ede182a19..bef99a4985 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 @@ -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 079b6a372d..48f0af7a03 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 @@ -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) @@ -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 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s index 794810ab39..e00ec5ec07 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s @@ -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 ac72f3cb31..be164c827a 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s @@ -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 b07ffa7e2e..7525c98eb4 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s @@ -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 70c351169d..c85007db20 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s @@ -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) @@ -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) @@ -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 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 2028e6c2ba..0389e84da1 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s @@ -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) @@ -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 cf06e2a2c5..fa32ecd614 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 @@ -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 @@ -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 @@ -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) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s b/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s index 5243a9b9d8..de995e4531 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: @@ -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) @@ -487,7 +487,7 @@ glabel func_801489B8 /* 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 7638dc35b7..af940f4bde 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s @@ -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 7598a18579..67500d915d 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s +++ b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s @@ -66,7 +66,7 @@ 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(gMasterGfxPos) /* F8B0 800344B0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) @@ -163,7 +163,7 @@ 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(gMasterGfxPos) /* FA30 80034630 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) @@ -260,7 +260,7 @@ 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(gMasterGfxPos) /* FBB0 800347B0 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s index ce4e83369f..7717368a9f 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s @@ -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 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 f6602ab29a..1055f930d6 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 diff --git a/src/code_E2B530.c b/src/code_E2B530.c new file mode 100644 index 0000000000..a1520f9475 --- /dev/null +++ b/src/code_E2B530.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E2B530", func_802BAE00_E2B530); + +INCLUDE_ASM(s32, "code_E2B530", func_802BB044_E2B774); + +INCLUDE_ASM(s32, "code_E2B530", func_802BB1E8_E2B918); + +INCLUDE_ASM(s32, "code_E2B530", func_802BB62C_E2BD5C); + +INCLUDE_ASM(s32, "code_E2B530", func_802BB664_E2BD94); + +INCLUDE_ASM(s32, "code_E2B530", func_802BB69C_E2BDCC); + +INCLUDE_ASM(s32, "code_E2B530", func_802BB6D4_E2BE04); diff --git a/src/code_E2BE40.c b/src/code_E2BE40.c new file mode 100644 index 0000000000..f59ccb13b2 --- /dev/null +++ b/src/code_E2BE40.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E2BE40", func_802BB710_E2BE40); + +INCLUDE_ASM(s32, "code_E2BE40", func_802BB870_E2BFA0); + +INCLUDE_ASM(s32, "code_E2BE40", func_802BB8A4_E2BFD4); + +INCLUDE_ASM(s32, "code_E2BE40", func_802BBE3C_E2C56C); + +INCLUDE_ASM(s32, "code_E2BE40", func_802BC148_E2C878); + +INCLUDE_ASM(s32, "code_E2BE40", func_802BC1A8_E2C8D8); diff --git a/src/code_E2C930.c b/src/code_E2C930.c new file mode 100644 index 0000000000..ba5e1b5288 --- /dev/null +++ b/src/code_E2C930.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E2C930", func_802BC200_E2C930); + +INCLUDE_ASM(s32, "code_E2C930", func_802BC3A8_E2CAD8); + +INCLUDE_ASM(s32, "code_E2C930", func_802BC3DC_E2CB0C); + +INCLUDE_ASM(s32, "code_E2C930", func_802BC974_E2D0A4); + +INCLUDE_ASM(s32, "code_E2C930", func_802BCC80_E2D3B0); diff --git a/src/code_E2D730.c b/src/code_E2D730.c new file mode 100644 index 0000000000..4188696a45 --- /dev/null +++ b/src/code_E2D730.c @@ -0,0 +1,31 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E2D730", func_802BAE00_E2D730); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB000_E2D930); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB0A0_E2D9D0); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB228_E2DB58); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB298_E2DBC8); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB314_E2DC44); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB34C_E2DC7C); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB374_E2DCA4); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB648_E2DF78); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB6E0_E2E010); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB778_E2E0A8); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB78C_E2E0BC); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB8D4_E2E204); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB98C_E2E2BC); + +INCLUDE_ASM(s32, "code_E2D730", func_802BB9E0_E2E310); diff --git a/src/code_E2E5F0.c b/src/code_E2E5F0.c new file mode 100644 index 0000000000..26ad12ebd2 --- /dev/null +++ b/src/code_E2E5F0.c @@ -0,0 +1,43 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BBCC0_E2E5F0); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BBD1C_E2E64C); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BBD78_E2E6A8); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BBE8C_E2E7BC); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC00C_E2E93C); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC050_E2E980); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC0B8_E2E9E8); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC0F0_E2EA20); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC17C_E2EAAC); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC1D0_E2EB00); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC220_E2EB50); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC250_E2EB80); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC274_E2EBA4); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC2B4_E2EBE4); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC308_E2EC38); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC32C_E2EC5C); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC358_E2EC88); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC37C_E2ECAC); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC3A0_E2ECD0); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC3CC_E2ECFC); + +INCLUDE_ASM(s32, "code_E2E5F0", func_802BC3E4_E2ED14); diff --git a/src/code_E2EDE0.c b/src/code_E2EDE0.c new file mode 100644 index 0000000000..d6a94412d1 --- /dev/null +++ b/src/code_E2EDE0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E2EDE0", func_802BC4B0_E2EDE0); + +INCLUDE_ASM(s32, "code_E2EDE0", func_802BC628_E2EF58); + +INCLUDE_ASM(s32, "code_E2EDE0", func_802BC630_E2EF60); + +INCLUDE_ASM(s32, "code_E2EDE0", func_802BC658_E2EF88); diff --git a/src/code_E2F750.c b/src/code_E2F750.c new file mode 100644 index 0000000000..9569576702 --- /dev/null +++ b/src/code_E2F750.c @@ -0,0 +1,41 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_E2F750", func_802BAE00_E2F750); + +INCLUDE_ASM(s32, "code_E2F750", func_802BAF84_E2F8D4); + +INCLUDE_ASM(s32, "code_E2F750", func_802BB108_E2FA58); + +INCLUDE_ASM(s32, "code_E2F750", func_802BB3B8_E2FD08); + +INCLUDE_ASM(s32, "code_E2F750", func_802BB704_E30054); + +INCLUDE_ASM(s32, "code_E2F750", func_802BB76C_E300BC); + +INCLUDE_ASM(s32, "code_E2F750", func_802BB7E0_E30130); + +INCLUDE_ASM(s32, "code_E2F750", func_802BB8E4_E30234); + +INCLUDE_ASM(s32, "code_E2F750", func_802BBA60_E303B0); + +INCLUDE_ASM(s32, "code_E2F750", func_802BBDB8_E30708); + +INCLUDE_ASM(s32, "code_E2F750", func_802BBE14_E30764); + +INCLUDE_ASM(s32, "code_E2F750", func_802BBE70_E307C0); + +INCLUDE_ASM(s32, "code_E2F750", func_802BC2BC_E30C0C); + +INCLUDE_ASM(s32, "code_E2F750", func_802BC4B8_E30E08); + +INCLUDE_ASM(s32, "code_E2F750", func_802BC514_E30E64); + +INCLUDE_ASM(s32, "code_E2F750", func_802BC558_E30EA8); + +INCLUDE_ASM(s32, "code_E2F750", func_802BC570_E30EC0); + +INCLUDE_ASM(s32, "code_E2F750", func_802BC99C_E312EC); + +INCLUDE_ASM(s32, "code_E2F750", func_802BC9CC_E3131C); + +INCLUDE_ASM(s32, "code_E2F750", func_802BC9FC_E3134C); diff --git a/tools/splat.yaml b/tools/splat.yaml index 777307eee9..18fd4f7c88 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -8420,14 +8420,32 @@ segments: files: - [0xE2A6B0, c] - [0xE2B420, bin] - - [0xE2B530, bin] # code - - [0xE2BE40, bin] # code - - [0xE2C930, bin] # code - - [0xE2D410, bin] # data ___ - - [0xE2D730, bin] # code - - [0xE2E5F0, bin] # code - - [0xE2EDE0, bin] # code - - [0xE31380, bin] # data ___ + - type: code + start: 0xE2B530 + vram: 0x802BAE00 + overlay: True + files: + - [0xE2B530, c] + - [0xE2BE40, c] + - [0xE2C930, c] + - [0xE2D410, bin] + - type: code + start: 0xE2D730 + vram: 0x802BAE00 + overlay: True + files: + - [0xE2D730, c] + - [0xE2E5F0, c] + - [0xE2EDE0, c] + - [0xE2EFD0, bin] + - type: code + start: 0xE2F750 + vram: 0x802BAE00 + overlay: True + files: + - [0xE2F750, c] + - [0xE31380, bin] + - [0xE31530, bin] # unk data - [0xEA0900, bin] # code - [0xEA0C10, bin] # code - [0xEA36E0, bin] # code @@ -8647,7 +8665,7 @@ segments: - [0xFAD210, bin, The_End_Low_Frequency__2E] - [0xFAD8F0, bin, SMW_Remix_2F] - [0xFADE70, bin, New_Partner_82] # BGM end - - [0xFAE860, bin] + - [0xFAE860, bin, sfx] - [0x19E09A8, Yay0] - [0x19E1390, Yay0] - [0x19E1888, Yay0] diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 0633849592..531f086712 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -1950,7 +1950,7 @@ gGameState = 0x8009A600; nuGfxTaskSpool = 0x8009A618; carthandle = 0x8009A638; gMasterGfxPos = 0x8009A66C; -gDisplayContext = 0x8009A674; // size:0x19630 +gDisplayContext = 0x8009A674; gCurtainScale = 0x8009BA90; gCurtainScaleGoal = 0x8009BA94; gCurtainFade = 0x8009BA98; diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index 3af89a642a..aa9a47b68e 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -8,8 +8,8 @@ D_80026AC7 = 0x80026AC7; D_8004AA85 = 0x8004AA85; osEPiReadIo = 0x80060DC0; gGameStatusPtr = 0x8007419C; -D_800741F0 = 0x800741F0; -D_800741F4 = 0x800741F4; +gMatrixListPos = 0x800741F0; +gCurrentDisplayContextIndex = 0x800741F4; D_800773F0 = 0x800773F0; gCurrentCameraID = 0x80077410; D_800779B0 = 0x800779B0; @@ -936,8 +936,8 @@ D_8010F6B8 = 0x8010F6B8; update_entities = 0x8010F6D0; func_80147474 = 0x80147474; D_80147474 = 0x80147474; -D_80147574 = 0x80147574; func_80147574 = 0x80147574; +D_80147574 = 0x80147574; func_80147650 = 0x80147650; D_8014B7F0 = 0x8014B7F0; D_8014C248 = 0x8014C248; @@ -1880,8 +1880,8 @@ func_80241E48_C70178 = 0x80241E48; func_80241E50_A4A410 = 0x80241E50; func_80241E58_9C7238 = 0x80241E58; func_80241E90_8B1F00 = 0x80241E90; -func_80241E98_A1CF98 = 0x80241E98; D_80241E98 = 0x80241E98; +func_80241E98_A1CF98 = 0x80241E98; D_80241EA0 = 0x80241EA0; D_80241EA8 = 0x80241EA8; D_80241ECC = 0x80241ECC; @@ -1896,8 +1896,8 @@ D_80241FC0 = 0x80241FC0; func_80241FC8_C87A78 = 0x80241FC8; D_80241FE0 = 0x80241FE0; D_80241FF4 = 0x80241FF4; -func_80242000_C48BE0 = 0x80242000; D_80242000 = 0x80242000; +func_80242000_C48BE0 = 0x80242000; D_80242008 = 0x80242008; D_80242010 = 0x80242010; func_80242030_8EDE50 = 0x80242030; @@ -1980,15 +1980,15 @@ D_802425E4 = 0x802425E4; D_802425E8 = 0x802425E8; D_80242610 = 0x80242610; D_80242614 = 0x80242614; -D_80242618 = 0x80242618; func_80242618_A18838 = 0x80242618; +D_80242618 = 0x80242618; D_80242630 = 0x80242630; D_8024264C = 0x8024264C; D_80242670 = 0x80242670; D_80242678 = 0x80242678; func_80242680_802F00 = 0x80242680; -func_80242688_C79368 = 0x80242688; D_80242688 = 0x80242688; +func_80242688_C79368 = 0x80242688; D_802426B0 = 0x802426B0; D_802426B8 = 0x802426B8; func_802426C8_7ED3D8 = 0x802426C8; @@ -2112,8 +2112,8 @@ D_80243078 = 0x80243078; D_80243080 = 0x80243080; func_80243088_8551F8 = 0x80243088; D_8024308C = 0x8024308C; -func_80243090_C395C0 = 0x80243090; func_80243090_8B3100 = 0x80243090; +func_80243090_C395C0 = 0x80243090; D_80243098 = 0x80243098; func_8024309C_95E29C = 0x8024309C; D_802430A0 = 0x802430A0; @@ -2236,8 +2236,8 @@ D_80243890 = 0x80243890; func_80243898 = 0x80243898; D_802438E0 = 0x802438E0; D_802438E8 = 0x802438E8; -func_802438F0_95EAF0 = 0x802438F0; func_802438F0_C436A0 = 0x802438F0; +func_802438F0_95EAF0 = 0x802438F0; D_802438F8 = 0x802438F8; D_80243900 = 0x80243900; switch_order = 0x80243918; @@ -4664,9 +4664,53 @@ D_802B7D20 = 0x802B7D20; D_802B7D88 = 0x802B7D88; D_802B7D90 = 0x802B7D90; D_802B9E00 = 0x802B9E00; +D_802BC7D0 = 0x802BC7D0; +D_802BCA30 = 0x802BCA30; +D_802BCAA0 = 0x802BCAA0; +D_802BCB70 = 0x802BCB70; +D_802BCB78 = 0x802BCB78; +D_802BCB80 = 0x802BCB80; +D_802BCB88 = 0x802BCB88; +D_802BCB90 = 0x802BCB90; +D_802BCBA0 = 0x802BCBA0; +D_802BCBC0 = 0x802BCBC0; +D_802BCBC8 = 0x802BCBC8; +D_802BCBD0 = 0x802BCBD0; +D_802BCBD8 = 0x802BCBD8; +D_802BCC44 = 0x802BCC44; +D_802BCC68 = 0x802BCC68; +D_802BCC8C = 0x802BCC8C; +D_802BCCB0 = 0x802BCCB0; +D_802BCCD4 = 0x802BCCD4; +D_802BCCF8 = 0x802BCCF8; +D_802BCD1C = 0x802BCD1C; +D_802BCD40 = 0x802BCD40; +D_802BCDC0 = 0x802BCDC0; +D_802BCDC8 = 0x802BCDC8; +D_802BCDD0 = 0x802BCDD0; +D_802BCDD8 = 0x802BCDD8; +D_802BCDE0 = 0x802BCDE0; +D_802BCDE8 = 0x802BCDE8; +D_802BCE10 = 0x802BCE10; +D_802BCE1C = 0x802BCE1C; +D_802BCE20 = 0x802BCE20; D_802BCE30 = 0x802BCE30; D_802BCE32 = 0x802BCE32; D_802BCE34 = 0x802BCE34; +D_802BCF50 = 0x802BCF50; +D_802BCF78 = 0x802BCF78; +D_802BCF80 = 0x802BCF80; +D_802BCF88 = 0x802BCF88; +D_802BCF90 = 0x802BCF90; +D_802BCFA0 = 0x802BCFA0; +D_802BCFA8 = 0x802BCFA8; +D_802BCFB0 = 0x802BCFB0; +D_802BCFB8 = 0x802BCFB8; +D_802BCFC0 = 0x802BCFC0; +D_802BCFD8 = 0x802BCFD8; +D_802BCFE0 = 0x802BCFE0; +D_802BCFE8 = 0x802BCFE8; +D_802BCFF0 = 0x802BCFF0; D_802BD5F0 = 0x802BD5F0; D_802BDE80 = 0x802BDE80; D_802BDE88 = 0x802BDE88; From c7a383997f079628a7f154d3c76240f07b81d41c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 18:34:10 +0900 Subject: [PATCH 09/12] Remaining segments --- Makefile | 2 +- .../code_EA0900/func_80240000_EA0900.s | 89 +++ .../code_EA0900/func_80240124_EA0A24.s | 144 ++++ .../code_EA0C10/func_80240310_EA0C10.s | 32 + .../code_EA0C10/func_8024037C_EA0C7C.s | 33 + .../code_EA0C10/func_802403EC_EA0CEC.s | 60 ++ .../code_EA0C10/func_802404C4_EA0DC4.s | 26 + .../code_EA0C10/func_80240518_EA0E18.s | 119 +++ .../code_EA0C10/func_802406CC_EA0FCC.s | 184 +++++ .../code_EA0C10/func_8024097C_EA127C.s | 195 +++++ .../code_EA0C10/func_80240C5C_EA155C.s | 33 + .../code_EA0C10/func_80240CC8_EA15C8.s | 68 ++ .../code_EA0C10/func_80240DC4_EA16C4.s | 688 ++++++++++++++++++ .../code_EA0C10/func_80241804_EA2104.s | 42 ++ .../code_EA0C10/func_80241894_EA2194.s | 71 ++ .../code_EA0C10/func_80241994_EA2294.s | 29 + .../code_EA0C10/func_802419F4_EA22F4.s | 65 ++ .../code_EA0C10/func_80241AE0_EA23E0.s | 180 +++++ .../code_EA0C10/func_80241D68_EA2668.s | 35 + .../code_EA0C10/func_80241DE4_EA26E4.s | 86 +++ .../code_EA0C10/func_80241F18_EA2818.s | 97 +++ .../code_EA0C10/func_8024207C_EA297C.s | 38 + .../code_EA0C10/func_802420FC_EA29FC.s | 312 ++++++++ .../code_EA0C10/func_80242568_EA2E68.s | 22 + .../code_EA0C10/func_802425B0_EA2EB0.s | 27 + .../code_EA0C10/func_80242608_EA2F08.s | 35 + .../code_EA0C10/func_8024267C_EA2F7C.s | 53 ++ .../code_EA0C10/func_80242730_EA3030.s | 29 + .../code_EA0C10/func_80242794_EA3094.s | 28 + .../code_EA0C10/func_802427F0_EA30F0.s | 122 ++++ .../code_EA0C10/func_802429C0_EA32C0.s | 28 + .../code_EA0C10/func_80242A14_EA3314.s | 18 + .../code_EA0C10/func_80242A4C_EA334C.s | 48 ++ .../code_EA0C10/func_80242AE8_EA33E8.s | 64 ++ .../code_EA0C10/func_80242BD8_EA34D8.s | 103 +++ .../code_EA0C10/func_80242D64_EA3664.s | 21 + .../code_EA0C10/func_80242DA8_EA36A8.s | 18 + .../code_EA36E0/func_80242DE0_EA36E0.s | 12 + .../code_EA36E0/func_80242E00_EA3700.s | 17 + .../code_EA36E0/func_80242E2C_EA372C.s | 43 ++ .../code_EA36E0/func_80242EC4_EA37C4.s | 45 ++ .../code_EA36E0/func_80242F64_EA3864.s | 18 + .../code_EA36E0/func_80242F9C_EA389C.s | 50 ++ .../code_EA36E0/func_80243054_EA3954.s | 41 ++ .../code_EA36E0/func_802430E4_EA39E4.s | 43 ++ .../code_EA6FD0/func_80240000_EA6FD0.s | 21 + .../code_EA7010/func_80240040_EA7010.s | 89 +++ .../code_EA7010/func_80240164_EA7134.s | 144 ++++ .../code_EA7320/func_80240350_EA7320.s | 11 + .../code_EA7320/func_8024036C_EA733C.s | 11 + .../code_EA7320/func_80240388_EA7358.s | 18 + .../code_EA8AE0/func_80240000_EA8AE0.s | 89 +++ .../code_EA8AE0/func_80240124_EA8C04.s | 143 ++++ .../code_EA8AE0/func_8024030C_EA8DEC.s | 23 + .../code_EA8AE0/func_80240358_EA8E38.s | 93 +++ .../code_EA8AE0/func_802404B8_EA8F98.s | 272 +++++++ .../code_EA8AE0/func_802408C8_EA93A8.s | 20 + .../code_EA8AE0/func_80240908_EA93E8.s | 72 ++ .../code_EA8AE0/func_80240A14_EA94F4.s | 64 ++ .../code_EA8AE0/func_80240B00_EA95E0.s | 58 ++ .../code_EA8AE0/func_80240BD4_EA96B4.s | 69 ++ .../code_EA8AE0/func_80240CD8_EA97B8.s | 55 ++ .../code_EA8AE0/func_80240DA4_EA9884.s | 38 + .../code_EA8AE0/func_80240E2C_EA990C.s | 385 ++++++++++ .../code_EA8AE0/func_802413C0_EA9EA0.s | 19 + .../code_EA8AE0/func_802413FC_EA9EDC.s | 8 + .../code_EA8AE0/func_8024140C_EA9EEC.s | 27 + .../code_EA8AE0/func_80241468_EA9F48.s | 53 ++ .../code_EA8AE0/func_8024151C_EA9FFC.s | 29 + .../code_EA8AE0/func_80241580_EAA060.s | 28 + .../code_EA8AE0/func_802415DC_EAA0BC.s | 122 ++++ .../code_EA8AE0/func_802417AC_EAA28C.s | 28 + .../code_EA8AE0/func_80241800_EAA2E0.s | 18 + .../code_EA8AE0/func_80241838_EAA318.s | 48 ++ .../code_EA8AE0/func_802418D4_EAA3B4.s | 64 ++ .../code_EA8AE0/func_802419C4_EAA4A4.s | 103 +++ .../code_EA8AE0/func_80241B50_EAA630.s | 21 + .../code_EA8AE0/func_80241B94_EAA674.s | 15 + .../code_EA8AE0/func_80241BC0_EAA6A0.s | 103 +++ .../code_EB0E60/func_80240000_EB0E60.s | 89 +++ .../code_EB0E60/func_80240124_EB0F84.s | 144 ++++ .../code_EB1170/func_80240310_EB1170.s | 53 ++ .../code_EB1170/func_802403C4_EB1224.s | 29 + .../code_EB1170/func_80240428_EB1288.s | 28 + .../code_EB1170/func_80240484_EB12E4.s | 122 ++++ .../code_EB1170/func_80240654_EB14B4.s | 28 + .../code_EB1170/func_802406A8_EB1508.s | 18 + .../code_EB1170/func_802406E0_EB1540.s | 48 ++ .../code_EB1170/func_8024077C_EB15DC.s | 64 ++ .../code_EB1170/func_8024086C_EB16CC.s | 103 +++ .../code_EB1170/func_802409F8_EB1858.s | 21 + .../code_EB1170/func_80240A3C_EB189C.s | 15 + .../code_EB1170/func_80240A68_EB18C8.s | 13 + .../code_EB1170/func_80240A8C_EB18EC.s | 17 + .../code_EB5130/func_80240000_EB5130.s | 89 +++ .../code_EB5130/func_80240124_EB5254.s | 143 ++++ .../code_EB5130/func_8024030C_EB543C.s | 17 + .../code_EB5470/func_80240340_EB5470.s | 15 + .../code_EB5470/func_8024036C_EB549C.s | 13 + .../code_EB7230/func_80240000_EB7230.s | 89 +++ .../code_EB7230/func_80240124_EB7354.s | 144 ++++ .../code_EB7540/func_80240310_EB7540.s | 54 ++ .../code_EB7540/func_802403D8_EB7608.s | 44 ++ .../code_EB7540/func_80240478_EB76A8.s | 39 + .../code_EB7540/func_80240504_EB7734.s | 11 + .../code_EB7540/func_80240520_EB7750.s | 69 ++ .../code_EB8E50/func_80240000_EB8E50.s | 20 + .../code_EB8E90/func_80240040_EB8E90.s | 95 +++ .../code_EB8E90/func_80240198_EB8FE8.s | 183 +++++ .../code_EB8E90/func_80240440_EB9290.s | 52 ++ .../code_EB8E90/func_80240500_EB9350.s | 120 +++ .../code_EB8E90/func_802406BC_EB950C.s | 52 ++ .../code_EB8E90/func_80240770_EB95C0.s | 33 + .../code_EB8E90/func_802407E4_EB9634.s | 35 + .../code_EB8E90/func_8024085C_EB96AC.s | 82 +++ .../code_EB8E90/func_8024098C_EB97DC.s | 80 ++ .../code_EB8E90/func_80240AAC_EB98FC.s | 32 + .../code_EB8E90/func_80240B14_EB9964.s | 55 ++ .../code_EB8E90/func_80240BD4_EB9A24.s | 213 ++++++ .../code_EB8E90/func_80240EFC_EB9D4C.s | 21 + .../code_EB9D90/func_80240F40_EB9D90.s | 32 + .../code_EB9D90/func_80240FB0_EB9E00.s | 81 +++ .../code_EB9D90/func_802410E4_EB9F34.s | 82 +++ .../code_EB9D90/func_8024121C_EBA06C.s | 105 +++ .../code_EB9D90/func_802413AC_EBA1FC.s | 12 + .../code_EB9D90/func_802413CC_EBA21C.s | 12 + .../code_EB9D90/func_802413EC_EBA23C.s | 13 + .../code_EC2200/func_80240000_EC2200.s | 20 + .../code_EC2240/func_80240040_EC2240.s | 53 ++ .../code_EC2240/func_802400F4_EC22F4.s | 29 + .../code_EC2240/func_80240158_EC2358.s | 188 +++++ .../code_EC2610/func_80240410_EC2610.s | 32 + .../code_EC2610/func_80240480_EC2680.s | 122 ++++ .../code_EC71B0/func_80240000_EC71B0.s | 89 +++ .../code_EC71B0/func_80240124_EC72D4.s | 143 ++++ .../code_EC71B0/func_8024030C_EC74BC.s | 18 + .../code_EC71B0/func_80240344_EC74F4.s | 43 ++ .../code_EC7590/func_802403E0_EC7590.s | 32 + .../code_EC7590/func_80240450_EC7600.s | 121 +++ .../code_EC7590/func_8024061C_EC77CC.s | 53 ++ .../code_EC7590/func_802406D0_EC7880.s | 32 + .../code_EC9D00/func_80240000_EC9D00.s | 11 + .../code_EC9D00/func_8024001C_EC9D1C.s | 12 + .../code_EC9D00/func_8024003C_EC9D3C.s | 15 + .../code_EC9D00/func_80240068_EC9D68.s | 31 + .../code_EC9D00/func_802400D4_EC9DD4.s | 25 + .../code_EC9D00/func_80240120_EC9E20.s | 50 ++ .../code_EC9D00/func_802401CC_EC9ECC.s | 163 +++++ .../code_EC9D00/func_8024041C_ECA11C.s | 15 + .../code_EC9D00/func_80240448_ECA148.s | 18 + .../code_EC9D00/func_80240480_ECA180.s | 40 + .../code_EC9D00/func_80240510_ECA210.s | 17 + .../code_EC9D00/func_80240544_ECA244.s | 29 + .../code_EC9D00/func_802405A8_ECA2A8.s | 26 + .../code_EC9D00/func_80240600_ECA300.s | 356 +++++++++ .../code_EC9D00/func_80240B38_ECA838.s | 92 +++ .../code_EC9D00/func_80240C78_ECA978.s | 22 + .../code_EC9D00/func_80240CC0_ECA9C0.s | 22 + .../code_EC9D00/func_80240D08_ECAA08.s | 19 + .../code_ECAA40/func_80240D40_ECAA40.s | 20 + .../code_ECAA80/func_80240D80_ECAA80.s | 401 ++++++++++ .../code_ECAA80/func_80241364_ECB064.s | 100 +++ .../code_ECAA80/func_802414C8_ECB1C8.s | 22 + .../code_ECAA80/func_8024150C_ECB20C.s | 162 +++++ .../code_ECAA80/func_80241770_ECB470.s | 28 + .../code_ECAA80/func_802417CC_ECB4CC.s | 122 ++++ .../code_ECAA80/func_8024199C_ECB69C.s | 28 + .../code_ECAA80/func_802419F0_ECB6F0.s | 18 + .../code_ECAA80/func_80241A28_ECB728.s | 48 ++ .../code_ECAA80/func_80241AC4_ECB7C4.s | 53 ++ .../code_ECAA80/func_80241B88_ECB888.s | 35 + .../code_ECAA80/func_80241BF8_ECB8F8.s | 19 + .../code_ECB930/func_80241C30_ECB930.s | 32 + .../code_ECB930/func_80241CA0_ECB9A0.s | 122 ++++ .../code_ECBB70/func_80241E70_ECBB70.s | 45 ++ .../code_ECFFF0/func_80240000_ECFFF0.s | 20 + .../code_ED0030/func_80240040_ED0030.s | 45 ++ .../code_ED00D0/func_802400E0_ED00D0.s | 32 + .../code_ED00D0/func_80240150_ED0140.s | 122 ++++ .../code_ED0310/func_80240320_ED0310.s | 116 +++ .../code_ED0310/func_802404D0_ED04C0.s | 418 +++++++++++ .../code_ED0310/func_80240AF8_ED0AE8.s | 52 ++ .../code_ED0310/func_80240BB8_ED0BA8.s | 225 ++++++ .../code_ED0310/func_80240EFC_ED0EEC.s | 34 + .../code_ED0310/func_80240F74_ED0F64.s | 32 + .../code_ED0310/func_80240FE0_ED0FD0.s | 83 +++ .../code_ED0310/func_80241114_ED1104.s | 31 + .../code_ED0310/func_80241178_ED1168.s | 243 +++++++ .../code_ED0310/func_80241508_ED14F8.s | 79 ++ .../code_ED0310/func_8024162C_ED161C.s | 145 ++++ .../code_ED4220/func_80240000_ED4220.s | 21 + .../code_ED4260/func_80240040_ED4260.s | 20 + .../code_ED42A0/func_80240080_ED42A0.s | 53 ++ .../code_ED42A0/func_80240134_ED4354.s | 29 + .../code_ED42A0/func_80240198_ED43B8.s | 89 +++ .../code_ED42A0/func_802402BC_ED44DC.s | 146 ++++ .../code_ED46D0/func_802404B0_ED46D0.s | 430 +++++++++++ .../code_ED46D0/func_80240B10_ED4D30.s | 540 ++++++++++++++ .../code_ED5540/func_80241320_ED5540.s | 32 + .../code_ED5540/func_80241390_ED55B0.s | 122 ++++ .../code_ED8E20/func_80240000_ED8E20.s | 12 + .../code_ED8E20/func_80240020_ED8E40.s | 9 + .../code_ED8E20/func_80240034_ED8E54.s | 56 ++ .../code_ED8E20/func_802400F0_ED8F10.s | 74 ++ .../code_ED8E20/func_80240208_ED9028.s | 31 + .../code_ED8E20/func_80240274_ED9094.s | 45 ++ .../code_ED8E20/func_80240318_ED9138.s | 18 + .../code_EDBFE0/func_80240000_EDBFE0.s | 20 + .../code_EDC020/func_80240040_EDC020.s | 32 + .../code_EDC020/func_802400B0_EDC090.s | 121 +++ .../code_EDC020/func_8024027C_EDC25C.s | 53 ++ .../code_EDC020/func_80240330_EDC310.s | 29 + .../code_EDC020/func_80240394_EDC374.s | 28 + .../code_EDC020/func_802403F0_EDC3D0.s | 122 ++++ .../code_EDC020/func_802405C0_EDC5A0.s | 28 + .../code_EDC020/func_80240614_EDC5F4.s | 18 + .../code_EDC020/func_8024064C_EDC62C.s | 50 ++ .../code_EDE9C0/func_80240000_EDE9C0.s | 20 + .../code_EDEA00/func_80240040_EDEA00.s | 109 +++ .../code_EDEA00/func_802401C4_EDEB84.s | 116 +++ .../code_EDEA00/func_80240374_EDED34.s | 418 +++++++++++ .../code_EDEA00/func_8024099C_EDF35C.s | 52 ++ .../code_EDEA00/func_80240A5C_EDF41C.s | 225 ++++++ .../code_EDEA00/func_80240DA0_EDF760.s | 34 + .../code_EDEA00/func_80240E18_EDF7D8.s | 32 + .../code_EDEA00/func_80240E84_EDF844.s | 83 +++ .../code_EDEA00/func_80240FB8_EDF978.s | 31 + .../code_EDEA00/func_8024101C_EDF9DC.s | 243 +++++++ .../code_EDEA00/func_802413AC_EDFD6C.s | 79 ++ .../code_EDEA00/func_802414D0_EDFE90.s | 142 ++++ .../code_EDEA00/func_802416E8_EE00A8.s | 25 + .../code_EDEA00/func_80241730_EE00F0.s | 295 ++++++++ .../code_EDEA00/func_80241B94_EE0554.s | 156 ++++ .../code_EDEA00/func_80241DE4_EE07A4.s | 352 +++++++++ .../code_EDEA00/func_802422F0_EE0CB0.s | 35 + .../code_EDEA00/func_8024236C_EE0D2C.s | 86 +++ .../code_EDEA00/func_802424A0_EE0E60.s | 97 +++ .../code_EDEA00/func_80242604_EE0FC4.s | 38 + .../code_EDEA00/func_80242684_EE1044.s | 312 ++++++++ .../code_EDEA00/func_80242AF0_EE14B0.s | 627 ++++++++++++++++ .../code_EDEA00/func_80243470_EE1E30.s | 75 ++ .../code_EDEA00/func_80243584_EE1F44.s | 69 ++ .../pause_interp_text_scroll_EE1DD8.s | 26 + .../code_EE2040/func_80243680_EE2040.s | 44 ++ .../code_EE65B0/func_80240000_EE65B0.s | 89 +++ .../code_EE65B0/func_80240124_EE66D4.s | 143 ++++ .../code_EE65B0/func_8024030C_EE68BC.s | 17 + .../code_EE65B0/func_80240340_EE68F0.s | 42 ++ .../code_EE65B0/func_802403D4_EE6984.s | 28 + .../code_EE65B0/func_8024042C_EE69DC.s | 20 + .../code_EE65B0/func_8024046C_EE6A1C.s | 42 ++ .../code_EE65B0/func_80240504_EE6AB4.s | 184 +++++ .../code_EE65B0/func_802407D4_EE6D84.s | 221 ++++++ .../code_EE70C0/func_80240B10_EE70C0.s | 116 +++ .../code_EE70C0/func_80240CC0_EE7270.s | 418 +++++++++++ .../code_EE70C0/func_802412E8_EE7898.s | 52 ++ .../code_EE70C0/func_802413A8_EE7958.s | 225 ++++++ .../code_EE70C0/func_802416EC_EE7C9C.s | 34 + .../code_EE70C0/func_80241764_EE7D14.s | 32 + .../code_EE70C0/func_802417D0_EE7D80.s | 83 +++ .../code_EE70C0/func_80241904_EE7EB4.s | 31 + .../code_EE70C0/func_80241968_EE7F18.s | 243 +++++++ .../code_EE70C0/func_80241CF8_EE82A8.s | 79 ++ .../code_EE70C0/func_80241E1C_EE83CC.s | 142 ++++ .../code_EE70C0/func_80242034_EE85E4.s | 28 + .../code_EE70C0/func_80242090_EE8640.s | 122 ++++ .../code_EE70C0/func_80242260_EE8810.s | 28 + .../code_EE70C0/func_802422B4_EE8864.s | 18 + .../code_EE70C0/func_802422EC_EE889C.s | 50 ++ .../code_EE8940/func_80242390_EE8940.s | 16 + .../code_EED100/func_80240000_EED100.s | 20 + .../code_EED140/func_80240040_EED140.s | 45 ++ .../code_EED1E0/func_802400E0_EED1E0.s | 11 + .../code_EED1E0/func_802400FC_EED1FC.s | 12 + .../code_EED1E0/func_8024011C_EED21C.s | 15 + .../code_EED1E0/func_80240148_EED248.s | 31 + .../code_EED1E0/func_802401B4_EED2B4.s | 25 + .../code_EED1E0/func_80240200_EED300.s | 50 ++ .../code_EED1E0/func_802402AC_EED3AC.s | 163 +++++ .../code_EED1E0/func_802404FC_EED5FC.s | 15 + .../code_EED1E0/func_80240528_EED628.s | 18 + .../code_EED1E0/func_80240560_EED660.s | 40 + .../code_EED1E0/func_802405F0_EED6F0.s | 17 + .../code_EED1E0/func_80240624_EED724.s | 29 + .../code_EED1E0/func_80240688_EED788.s | 26 + .../code_EED1E0/func_802406E0_EED7E0.s | 356 +++++++++ .../code_EED1E0/func_80240C18_EEDD18.s | 92 +++ .../code_EED1E0/func_80240D58_EEDE58.s | 22 + .../code_EED1E0/func_80240DA0_EEDEA0.s | 22 + .../code_EED1E0/func_80240DE8_EEDEE8.s | 17 + .../code_EED1E0/func_80240E18_EEDF18.s | 20 + .../code_EEDF50/func_80240E50_EEDF50.s | 116 +++ .../code_EEDF50/func_80241000_EEE100.s | 418 +++++++++++ .../code_EEDF50/func_80241628_EEE728.s | 52 ++ .../code_EEDF50/func_802416E8_EEE7E8.s | 225 ++++++ .../code_EEDF50/func_80241A2C_EEEB2C.s | 34 + .../code_EEDF50/func_80241AA4_EEEBA4.s | 32 + .../code_EEDF50/func_80241B10_EEEC10.s | 83 +++ .../code_EEDF50/func_80241C44_EEED44.s | 31 + .../code_EEDF50/func_80241CA8_EEEDA8.s | 243 +++++++ .../code_EEDF50/func_80242038_EEF138.s | 79 ++ .../code_EEDF50/func_8024215C_EEF25C.s | 142 ++++ .../code_EEDF50/func_80242374_EEF474.s | 82 +++ .../code_EEDF50/func_802424A4_EEF5A4.s | 172 +++++ .../code_EEDF50/func_80242724_EEF824.s | 28 + .../code_EEDF50/func_80242780_EEF880.s | 144 ++++ .../code_EEFAA0/func_802429A0_EEFAA0.s | 18 + .../code_EF2610/func_80240000_EF2610.s | 20 + .../code_EF2650/func_80240040_EF2650.s | 16 + .../code_EF2680/func_80240070_EF2680.s | 116 +++ .../code_EF2680/func_80240220_EF2830.s | 418 +++++++++++ .../code_EF2680/func_80240848_EF2E58.s | 52 ++ .../code_EF2680/func_80240908_EF2F18.s | 225 ++++++ .../code_EF2680/func_80240C4C_EF325C.s | 34 + .../code_EF2680/func_80240CC4_EF32D4.s | 32 + .../code_EF2680/func_80240D30_EF3340.s | 83 +++ .../code_EF2680/func_80240E64_EF3474.s | 31 + .../code_EF2680/func_80240EC8_EF34D8.s | 243 +++++++ .../code_EF2680/func_80241258_EF3868.s | 79 ++ .../code_EF2680/func_8024137C_EF398C.s | 142 ++++ .../code_EF2680/func_80241594_EF3BA4.s | 25 + .../code_EF2680/func_802415DC_EF3BEC.s | 295 ++++++++ .../code_EF2680/func_80241A40_EF4050.s | 156 ++++ .../code_EF2680/func_80241C90_EF42A0.s | 352 +++++++++ .../code_EF2680/func_8024219C_EF47AC.s | 35 + .../code_EF2680/func_80242218_EF4828.s | 86 +++ .../code_EF2680/func_8024234C_EF495C.s | 97 +++ .../code_EF2680/func_802424B0_EF4AC0.s | 38 + .../code_EF2680/func_80242530_EF4B40.s | 312 ++++++++ .../code_EF2680/func_8024299C_EF4FAC.s | 630 ++++++++++++++++ .../code_EF7A80/func_80240000_EF7A80.s | 89 +++ .../code_EF7A80/func_80240124_EF7BA4.s | 143 ++++ .../code_EF7A80/func_8024030C_EF7D8C.s | 17 + .../code_EF7A80/func_80240340_EF7DC0.s | 25 + .../code_EF7A80/func_80240394_EF7E14.s | 108 +++ .../code_EF7FB0/func_80240530_EF7FB0.s | 28 + .../code_EF8010/func_80240590_EF8010.s | 32 + .../code_EF8010/func_80240600_EF8080.s | 122 ++++ .../code_EFEB00/func_80240000_EFEB00.s | 89 +++ .../code_EFEB00/func_80240124_EFEC24.s | 143 ++++ .../code_EFEB00/func_8024030C_EFEE0C.s | 17 + .../code_EFEB00/func_80240340_EFEE40.s | 105 +++ .../code_EFEB00/func_802404D0_EFEFD0.s | 32 + .../code_EFEB00/func_80240540_EFF040.s | 76 ++ .../code_EFEB00/func_80240660_EFF160.s | 77 ++ .../code_EFEB00/func_80240784_EFF284.s | 15 + .../code_EFEB00/func_802407B0_EFF2B0.s | 105 +++ src/code_EA0900.c | 5 + src/code_EA0C10.c | 69 ++ src/code_EA36E0.c | 17 + src/code_EA6FD0.c | 3 + src/code_EA7010.c | 5 + src/code_EA7320.c | 7 + src/code_EA8AE0.c | 57 ++ src/code_EB0E60.c | 5 + src/code_EB1170.c | 27 + src/code_EB5130.c | 7 + src/code_EB5470.c | 5 + src/code_EB7230.c | 5 + src/code_EB7540.c | 11 + src/code_EB8E50.c | 3 + src/code_EB8E90.c | 27 + src/code_EB9D90.c | 15 + src/code_EC2200.c | 3 + src/code_EC2240.c | 7 + src/code_EC2610.c | 5 + src/code_EC71B0.c | 9 + src/code_EC7590.c | 9 + src/code_EC9D00.c | 37 + src/code_ECAA40.c | 3 + src/code_ECAA80.c | 25 + src/code_ECB930.c | 5 + src/code_ECBB70.c | 3 + src/code_ECFFF0.c | 3 + src/code_ED0030.c | 3 + src/code_ED00D0.c | 5 + src/code_ED0310.c | 23 + src/code_ED4220.c | 3 + src/code_ED4260.c | 3 + src/code_ED42A0.c | 9 + src/code_ED46D0.c | 5 + src/code_ED5540.c | 5 + src/code_ED8E20.c | 15 + src/code_EDBFE0.c | 3 + src/code_EDC020.c | 19 + src/code_EDE9C0.c | 3 + src/code_EDEA00.c | 51 ++ src/code_EE2040.c | 3 + src/code_EE65B0.c | 19 + src/code_EE70C0.c | 33 + src/code_EE8940.c | 3 + src/code_EED100.c | 3 + src/code_EED140.c | 3 + src/code_EED1E0.c | 39 + src/code_EEDF50.c | 31 + src/code_EEFAA0.c | 3 + src/code_EF2610.c | 3 + src/code_EF2650.c | 3 + src/code_EF2680.c | 43 ++ src/code_EF7A80.c | 11 + src/code_EF7FB0.c | 3 + src/code_EF8010.c | 5 + src/code_EFEB00.c | 19 + tools/splat.yaml | 252 +++++-- undefined_funcs_auto.txt | 100 +++ undefined_syms_auto.txt | 119 ++- 406 files changed, 31040 insertions(+), 89 deletions(-) create mode 100644 asm/nonmatchings/code_EA0900/func_80240000_EA0900.s create mode 100644 asm/nonmatchings/code_EA0900/func_80240124_EA0A24.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80240310_EA0C10.s create mode 100644 asm/nonmatchings/code_EA0C10/func_8024037C_EA0C7C.s create mode 100644 asm/nonmatchings/code_EA0C10/func_802403EC_EA0CEC.s create mode 100644 asm/nonmatchings/code_EA0C10/func_802404C4_EA0DC4.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80240518_EA0E18.s create mode 100644 asm/nonmatchings/code_EA0C10/func_802406CC_EA0FCC.s create mode 100644 asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80240C5C_EA155C.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80240CC8_EA15C8.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80240DC4_EA16C4.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80241804_EA2104.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80241894_EA2194.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80241994_EA2294.s create mode 100644 asm/nonmatchings/code_EA0C10/func_802419F4_EA22F4.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80241AE0_EA23E0.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80241D68_EA2668.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80241DE4_EA26E4.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80241F18_EA2818.s create mode 100644 asm/nonmatchings/code_EA0C10/func_8024207C_EA297C.s create mode 100644 asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80242568_EA2E68.s create mode 100644 asm/nonmatchings/code_EA0C10/func_802425B0_EA2EB0.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80242608_EA2F08.s create mode 100644 asm/nonmatchings/code_EA0C10/func_8024267C_EA2F7C.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80242730_EA3030.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80242794_EA3094.s create mode 100644 asm/nonmatchings/code_EA0C10/func_802427F0_EA30F0.s create mode 100644 asm/nonmatchings/code_EA0C10/func_802429C0_EA32C0.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80242A14_EA3314.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80242A4C_EA334C.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80242AE8_EA33E8.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80242BD8_EA34D8.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80242D64_EA3664.s create mode 100644 asm/nonmatchings/code_EA0C10/func_80242DA8_EA36A8.s create mode 100644 asm/nonmatchings/code_EA36E0/func_80242DE0_EA36E0.s create mode 100644 asm/nonmatchings/code_EA36E0/func_80242E00_EA3700.s create mode 100644 asm/nonmatchings/code_EA36E0/func_80242E2C_EA372C.s create mode 100644 asm/nonmatchings/code_EA36E0/func_80242EC4_EA37C4.s create mode 100644 asm/nonmatchings/code_EA36E0/func_80242F64_EA3864.s create mode 100644 asm/nonmatchings/code_EA36E0/func_80242F9C_EA389C.s create mode 100644 asm/nonmatchings/code_EA36E0/func_80243054_EA3954.s create mode 100644 asm/nonmatchings/code_EA36E0/func_802430E4_EA39E4.s create mode 100644 asm/nonmatchings/code_EA6FD0/func_80240000_EA6FD0.s create mode 100644 asm/nonmatchings/code_EA7010/func_80240040_EA7010.s create mode 100644 asm/nonmatchings/code_EA7010/func_80240164_EA7134.s create mode 100644 asm/nonmatchings/code_EA7320/func_80240350_EA7320.s create mode 100644 asm/nonmatchings/code_EA7320/func_8024036C_EA733C.s create mode 100644 asm/nonmatchings/code_EA7320/func_80240388_EA7358.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80240000_EA8AE0.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80240124_EA8C04.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_8024030C_EA8DEC.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80240358_EA8E38.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_802408C8_EA93A8.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80240908_EA93E8.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80240A14_EA94F4.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80240B00_EA95E0.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80240BD4_EA96B4.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80240CD8_EA97B8.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80240DA4_EA9884.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80240E2C_EA990C.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_802413C0_EA9EA0.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_802413FC_EA9EDC.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_8024140C_EA9EEC.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80241468_EA9F48.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_8024151C_EA9FFC.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80241580_EAA060.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_802415DC_EAA0BC.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_802417AC_EAA28C.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80241800_EAA2E0.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80241838_EAA318.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_802418D4_EAA3B4.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_802419C4_EAA4A4.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80241B50_EAA630.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80241B94_EAA674.s create mode 100644 asm/nonmatchings/code_EA8AE0/func_80241BC0_EAA6A0.s create mode 100644 asm/nonmatchings/code_EB0E60/func_80240000_EB0E60.s create mode 100644 asm/nonmatchings/code_EB0E60/func_80240124_EB0F84.s create mode 100644 asm/nonmatchings/code_EB1170/func_80240310_EB1170.s create mode 100644 asm/nonmatchings/code_EB1170/func_802403C4_EB1224.s create mode 100644 asm/nonmatchings/code_EB1170/func_80240428_EB1288.s create mode 100644 asm/nonmatchings/code_EB1170/func_80240484_EB12E4.s create mode 100644 asm/nonmatchings/code_EB1170/func_80240654_EB14B4.s create mode 100644 asm/nonmatchings/code_EB1170/func_802406A8_EB1508.s create mode 100644 asm/nonmatchings/code_EB1170/func_802406E0_EB1540.s create mode 100644 asm/nonmatchings/code_EB1170/func_8024077C_EB15DC.s create mode 100644 asm/nonmatchings/code_EB1170/func_8024086C_EB16CC.s create mode 100644 asm/nonmatchings/code_EB1170/func_802409F8_EB1858.s create mode 100644 asm/nonmatchings/code_EB1170/func_80240A3C_EB189C.s create mode 100644 asm/nonmatchings/code_EB1170/func_80240A68_EB18C8.s create mode 100644 asm/nonmatchings/code_EB1170/func_80240A8C_EB18EC.s create mode 100644 asm/nonmatchings/code_EB5130/func_80240000_EB5130.s create mode 100644 asm/nonmatchings/code_EB5130/func_80240124_EB5254.s create mode 100644 asm/nonmatchings/code_EB5130/func_8024030C_EB543C.s create mode 100644 asm/nonmatchings/code_EB5470/func_80240340_EB5470.s create mode 100644 asm/nonmatchings/code_EB5470/func_8024036C_EB549C.s create mode 100644 asm/nonmatchings/code_EB7230/func_80240000_EB7230.s create mode 100644 asm/nonmatchings/code_EB7230/func_80240124_EB7354.s create mode 100644 asm/nonmatchings/code_EB7540/func_80240310_EB7540.s create mode 100644 asm/nonmatchings/code_EB7540/func_802403D8_EB7608.s create mode 100644 asm/nonmatchings/code_EB7540/func_80240478_EB76A8.s create mode 100644 asm/nonmatchings/code_EB7540/func_80240504_EB7734.s create mode 100644 asm/nonmatchings/code_EB7540/func_80240520_EB7750.s create mode 100644 asm/nonmatchings/code_EB8E50/func_80240000_EB8E50.s create mode 100644 asm/nonmatchings/code_EB8E90/func_80240040_EB8E90.s create mode 100644 asm/nonmatchings/code_EB8E90/func_80240198_EB8FE8.s create mode 100644 asm/nonmatchings/code_EB8E90/func_80240440_EB9290.s create mode 100644 asm/nonmatchings/code_EB8E90/func_80240500_EB9350.s create mode 100644 asm/nonmatchings/code_EB8E90/func_802406BC_EB950C.s create mode 100644 asm/nonmatchings/code_EB8E90/func_80240770_EB95C0.s create mode 100644 asm/nonmatchings/code_EB8E90/func_802407E4_EB9634.s create mode 100644 asm/nonmatchings/code_EB8E90/func_8024085C_EB96AC.s create mode 100644 asm/nonmatchings/code_EB8E90/func_8024098C_EB97DC.s create mode 100644 asm/nonmatchings/code_EB8E90/func_80240AAC_EB98FC.s create mode 100644 asm/nonmatchings/code_EB8E90/func_80240B14_EB9964.s create mode 100644 asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s create mode 100644 asm/nonmatchings/code_EB8E90/func_80240EFC_EB9D4C.s create mode 100644 asm/nonmatchings/code_EB9D90/func_80240F40_EB9D90.s create mode 100644 asm/nonmatchings/code_EB9D90/func_80240FB0_EB9E00.s create mode 100644 asm/nonmatchings/code_EB9D90/func_802410E4_EB9F34.s create mode 100644 asm/nonmatchings/code_EB9D90/func_8024121C_EBA06C.s create mode 100644 asm/nonmatchings/code_EB9D90/func_802413AC_EBA1FC.s create mode 100644 asm/nonmatchings/code_EB9D90/func_802413CC_EBA21C.s create mode 100644 asm/nonmatchings/code_EB9D90/func_802413EC_EBA23C.s create mode 100644 asm/nonmatchings/code_EC2200/func_80240000_EC2200.s create mode 100644 asm/nonmatchings/code_EC2240/func_80240040_EC2240.s create mode 100644 asm/nonmatchings/code_EC2240/func_802400F4_EC22F4.s create mode 100644 asm/nonmatchings/code_EC2240/func_80240158_EC2358.s create mode 100644 asm/nonmatchings/code_EC2610/func_80240410_EC2610.s create mode 100644 asm/nonmatchings/code_EC2610/func_80240480_EC2680.s create mode 100644 asm/nonmatchings/code_EC71B0/func_80240000_EC71B0.s create mode 100644 asm/nonmatchings/code_EC71B0/func_80240124_EC72D4.s create mode 100644 asm/nonmatchings/code_EC71B0/func_8024030C_EC74BC.s create mode 100644 asm/nonmatchings/code_EC71B0/func_80240344_EC74F4.s create mode 100644 asm/nonmatchings/code_EC7590/func_802403E0_EC7590.s create mode 100644 asm/nonmatchings/code_EC7590/func_80240450_EC7600.s create mode 100644 asm/nonmatchings/code_EC7590/func_8024061C_EC77CC.s create mode 100644 asm/nonmatchings/code_EC7590/func_802406D0_EC7880.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240000_EC9D00.s create mode 100644 asm/nonmatchings/code_EC9D00/func_8024001C_EC9D1C.s create mode 100644 asm/nonmatchings/code_EC9D00/func_8024003C_EC9D3C.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240068_EC9D68.s create mode 100644 asm/nonmatchings/code_EC9D00/func_802400D4_EC9DD4.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240120_EC9E20.s create mode 100644 asm/nonmatchings/code_EC9D00/func_802401CC_EC9ECC.s create mode 100644 asm/nonmatchings/code_EC9D00/func_8024041C_ECA11C.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240448_ECA148.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240480_ECA180.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240510_ECA210.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240544_ECA244.s create mode 100644 asm/nonmatchings/code_EC9D00/func_802405A8_ECA2A8.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240600_ECA300.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240B38_ECA838.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240C78_ECA978.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240CC0_ECA9C0.s create mode 100644 asm/nonmatchings/code_EC9D00/func_80240D08_ECAA08.s create mode 100644 asm/nonmatchings/code_ECAA40/func_80240D40_ECAA40.s create mode 100644 asm/nonmatchings/code_ECAA80/func_80240D80_ECAA80.s create mode 100644 asm/nonmatchings/code_ECAA80/func_80241364_ECB064.s create mode 100644 asm/nonmatchings/code_ECAA80/func_802414C8_ECB1C8.s create mode 100644 asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s create mode 100644 asm/nonmatchings/code_ECAA80/func_80241770_ECB470.s create mode 100644 asm/nonmatchings/code_ECAA80/func_802417CC_ECB4CC.s create mode 100644 asm/nonmatchings/code_ECAA80/func_8024199C_ECB69C.s create mode 100644 asm/nonmatchings/code_ECAA80/func_802419F0_ECB6F0.s create mode 100644 asm/nonmatchings/code_ECAA80/func_80241A28_ECB728.s create mode 100644 asm/nonmatchings/code_ECAA80/func_80241AC4_ECB7C4.s create mode 100644 asm/nonmatchings/code_ECAA80/func_80241B88_ECB888.s create mode 100644 asm/nonmatchings/code_ECAA80/func_80241BF8_ECB8F8.s create mode 100644 asm/nonmatchings/code_ECB930/func_80241C30_ECB930.s create mode 100644 asm/nonmatchings/code_ECB930/func_80241CA0_ECB9A0.s create mode 100644 asm/nonmatchings/code_ECBB70/func_80241E70_ECBB70.s create mode 100644 asm/nonmatchings/code_ECFFF0/func_80240000_ECFFF0.s create mode 100644 asm/nonmatchings/code_ED0030/func_80240040_ED0030.s create mode 100644 asm/nonmatchings/code_ED00D0/func_802400E0_ED00D0.s create mode 100644 asm/nonmatchings/code_ED00D0/func_80240150_ED0140.s create mode 100644 asm/nonmatchings/code_ED0310/func_80240320_ED0310.s create mode 100644 asm/nonmatchings/code_ED0310/func_802404D0_ED04C0.s create mode 100644 asm/nonmatchings/code_ED0310/func_80240AF8_ED0AE8.s create mode 100644 asm/nonmatchings/code_ED0310/func_80240BB8_ED0BA8.s create mode 100644 asm/nonmatchings/code_ED0310/func_80240EFC_ED0EEC.s create mode 100644 asm/nonmatchings/code_ED0310/func_80240F74_ED0F64.s create mode 100644 asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s create mode 100644 asm/nonmatchings/code_ED0310/func_80241114_ED1104.s create mode 100644 asm/nonmatchings/code_ED0310/func_80241178_ED1168.s create mode 100644 asm/nonmatchings/code_ED0310/func_80241508_ED14F8.s create mode 100644 asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s create mode 100644 asm/nonmatchings/code_ED4220/func_80240000_ED4220.s create mode 100644 asm/nonmatchings/code_ED4260/func_80240040_ED4260.s create mode 100644 asm/nonmatchings/code_ED42A0/func_80240080_ED42A0.s create mode 100644 asm/nonmatchings/code_ED42A0/func_80240134_ED4354.s create mode 100644 asm/nonmatchings/code_ED42A0/func_80240198_ED43B8.s create mode 100644 asm/nonmatchings/code_ED42A0/func_802402BC_ED44DC.s create mode 100644 asm/nonmatchings/code_ED46D0/func_802404B0_ED46D0.s create mode 100644 asm/nonmatchings/code_ED46D0/func_80240B10_ED4D30.s create mode 100644 asm/nonmatchings/code_ED5540/func_80241320_ED5540.s create mode 100644 asm/nonmatchings/code_ED5540/func_80241390_ED55B0.s create mode 100644 asm/nonmatchings/code_ED8E20/func_80240000_ED8E20.s create mode 100644 asm/nonmatchings/code_ED8E20/func_80240020_ED8E40.s create mode 100644 asm/nonmatchings/code_ED8E20/func_80240034_ED8E54.s create mode 100644 asm/nonmatchings/code_ED8E20/func_802400F0_ED8F10.s create mode 100644 asm/nonmatchings/code_ED8E20/func_80240208_ED9028.s create mode 100644 asm/nonmatchings/code_ED8E20/func_80240274_ED9094.s create mode 100644 asm/nonmatchings/code_ED8E20/func_80240318_ED9138.s create mode 100644 asm/nonmatchings/code_EDBFE0/func_80240000_EDBFE0.s create mode 100644 asm/nonmatchings/code_EDC020/func_80240040_EDC020.s create mode 100644 asm/nonmatchings/code_EDC020/func_802400B0_EDC090.s create mode 100644 asm/nonmatchings/code_EDC020/func_8024027C_EDC25C.s create mode 100644 asm/nonmatchings/code_EDC020/func_80240330_EDC310.s create mode 100644 asm/nonmatchings/code_EDC020/func_80240394_EDC374.s create mode 100644 asm/nonmatchings/code_EDC020/func_802403F0_EDC3D0.s create mode 100644 asm/nonmatchings/code_EDC020/func_802405C0_EDC5A0.s create mode 100644 asm/nonmatchings/code_EDC020/func_80240614_EDC5F4.s create mode 100644 asm/nonmatchings/code_EDC020/func_8024064C_EDC62C.s create mode 100644 asm/nonmatchings/code_EDE9C0/func_80240000_EDE9C0.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80240040_EDEA00.s create mode 100644 asm/nonmatchings/code_EDEA00/func_802401C4_EDEB84.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80240374_EDED34.s create mode 100644 asm/nonmatchings/code_EDEA00/func_8024099C_EDF35C.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80240A5C_EDF41C.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80240DA0_EDF760.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80240E18_EDF7D8.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80240FB8_EDF978.s create mode 100644 asm/nonmatchings/code_EDEA00/func_8024101C_EDF9DC.s create mode 100644 asm/nonmatchings/code_EDEA00/func_802413AC_EDFD6C.s create mode 100644 asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s create mode 100644 asm/nonmatchings/code_EDEA00/func_802416E8_EE00A8.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80241730_EE00F0.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80241B94_EE0554.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s create mode 100644 asm/nonmatchings/code_EDEA00/func_802422F0_EE0CB0.s create mode 100644 asm/nonmatchings/code_EDEA00/func_8024236C_EE0D2C.s create mode 100644 asm/nonmatchings/code_EDEA00/func_802424A0_EE0E60.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80242604_EE0FC4.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80242AF0_EE14B0.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80243470_EE1E30.s create mode 100644 asm/nonmatchings/code_EDEA00/func_80243584_EE1F44.s create mode 100644 asm/nonmatchings/code_EDEA00/pause_interp_text_scroll_EE1DD8.s create mode 100644 asm/nonmatchings/code_EE2040/func_80243680_EE2040.s create mode 100644 asm/nonmatchings/code_EE65B0/func_80240000_EE65B0.s create mode 100644 asm/nonmatchings/code_EE65B0/func_80240124_EE66D4.s create mode 100644 asm/nonmatchings/code_EE65B0/func_8024030C_EE68BC.s create mode 100644 asm/nonmatchings/code_EE65B0/func_80240340_EE68F0.s create mode 100644 asm/nonmatchings/code_EE65B0/func_802403D4_EE6984.s create mode 100644 asm/nonmatchings/code_EE65B0/func_8024042C_EE69DC.s create mode 100644 asm/nonmatchings/code_EE65B0/func_8024046C_EE6A1C.s create mode 100644 asm/nonmatchings/code_EE65B0/func_80240504_EE6AB4.s create mode 100644 asm/nonmatchings/code_EE65B0/func_802407D4_EE6D84.s create mode 100644 asm/nonmatchings/code_EE70C0/func_80240B10_EE70C0.s create mode 100644 asm/nonmatchings/code_EE70C0/func_80240CC0_EE7270.s create mode 100644 asm/nonmatchings/code_EE70C0/func_802412E8_EE7898.s create mode 100644 asm/nonmatchings/code_EE70C0/func_802413A8_EE7958.s create mode 100644 asm/nonmatchings/code_EE70C0/func_802416EC_EE7C9C.s create mode 100644 asm/nonmatchings/code_EE70C0/func_80241764_EE7D14.s create mode 100644 asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s create mode 100644 asm/nonmatchings/code_EE70C0/func_80241904_EE7EB4.s create mode 100644 asm/nonmatchings/code_EE70C0/func_80241968_EE7F18.s create mode 100644 asm/nonmatchings/code_EE70C0/func_80241CF8_EE82A8.s create mode 100644 asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s create mode 100644 asm/nonmatchings/code_EE70C0/func_80242034_EE85E4.s create mode 100644 asm/nonmatchings/code_EE70C0/func_80242090_EE8640.s create mode 100644 asm/nonmatchings/code_EE70C0/func_80242260_EE8810.s create mode 100644 asm/nonmatchings/code_EE70C0/func_802422B4_EE8864.s create mode 100644 asm/nonmatchings/code_EE70C0/func_802422EC_EE889C.s create mode 100644 asm/nonmatchings/code_EE8940/func_80242390_EE8940.s create mode 100644 asm/nonmatchings/code_EED100/func_80240000_EED100.s create mode 100644 asm/nonmatchings/code_EED140/func_80240040_EED140.s create mode 100644 asm/nonmatchings/code_EED1E0/func_802400E0_EED1E0.s create mode 100644 asm/nonmatchings/code_EED1E0/func_802400FC_EED1FC.s create mode 100644 asm/nonmatchings/code_EED1E0/func_8024011C_EED21C.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240148_EED248.s create mode 100644 asm/nonmatchings/code_EED1E0/func_802401B4_EED2B4.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240200_EED300.s create mode 100644 asm/nonmatchings/code_EED1E0/func_802402AC_EED3AC.s create mode 100644 asm/nonmatchings/code_EED1E0/func_802404FC_EED5FC.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240528_EED628.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240560_EED660.s create mode 100644 asm/nonmatchings/code_EED1E0/func_802405F0_EED6F0.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240624_EED724.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240688_EED788.s create mode 100644 asm/nonmatchings/code_EED1E0/func_802406E0_EED7E0.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240C18_EEDD18.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240D58_EEDE58.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240DA0_EEDEA0.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240DE8_EEDEE8.s create mode 100644 asm/nonmatchings/code_EED1E0/func_80240E18_EEDF18.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80240E50_EEDF50.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80241000_EEE100.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80241628_EEE728.s create mode 100644 asm/nonmatchings/code_EEDF50/func_802416E8_EEE7E8.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80241A2C_EEEB2C.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80241AA4_EEEBA4.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80241C44_EEED44.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80241CA8_EEEDA8.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80242038_EEF138.s create mode 100644 asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80242374_EEF474.s create mode 100644 asm/nonmatchings/code_EEDF50/func_802424A4_EEF5A4.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80242724_EEF824.s create mode 100644 asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s create mode 100644 asm/nonmatchings/code_EEFAA0/func_802429A0_EEFAA0.s create mode 100644 asm/nonmatchings/code_EF2610/func_80240000_EF2610.s create mode 100644 asm/nonmatchings/code_EF2650/func_80240040_EF2650.s create mode 100644 asm/nonmatchings/code_EF2680/func_80240070_EF2680.s create mode 100644 asm/nonmatchings/code_EF2680/func_80240220_EF2830.s create mode 100644 asm/nonmatchings/code_EF2680/func_80240848_EF2E58.s create mode 100644 asm/nonmatchings/code_EF2680/func_80240908_EF2F18.s create mode 100644 asm/nonmatchings/code_EF2680/func_80240C4C_EF325C.s create mode 100644 asm/nonmatchings/code_EF2680/func_80240CC4_EF32D4.s create mode 100644 asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s create mode 100644 asm/nonmatchings/code_EF2680/func_80240E64_EF3474.s create mode 100644 asm/nonmatchings/code_EF2680/func_80240EC8_EF34D8.s create mode 100644 asm/nonmatchings/code_EF2680/func_80241258_EF3868.s create mode 100644 asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s create mode 100644 asm/nonmatchings/code_EF2680/func_80241594_EF3BA4.s create mode 100644 asm/nonmatchings/code_EF2680/func_802415DC_EF3BEC.s create mode 100644 asm/nonmatchings/code_EF2680/func_80241A40_EF4050.s create mode 100644 asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s create mode 100644 asm/nonmatchings/code_EF2680/func_8024219C_EF47AC.s create mode 100644 asm/nonmatchings/code_EF2680/func_80242218_EF4828.s create mode 100644 asm/nonmatchings/code_EF2680/func_8024234C_EF495C.s create mode 100644 asm/nonmatchings/code_EF2680/func_802424B0_EF4AC0.s create mode 100644 asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s create mode 100644 asm/nonmatchings/code_EF2680/func_8024299C_EF4FAC.s create mode 100644 asm/nonmatchings/code_EF7A80/func_80240000_EF7A80.s create mode 100644 asm/nonmatchings/code_EF7A80/func_80240124_EF7BA4.s create mode 100644 asm/nonmatchings/code_EF7A80/func_8024030C_EF7D8C.s create mode 100644 asm/nonmatchings/code_EF7A80/func_80240340_EF7DC0.s create mode 100644 asm/nonmatchings/code_EF7A80/func_80240394_EF7E14.s create mode 100644 asm/nonmatchings/code_EF7FB0/func_80240530_EF7FB0.s create mode 100644 asm/nonmatchings/code_EF8010/func_80240590_EF8010.s create mode 100644 asm/nonmatchings/code_EF8010/func_80240600_EF8080.s create mode 100644 asm/nonmatchings/code_EFEB00/func_80240000_EFEB00.s create mode 100644 asm/nonmatchings/code_EFEB00/func_80240124_EFEC24.s create mode 100644 asm/nonmatchings/code_EFEB00/func_8024030C_EFEE0C.s create mode 100644 asm/nonmatchings/code_EFEB00/func_80240340_EFEE40.s create mode 100644 asm/nonmatchings/code_EFEB00/func_802404D0_EFEFD0.s create mode 100644 asm/nonmatchings/code_EFEB00/func_80240540_EFF040.s create mode 100644 asm/nonmatchings/code_EFEB00/func_80240660_EFF160.s create mode 100644 asm/nonmatchings/code_EFEB00/func_80240784_EFF284.s create mode 100644 asm/nonmatchings/code_EFEB00/func_802407B0_EFF2B0.s create mode 100644 src/code_EA0900.c create mode 100644 src/code_EA0C10.c create mode 100644 src/code_EA36E0.c create mode 100644 src/code_EA6FD0.c create mode 100644 src/code_EA7010.c create mode 100644 src/code_EA7320.c create mode 100644 src/code_EA8AE0.c create mode 100644 src/code_EB0E60.c create mode 100644 src/code_EB1170.c create mode 100644 src/code_EB5130.c create mode 100644 src/code_EB5470.c create mode 100644 src/code_EB7230.c create mode 100644 src/code_EB7540.c create mode 100644 src/code_EB8E50.c create mode 100644 src/code_EB8E90.c create mode 100644 src/code_EB9D90.c create mode 100644 src/code_EC2200.c create mode 100644 src/code_EC2240.c create mode 100644 src/code_EC2610.c create mode 100644 src/code_EC71B0.c create mode 100644 src/code_EC7590.c create mode 100644 src/code_EC9D00.c create mode 100644 src/code_ECAA40.c create mode 100644 src/code_ECAA80.c create mode 100644 src/code_ECB930.c create mode 100644 src/code_ECBB70.c create mode 100644 src/code_ECFFF0.c create mode 100644 src/code_ED0030.c create mode 100644 src/code_ED00D0.c create mode 100644 src/code_ED0310.c create mode 100644 src/code_ED4220.c create mode 100644 src/code_ED4260.c create mode 100644 src/code_ED42A0.c create mode 100644 src/code_ED46D0.c create mode 100644 src/code_ED5540.c create mode 100644 src/code_ED8E20.c create mode 100644 src/code_EDBFE0.c create mode 100644 src/code_EDC020.c create mode 100644 src/code_EDE9C0.c create mode 100644 src/code_EDEA00.c create mode 100644 src/code_EE2040.c create mode 100644 src/code_EE65B0.c create mode 100644 src/code_EE70C0.c create mode 100644 src/code_EE8940.c create mode 100644 src/code_EED100.c create mode 100644 src/code_EED140.c create mode 100644 src/code_EED1E0.c create mode 100644 src/code_EEDF50.c create mode 100644 src/code_EEFAA0.c create mode 100644 src/code_EF2610.c create mode 100644 src/code_EF2650.c create mode 100644 src/code_EF2680.c create mode 100644 src/code_EF7A80.c create mode 100644 src/code_EF7FB0.c create mode 100644 src/code_EF8010.c create mode 100644 src/code_EFEB00.c diff --git a/Makefile b/Makefile index 17dd97f8a3..eee8d5d55a 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ CPPFLAGS := -Iinclude -Isrc -D _LANGUAGE_C -D _FINALROM -ffreestanding -DF3DEX ASFLAGS := -EB -Iinclude -march=vr4300 -mtune=vr4300 OLDASFLAGS := -EB -Iinclude -G 0 CFLAGS := -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wimplicit -Wuninitialized -Wshadow -LDFLAGS := -T undefined_syms.txt -T undefined_syms_auto.txt -T undefined_funcs.txt -T $(BUILD_DIR)/$(LD_SCRIPT) -Map $(LD_MAP) --no-check-sections +LDFLAGS := -T undefined_syms.txt -T undefined_syms_auto.txt -T undefined_funcs.txt -T undefined_funcs_auto.txt -T $(BUILD_DIR)/$(LD_SCRIPT) -Map $(LD_MAP) --no-check-sections ifeq ($(WATCH_INCLUDES),1) CPPMFLAGS = -MP -MD -MF $@.mk -MT $(BUILD_DIR)/$*.d diff --git a/asm/nonmatchings/code_EA0900/func_80240000_EA0900.s b/asm/nonmatchings/code_EA0900/func_80240000_EA0900.s new file mode 100644 index 0000000000..495dd2f5ea --- /dev/null +++ b/asm/nonmatchings/code_EA0900/func_80240000_EA0900.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EA0900 +/* EA0900 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA0904 80240004 AFB00010 */ sw $s0, 0x10($sp) +/* EA0908 80240008 0080802D */ daddu $s0, $a0, $zero +/* EA090C 8024000C AFBF0014 */ sw $ra, 0x14($sp) +/* EA0910 80240010 8E0300A8 */ lw $v1, 0xa8($s0) +/* EA0914 80240014 8E020088 */ lw $v0, 0x88($s0) +/* EA0918 80240018 00621821 */ addu $v1, $v1, $v0 +/* EA091C 8024001C 04610004 */ bgez $v1, .L80240030 +/* EA0920 80240020 AE0300A8 */ sw $v1, 0xa8($s0) +/* EA0924 80240024 3C020002 */ lui $v0, 2 +/* EA0928 80240028 08090010 */ j .L80240040 +/* EA092C 8024002C 00621021 */ addu $v0, $v1, $v0 +.L80240030: +/* EA0930 80240030 3C040002 */ lui $a0, 2 +/* EA0934 80240034 0083102A */ slt $v0, $a0, $v1 +/* EA0938 80240038 10400002 */ beqz $v0, .L80240044 +/* EA093C 8024003C 00641023 */ subu $v0, $v1, $a0 +.L80240040: +/* EA0940 80240040 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240044: +/* EA0944 80240044 8E0300AC */ lw $v1, 0xac($s0) +/* EA0948 80240048 8E02008C */ lw $v0, 0x8c($s0) +/* EA094C 8024004C 00621821 */ addu $v1, $v1, $v0 +/* EA0950 80240050 04610004 */ bgez $v1, .L80240064 +/* EA0954 80240054 AE0300AC */ sw $v1, 0xac($s0) +/* EA0958 80240058 3C020002 */ lui $v0, 2 +/* EA095C 8024005C 0809001D */ j .L80240074 +/* EA0960 80240060 00621021 */ addu $v0, $v1, $v0 +.L80240064: +/* EA0964 80240064 3C040002 */ lui $a0, 2 +/* EA0968 80240068 0083102A */ slt $v0, $a0, $v1 +/* EA096C 8024006C 10400002 */ beqz $v0, .L80240078 +/* EA0970 80240070 00641023 */ subu $v0, $v1, $a0 +.L80240074: +/* EA0974 80240074 AE0200AC */ sw $v0, 0xac($s0) +.L80240078: +/* EA0978 80240078 8E0300B0 */ lw $v1, 0xb0($s0) +/* EA097C 8024007C 8E020090 */ lw $v0, 0x90($s0) +/* EA0980 80240080 00621821 */ addu $v1, $v1, $v0 +/* EA0984 80240084 04610004 */ bgez $v1, .L80240098 +/* EA0988 80240088 AE0300B0 */ sw $v1, 0xb0($s0) +/* EA098C 8024008C 3C020002 */ lui $v0, 2 +/* EA0990 80240090 0809002A */ j .L802400A8 +/* EA0994 80240094 00621021 */ addu $v0, $v1, $v0 +.L80240098: +/* EA0998 80240098 3C040002 */ lui $a0, 2 +/* EA099C 8024009C 0083102A */ slt $v0, $a0, $v1 +/* EA09A0 802400A0 10400002 */ beqz $v0, .L802400AC +/* EA09A4 802400A4 00641023 */ subu $v0, $v1, $a0 +.L802400A8: +/* EA09A8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802400AC: +/* EA09AC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) +/* EA09B0 802400B0 8E020094 */ lw $v0, 0x94($s0) +/* EA09B4 802400B4 00621821 */ addu $v1, $v1, $v0 +/* EA09B8 802400B8 04610004 */ bgez $v1, .L802400CC +/* EA09BC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) +/* EA09C0 802400C0 3C020002 */ lui $v0, 2 +/* EA09C4 802400C4 08090037 */ j .L802400DC +/* EA09C8 802400C8 00621021 */ addu $v0, $v1, $v0 +.L802400CC: +/* EA09CC 802400CC 3C040002 */ lui $a0, 2 +/* EA09D0 802400D0 0083102A */ slt $v0, $a0, $v1 +/* EA09D4 802400D4 10400002 */ beqz $v0, .L802400E0 +/* EA09D8 802400D8 00641023 */ subu $v0, $v1, $a0 +.L802400DC: +/* EA09DC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) +.L802400E0: +/* EA09E0 802400E0 8E040084 */ lw $a0, 0x84($s0) +/* EA09E4 802400E4 0C049819 */ jal func_80126064 +/* EA09E8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) +/* EA09EC 802400EC 8E040084 */ lw $a0, 0x84($s0) +/* EA09F0 802400F0 0C04981F */ jal func_8012607C +/* EA09F4 802400F4 8E0500AC */ lw $a1, 0xac($s0) +/* EA09F8 802400F8 8E040084 */ lw $a0, 0x84($s0) +/* EA09FC 802400FC 0C049825 */ jal func_80126094 +/* EA0A00 80240100 8E0500B0 */ lw $a1, 0xb0($s0) +/* EA0A04 80240104 8E040084 */ lw $a0, 0x84($s0) +/* EA0A08 80240108 0C04982B */ jal func_801260AC +/* EA0A0C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) +/* EA0A10 80240110 8FBF0014 */ lw $ra, 0x14($sp) +/* EA0A14 80240114 8FB00010 */ lw $s0, 0x10($sp) +/* EA0A18 80240118 0000102D */ daddu $v0, $zero, $zero +/* EA0A1C 8024011C 03E00008 */ jr $ra +/* EA0A20 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA0900/func_80240124_EA0A24.s b/asm/nonmatchings/code_EA0900/func_80240124_EA0A24.s new file mode 100644 index 0000000000..3d2b81981e --- /dev/null +++ b/asm/nonmatchings/code_EA0900/func_80240124_EA0A24.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240124_EA0A24 +/* EA0A24 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA0A28 80240128 AFB00010 */ sw $s0, 0x10($sp) +/* EA0A2C 8024012C 0080802D */ daddu $s0, $a0, $zero +/* EA0A30 80240130 10A00005 */ beqz $a1, .L80240148 +/* EA0A34 80240134 AFBF0014 */ sw $ra, 0x14($sp) +/* EA0A38 80240138 AE000070 */ sw $zero, 0x70($s0) +/* EA0A3C 8024013C AE000074 */ sw $zero, 0x74($s0) +/* EA0A40 80240140 AE000078 */ sw $zero, 0x78($s0) +/* EA0A44 80240144 AE00007C */ sw $zero, 0x7c($s0) +.L80240148: +/* EA0A48 80240148 8E020070 */ lw $v0, 0x70($s0) +/* EA0A4C 8024014C 1440000E */ bnez $v0, .L80240188 +/* EA0A50 80240150 00000000 */ nop +/* EA0A54 80240154 8E0300A8 */ lw $v1, 0xa8($s0) +/* EA0A58 80240158 8E020088 */ lw $v0, 0x88($s0) +/* EA0A5C 8024015C 00621821 */ addu $v1, $v1, $v0 +/* EA0A60 80240160 04610004 */ bgez $v1, .L80240174 +/* EA0A64 80240164 AE0300A8 */ sw $v1, 0xa8($s0) +/* EA0A68 80240168 3C020002 */ lui $v0, 2 +/* EA0A6C 8024016C 08090061 */ j .L80240184 +/* EA0A70 80240170 00621021 */ addu $v0, $v1, $v0 +.L80240174: +/* EA0A74 80240174 3C040002 */ lui $a0, 2 +/* EA0A78 80240178 0083102A */ slt $v0, $a0, $v1 +/* EA0A7C 8024017C 10400002 */ beqz $v0, .L80240188 +/* EA0A80 80240180 00641023 */ subu $v0, $v1, $a0 +.L80240184: +/* EA0A84 80240184 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240188: +/* EA0A88 80240188 8E020074 */ lw $v0, 0x74($s0) +/* EA0A8C 8024018C 1440000E */ bnez $v0, .L802401C8 +/* EA0A90 80240190 00000000 */ nop +/* EA0A94 80240194 8E0300AC */ lw $v1, 0xac($s0) +/* EA0A98 80240198 8E02008C */ lw $v0, 0x8c($s0) +/* EA0A9C 8024019C 00621821 */ addu $v1, $v1, $v0 +/* EA0AA0 802401A0 04610004 */ bgez $v1, .L802401B4 +/* EA0AA4 802401A4 AE0300AC */ sw $v1, 0xac($s0) +/* EA0AA8 802401A8 3C020002 */ lui $v0, 2 +/* EA0AAC 802401AC 08090071 */ j .L802401C4 +/* EA0AB0 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* EA0AB4 802401B4 3C040002 */ lui $a0, 2 +/* EA0AB8 802401B8 0083102A */ slt $v0, $a0, $v1 +/* EA0ABC 802401BC 10400002 */ beqz $v0, .L802401C8 +/* EA0AC0 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* EA0AC4 802401C4 AE0200AC */ sw $v0, 0xac($s0) +.L802401C8: +/* EA0AC8 802401C8 8E020078 */ lw $v0, 0x78($s0) +/* EA0ACC 802401CC 1440000E */ bnez $v0, .L80240208 +/* EA0AD0 802401D0 00000000 */ nop +/* EA0AD4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) +/* EA0AD8 802401D8 8E020090 */ lw $v0, 0x90($s0) +/* EA0ADC 802401DC 00621821 */ addu $v1, $v1, $v0 +/* EA0AE0 802401E0 04610004 */ bgez $v1, .L802401F4 +/* EA0AE4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) +/* EA0AE8 802401E8 3C020002 */ lui $v0, 2 +/* EA0AEC 802401EC 08090081 */ j .L80240204 +/* EA0AF0 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* EA0AF4 802401F4 3C040002 */ lui $a0, 2 +/* EA0AF8 802401F8 0083102A */ slt $v0, $a0, $v1 +/* EA0AFC 802401FC 10400002 */ beqz $v0, .L80240208 +/* EA0B00 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* EA0B04 80240204 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240208: +/* EA0B08 80240208 8E02007C */ lw $v0, 0x7c($s0) +/* EA0B0C 8024020C 1440000E */ bnez $v0, .L80240248 +/* EA0B10 80240210 00000000 */ nop +/* EA0B14 80240214 8E0300B4 */ lw $v1, 0xb4($s0) +/* EA0B18 80240218 8E020094 */ lw $v0, 0x94($s0) +/* EA0B1C 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EA0B20 80240220 04610004 */ bgez $v1, .L80240234 +/* EA0B24 80240224 AE0300B4 */ sw $v1, 0xb4($s0) +/* EA0B28 80240228 3C020002 */ lui $v0, 2 +/* EA0B2C 8024022C 08090091 */ j .L80240244 +/* EA0B30 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* EA0B34 80240234 3C040002 */ lui $a0, 2 +/* EA0B38 80240238 0083102A */ slt $v0, $a0, $v1 +/* EA0B3C 8024023C 10400002 */ beqz $v0, .L80240248 +/* EA0B40 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* EA0B44 80240244 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240248: +/* EA0B48 80240248 8E040084 */ lw $a0, 0x84($s0) +/* EA0B4C 8024024C 0C049819 */ jal func_80126064 +/* EA0B50 80240250 8E0500A8 */ lw $a1, 0xa8($s0) +/* EA0B54 80240254 8E040084 */ lw $a0, 0x84($s0) +/* EA0B58 80240258 0C04981F */ jal func_8012607C +/* EA0B5C 8024025C 8E0500AC */ lw $a1, 0xac($s0) +/* EA0B60 80240260 8E040084 */ lw $a0, 0x84($s0) +/* EA0B64 80240264 0C049825 */ jal func_80126094 +/* EA0B68 80240268 8E0500B0 */ lw $a1, 0xb0($s0) +/* EA0B6C 8024026C 8E040084 */ lw $a0, 0x84($s0) +/* EA0B70 80240270 0C04982B */ jal func_801260AC +/* EA0B74 80240274 8E0500B4 */ lw $a1, 0xb4($s0) +/* EA0B78 80240278 8E020070 */ lw $v0, 0x70($s0) +/* EA0B7C 8024027C 8E030078 */ lw $v1, 0x78($s0) +/* EA0B80 80240280 8E040098 */ lw $a0, 0x98($s0) +/* EA0B84 80240284 24420001 */ addiu $v0, $v0, 1 +/* EA0B88 80240288 AE020070 */ sw $v0, 0x70($s0) +/* EA0B8C 8024028C 8E020074 */ lw $v0, 0x74($s0) +/* EA0B90 80240290 24630001 */ addiu $v1, $v1, 1 +/* EA0B94 80240294 AE030078 */ sw $v1, 0x78($s0) +/* EA0B98 80240298 8E030070 */ lw $v1, 0x70($s0) +/* EA0B9C 8024029C 24420001 */ addiu $v0, $v0, 1 +/* EA0BA0 802402A0 AE020074 */ sw $v0, 0x74($s0) +/* EA0BA4 802402A4 8E02007C */ lw $v0, 0x7c($s0) +/* EA0BA8 802402A8 0064182A */ slt $v1, $v1, $a0 +/* EA0BAC 802402AC 24420001 */ addiu $v0, $v0, 1 +/* EA0BB0 802402B0 14600002 */ bnez $v1, .L802402BC +/* EA0BB4 802402B4 AE02007C */ sw $v0, 0x7c($s0) +/* EA0BB8 802402B8 AE000070 */ sw $zero, 0x70($s0) +.L802402BC: +/* EA0BBC 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* EA0BC0 802402C0 8E03009C */ lw $v1, 0x9c($s0) +/* EA0BC4 802402C4 0043102A */ slt $v0, $v0, $v1 +/* EA0BC8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 +/* EA0BCC 802402CC AE000074 */ sw $zero, 0x74($s0) +.L802402D0: +/* EA0BD0 802402D0 8E020078 */ lw $v0, 0x78($s0) +/* EA0BD4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) +/* EA0BD8 802402D8 0043102A */ slt $v0, $v0, $v1 +/* EA0BDC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* EA0BE0 802402E0 AE000078 */ sw $zero, 0x78($s0) +.L802402E4: +/* EA0BE4 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* EA0BE8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) +/* EA0BEC 802402EC 0043102A */ slt $v0, $v0, $v1 +/* EA0BF0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 +/* EA0BF4 802402F4 AE00007C */ sw $zero, 0x7c($s0) +.L802402F8: +/* EA0BF8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) +/* EA0BFC 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* EA0C00 80240300 0000102D */ daddu $v0, $zero, $zero +/* EA0C04 80240304 03E00008 */ jr $ra +/* EA0C08 80240308 27BD0018 */ addiu $sp, $sp, 0x18 +/* EA0C0C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/code_EA0C10/func_80240310_EA0C10.s b/asm/nonmatchings/code_EA0C10/func_80240310_EA0C10.s new file mode 100644 index 0000000000..cb9a736977 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80240310_EA0C10.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240310_EA0C10 +/* EA0C10 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA0C14 80240314 AFB10014 */ sw $s1, 0x14($sp) +/* EA0C18 80240318 0080882D */ daddu $s1, $a0, $zero +/* EA0C1C 8024031C AFBF0018 */ sw $ra, 0x18($sp) +/* EA0C20 80240320 AFB00010 */ sw $s0, 0x10($sp) +/* EA0C24 80240324 8E300148 */ lw $s0, 0x148($s1) +/* EA0C28 80240328 0C00F92F */ jal func_8003E4BC +/* EA0C2C 8024032C 86040008 */ lh $a0, 8($s0) +/* EA0C30 80240330 24030001 */ addiu $v1, $zero, 1 +/* EA0C34 80240334 0040202D */ daddu $a0, $v0, $zero +/* EA0C38 80240338 AE03006C */ sw $v1, 0x6c($s0) +/* EA0C3C 8024033C 8482008C */ lh $v0, 0x8c($a0) +/* EA0C40 80240340 14400009 */ bnez $v0, .L80240368 +/* EA0C44 80240344 24020002 */ addiu $v0, $zero, 2 +/* EA0C48 80240348 96030072 */ lhu $v1, 0x72($s0) +/* EA0C4C 8024034C AE02006C */ sw $v0, 0x6c($s0) +/* EA0C50 80240350 A483008E */ sh $v1, 0x8e($a0) +/* EA0C54 80240354 8E0200CC */ lw $v0, 0xcc($s0) +/* EA0C58 80240358 8C420020 */ lw $v0, 0x20($v0) +/* EA0C5C 8024035C AC820028 */ sw $v0, 0x28($a0) +/* EA0C60 80240360 2402001F */ addiu $v0, $zero, 0x1f +/* EA0C64 80240364 AE220070 */ sw $v0, 0x70($s1) +.L80240368: +/* EA0C68 80240368 8FBF0018 */ lw $ra, 0x18($sp) +/* EA0C6C 8024036C 8FB10014 */ lw $s1, 0x14($sp) +/* EA0C70 80240370 8FB00010 */ lw $s0, 0x10($sp) +/* EA0C74 80240374 03E00008 */ jr $ra +/* EA0C78 80240378 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_8024037C_EA0C7C.s b/asm/nonmatchings/code_EA0C10/func_8024037C_EA0C7C.s new file mode 100644 index 0000000000..4ebf473a83 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_8024037C_EA0C7C.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024037C_EA0C7C +/* EA0C7C 8024037C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA0C80 80240380 AFB10014 */ sw $s1, 0x14($sp) +/* EA0C84 80240384 0080882D */ daddu $s1, $a0, $zero +/* EA0C88 80240388 AFBF0018 */ sw $ra, 0x18($sp) +/* EA0C8C 8024038C AFB00010 */ sw $s0, 0x10($sp) +/* EA0C90 80240390 8E300148 */ lw $s0, 0x148($s1) +/* EA0C94 80240394 0C00F92F */ jal func_8003E4BC +/* EA0C98 80240398 86040008 */ lh $a0, 8($s0) +/* EA0C9C 8024039C 0040202D */ daddu $a0, $v0, $zero +/* EA0CA0 802403A0 9482008E */ lhu $v0, 0x8e($a0) +/* EA0CA4 802403A4 2442FFFF */ addiu $v0, $v0, -1 +/* EA0CA8 802403A8 A482008E */ sh $v0, 0x8e($a0) +/* EA0CAC 802403AC 00021400 */ sll $v0, $v0, 0x10 +/* EA0CB0 802403B0 1C400009 */ bgtz $v0, .L802403D8 +/* EA0CB4 802403B4 24020003 */ addiu $v0, $zero, 3 +/* EA0CB8 802403B8 96030076 */ lhu $v1, 0x76($s0) +/* EA0CBC 802403BC AE02006C */ sw $v0, 0x6c($s0) +/* EA0CC0 802403C0 A483008E */ sh $v1, 0x8e($a0) +/* EA0CC4 802403C4 8E0200CC */ lw $v0, 0xcc($s0) +/* EA0CC8 802403C8 8C420024 */ lw $v0, 0x24($v0) +/* EA0CCC 802403CC AC820028 */ sw $v0, 0x28($a0) +/* EA0CD0 802403D0 24020020 */ addiu $v0, $zero, 0x20 +/* EA0CD4 802403D4 AE220070 */ sw $v0, 0x70($s1) +.L802403D8: +/* EA0CD8 802403D8 8FBF0018 */ lw $ra, 0x18($sp) +/* EA0CDC 802403DC 8FB10014 */ lw $s1, 0x14($sp) +/* EA0CE0 802403E0 8FB00010 */ lw $s0, 0x10($sp) +/* EA0CE4 802403E4 03E00008 */ jr $ra +/* EA0CE8 802403E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_802403EC_EA0CEC.s b/asm/nonmatchings/code_EA0C10/func_802403EC_EA0CEC.s new file mode 100644 index 0000000000..be17d45685 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_802403EC_EA0CEC.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403EC_EA0CEC +/* EA0CEC 802403EC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* EA0CF0 802403F0 AFB10034 */ sw $s1, 0x34($sp) +/* EA0CF4 802403F4 0080882D */ daddu $s1, $a0, $zero +/* EA0CF8 802403F8 AFBF0038 */ sw $ra, 0x38($sp) +/* EA0CFC 802403FC AFB00030 */ sw $s0, 0x30($sp) +/* EA0D00 80240400 8E300148 */ lw $s0, 0x148($s1) +/* EA0D04 80240404 0C00F92F */ jal func_8003E4BC +/* EA0D08 80240408 86040008 */ lh $a0, 8($s0) +/* EA0D0C 8024040C 0040282D */ daddu $a1, $v0, $zero +/* EA0D10 80240410 94A2008E */ lhu $v0, 0x8e($a1) +/* EA0D14 80240414 2442FFFF */ addiu $v0, $v0, -1 +/* EA0D18 80240418 A4A2008E */ sh $v0, 0x8e($a1) +/* EA0D1C 8024041C 00021400 */ sll $v0, $v0, 0x10 +/* EA0D20 80240420 1C400023 */ bgtz $v0, .L802404B0 +/* EA0D24 80240424 24020004 */ addiu $v0, $zero, 4 +/* EA0D28 80240428 8E0300CC */ lw $v1, 0xcc($s0) +/* EA0D2C 8024042C AE02006C */ sw $v0, 0x6c($s0) +/* EA0D30 80240430 8C620000 */ lw $v0, ($v1) +/* EA0D34 80240434 ACA20028 */ sw $v0, 0x28($a1) +/* EA0D38 80240438 9602007A */ lhu $v0, 0x7a($s0) +/* EA0D3C 8024043C A4A2008E */ sh $v0, 0x8e($a1) +/* EA0D40 80240440 8E020078 */ lw $v0, 0x78($s0) +/* EA0D44 80240444 28420008 */ slti $v0, $v0, 8 +/* EA0D48 80240448 14400018 */ bnez $v0, .L802404AC +/* EA0D4C 8024044C 24020021 */ addiu $v0, $zero, 0x21 +/* EA0D50 80240450 24040003 */ addiu $a0, $zero, 3 +/* EA0D54 80240454 27A30028 */ addiu $v1, $sp, 0x28 +/* EA0D58 80240458 84A700A8 */ lh $a3, 0xa8($a1) +/* EA0D5C 8024045C 3C013F80 */ lui $at, 0x3f80 +/* EA0D60 80240460 44810000 */ mtc1 $at, $f0 +/* EA0D64 80240464 3C014000 */ lui $at, 0x4000 +/* EA0D68 80240468 44811000 */ mtc1 $at, $f2 +/* EA0D6C 8024046C 3C01C1A0 */ lui $at, 0xc1a0 +/* EA0D70 80240470 44812000 */ mtc1 $at, $f4 +/* EA0D74 80240474 44873000 */ mtc1 $a3, $f6 +/* EA0D78 80240478 00000000 */ nop +/* EA0D7C 8024047C 468031A0 */ cvt.s.w $f6, $f6 +/* EA0D80 80240480 E7A00010 */ swc1 $f0, 0x10($sp) +/* EA0D84 80240484 E7A20014 */ swc1 $f2, 0x14($sp) +/* EA0D88 80240488 E7A40018 */ swc1 $f4, 0x18($sp) +/* EA0D8C 8024048C 8E020078 */ lw $v0, 0x78($s0) +/* EA0D90 80240490 44073000 */ mfc1 $a3, $f6 +/* EA0D94 80240494 0000302D */ daddu $a2, $zero, $zero +/* EA0D98 80240498 AFA30020 */ sw $v1, 0x20($sp) +/* EA0D9C 8024049C 2442FFFF */ addiu $v0, $v0, -1 +/* EA0DA0 802404A0 0C01D444 */ jal func_80075110 +/* EA0DA4 802404A4 AFA2001C */ sw $v0, 0x1c($sp) +/* EA0DA8 802404A8 24020021 */ addiu $v0, $zero, 0x21 +.L802404AC: +/* EA0DAC 802404AC AE220070 */ sw $v0, 0x70($s1) +.L802404B0: +/* EA0DB0 802404B0 8FBF0038 */ lw $ra, 0x38($sp) +/* EA0DB4 802404B4 8FB10034 */ lw $s1, 0x34($sp) +/* EA0DB8 802404B8 8FB00030 */ lw $s0, 0x30($sp) +/* EA0DBC 802404BC 03E00008 */ jr $ra +/* EA0DC0 802404C0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_EA0C10/func_802404C4_EA0DC4.s b/asm/nonmatchings/code_EA0C10/func_802404C4_EA0DC4.s new file mode 100644 index 0000000000..868a44213d --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_802404C4_EA0DC4.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404C4_EA0DC4 +/* EA0DC4 802404C4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA0DC8 802404C8 AFB10014 */ sw $s1, 0x14($sp) +/* EA0DCC 802404CC 0080882D */ daddu $s1, $a0, $zero +/* EA0DD0 802404D0 AFBF0018 */ sw $ra, 0x18($sp) +/* EA0DD4 802404D4 AFB00010 */ sw $s0, 0x10($sp) +/* EA0DD8 802404D8 8E300148 */ lw $s0, 0x148($s1) +/* EA0DDC 802404DC 0C00F92F */ jal func_8003E4BC +/* EA0DE0 802404E0 86040008 */ lh $a0, 8($s0) +/* EA0DE4 802404E4 9443008E */ lhu $v1, 0x8e($v0) +/* EA0DE8 802404E8 2463FFFF */ addiu $v1, $v1, -1 +/* EA0DEC 802404EC A443008E */ sh $v1, 0x8e($v0) +/* EA0DF0 802404F0 00031C00 */ sll $v1, $v1, 0x10 +/* EA0DF4 802404F4 1C600003 */ bgtz $v1, .L80240504 +/* EA0DF8 802404F8 2402000C */ addiu $v0, $zero, 0xc +/* EA0DFC 802404FC AE00006C */ sw $zero, 0x6c($s0) +/* EA0E00 80240500 AE220070 */ sw $v0, 0x70($s1) +.L80240504: +/* EA0E04 80240504 8FBF0018 */ lw $ra, 0x18($sp) +/* EA0E08 80240508 8FB10014 */ lw $s1, 0x14($sp) +/* EA0E0C 8024050C 8FB00010 */ lw $s0, 0x10($sp) +/* EA0E10 80240510 03E00008 */ jr $ra +/* EA0E14 80240514 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_80240518_EA0E18.s b/asm/nonmatchings/code_EA0C10/func_80240518_EA0E18.s new file mode 100644 index 0000000000..451fc11fad --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80240518_EA0E18.s @@ -0,0 +1,119 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240518_EA0E18 +/* EA0E18 80240518 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EA0E1C 8024051C AFBF0024 */ sw $ra, 0x24($sp) +/* EA0E20 80240520 AFB40020 */ sw $s4, 0x20($sp) +/* EA0E24 80240524 AFB3001C */ sw $s3, 0x1c($sp) +/* EA0E28 80240528 AFB20018 */ sw $s2, 0x18($sp) +/* EA0E2C 8024052C AFB10014 */ sw $s1, 0x14($sp) +/* EA0E30 80240530 AFB00010 */ sw $s0, 0x10($sp) +/* EA0E34 80240534 F7B40028 */ sdc1 $f20, 0x28($sp) +/* EA0E38 80240538 8C900148 */ lw $s0, 0x148($a0) +/* EA0E3C 8024053C 86040008 */ lh $a0, 8($s0) +/* EA0E40 80240540 0C00F92F */ jal func_8003E4BC +/* EA0E44 80240544 24110001 */ addiu $s1, $zero, 1 +/* EA0E48 80240548 86040008 */ lh $a0, 8($s0) +/* EA0E4C 8024054C 0040802D */ daddu $s0, $v0, $zero +/* EA0E50 80240550 3C05800C */ lui $a1, %hi(D_800B8D80) +/* EA0E54 80240554 24A58D80 */ addiu $a1, $a1, %lo(D_800B8D80) +/* EA0E58 80240558 3C03800A */ lui $v1, %hi(D_800A158C) +/* EA0E5C 8024055C 8463158C */ lh $v1, %lo(D_800A158C)($v1) +/* EA0E60 80240560 00912021 */ addu $a0, $a0, $s1 +/* EA0E64 80240564 00031080 */ sll $v0, $v1, 2 +/* EA0E68 80240568 00431021 */ addu $v0, $v0, $v1 +/* EA0E6C 8024056C 00021080 */ sll $v0, $v0, 2 +/* EA0E70 80240570 00431023 */ subu $v0, $v0, $v1 +/* EA0E74 80240574 000218C0 */ sll $v1, $v0, 3 +/* EA0E78 80240578 00431021 */ addu $v0, $v0, $v1 +/* EA0E7C 8024057C 000210C0 */ sll $v0, $v0, 3 +/* EA0E80 80240580 0C010ABD */ jal func_80042AF4 +/* EA0E84 80240584 00459021 */ addu $s2, $v0, $a1 +/* EA0E88 80240588 3C148010 */ lui $s4, %hi(D_800FFC90) +/* EA0E8C 8024058C 2694FC90 */ addiu $s4, $s4, %lo(D_800FFC90) +/* EA0E90 80240590 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EA0E94 80240594 8E830000 */ lw $v1, ($s4) +/* EA0E98 80240598 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EA0E9C 8024059C 8C660028 */ lw $a2, 0x28($v1) +/* EA0EA0 802405A0 8C670030 */ lw $a3, 0x30($v1) +/* EA0EA4 802405A4 0C00AC71 */ jal func_8002B1C4 +/* EA0EA8 802405A8 0040982D */ daddu $s3, $v0, $zero +/* EA0EAC 802405AC C6620074 */ lwc1 $f2, 0x74($s3) +/* EA0EB0 802405B0 468010A0 */ cvt.s.w $f2, $f2 +/* EA0EB4 802405B4 4600103C */ c.lt.s $f2, $f0 +/* EA0EB8 802405B8 00000000 */ nop +/* EA0EBC 802405BC 45030001 */ bc1tl .L802405C4 +/* EA0EC0 802405C0 0000882D */ daddu $s1, $zero, $zero +.L802405C4: +/* EA0EC4 802405C4 C64C006C */ lwc1 $f12, 0x6c($s2) +/* EA0EC8 802405C8 C60E000C */ lwc1 $f14, 0xc($s0) +/* EA0ECC 802405CC 3C014387 */ lui $at, 0x4387 +/* EA0ED0 802405D0 4481A000 */ mtc1 $at, $f20 +/* EA0ED4 802405D4 0C00ABC6 */ jal func_8002AF18 +/* EA0ED8 802405D8 00000000 */ nop +/* EA0EDC 802405DC 0C00AB85 */ jal func_8002AE14 +/* EA0EE0 802405E0 46000306 */ mov.s $f12, $f0 +/* EA0EE4 802405E4 3C018024 */ lui $at, %hi(D_80246480) +/* EA0EE8 802405E8 D4226480 */ ldc1 $f2, %lo(D_80246480)($at) +/* EA0EEC 802405EC 46000021 */ cvt.d.s $f0, $f0 +/* EA0EF0 802405F0 4622003C */ c.lt.d $f0, $f2 +/* EA0EF4 802405F4 00000000 */ nop +/* EA0EF8 802405F8 45000003 */ bc1f .L80240608 +/* EA0EFC 802405FC 00000000 */ nop +/* EA0F00 80240600 3C0142B4 */ lui $at, 0x42b4 +/* EA0F04 80240604 4481A000 */ mtc1 $at, $f20 +.L80240608: +/* EA0F08 80240608 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EA0F0C 8024060C 8E820000 */ lw $v0, ($s4) +/* EA0F10 80240610 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EA0F14 80240614 8C460028 */ lw $a2, 0x28($v0) +/* EA0F18 80240618 0C00ABDC */ jal fio_validate_header_checksums +/* EA0F1C 8024061C 8C470030 */ lw $a3, 0x30($v0) +/* EA0F20 80240620 4600A306 */ mov.s $f12, $f20 +/* EA0F24 80240624 0C00ABC6 */ jal func_8002AF18 +/* EA0F28 80240628 46000386 */ mov.s $f14, $f0 +/* EA0F2C 8024062C C6620078 */ lwc1 $f2, 0x78($s3) +/* EA0F30 80240630 468010A0 */ cvt.s.w $f2, $f2 +/* EA0F34 80240634 46000005 */ abs.s $f0, $f0 +/* EA0F38 80240638 4600103C */ c.lt.s $f2, $f0 +/* EA0F3C 8024063C 00000000 */ nop +/* EA0F40 80240640 45030001 */ bc1tl .L80240648 +/* EA0F44 80240644 0000882D */ daddu $s1, $zero, $zero +.L80240648: +/* EA0F48 80240648 8E820000 */ lw $v0, ($s4) +/* EA0F4C 8024064C C600003C */ lwc1 $f0, 0x3c($s0) +/* EA0F50 80240650 C442002C */ lwc1 $f2, 0x2c($v0) +/* EA0F54 80240654 860200A8 */ lh $v0, 0xa8($s0) +/* EA0F58 80240658 46020001 */ sub.s $f0, $f0, $f2 +/* EA0F5C 8024065C 44821000 */ mtc1 $v0, $f2 +/* EA0F60 80240660 00000000 */ nop +/* EA0F64 80240664 468010A1 */ cvt.d.w $f2, $f2 +/* EA0F68 80240668 46221080 */ add.d $f2, $f2, $f2 +/* EA0F6C 8024066C 46000005 */ abs.s $f0, $f0 +/* EA0F70 80240670 46000021 */ cvt.d.s $f0, $f0 +/* EA0F74 80240674 4620103E */ c.le.d $f2, $f0 +/* EA0F78 80240678 00000000 */ nop +/* EA0F7C 8024067C 45030001 */ bc1tl .L80240684 +/* EA0F80 80240680 0000882D */ daddu $s1, $zero, $zero +.L80240684: +/* EA0F84 80240684 3C038011 */ lui $v1, %hi(D_80117163) +/* EA0F88 80240688 80637163 */ lb $v1, %lo(D_80117163)($v1) +/* EA0F8C 8024068C 24020009 */ addiu $v0, $zero, 9 +/* EA0F90 80240690 50620001 */ beql $v1, $v0, .L80240698 +/* EA0F94 80240694 0000882D */ daddu $s1, $zero, $zero +.L80240698: +/* EA0F98 80240698 24020007 */ addiu $v0, $zero, 7 +/* EA0F9C 8024069C 50620001 */ beql $v1, $v0, .L802406A4 +/* EA0FA0 802406A0 0000882D */ daddu $s1, $zero, $zero +.L802406A4: +/* EA0FA4 802406A4 0220102D */ daddu $v0, $s1, $zero +/* EA0FA8 802406A8 8FBF0024 */ lw $ra, 0x24($sp) +/* EA0FAC 802406AC 8FB40020 */ lw $s4, 0x20($sp) +/* EA0FB0 802406B0 8FB3001C */ lw $s3, 0x1c($sp) +/* EA0FB4 802406B4 8FB20018 */ lw $s2, 0x18($sp) +/* EA0FB8 802406B8 8FB10014 */ lw $s1, 0x14($sp) +/* EA0FBC 802406BC 8FB00010 */ lw $s0, 0x10($sp) +/* EA0FC0 802406C0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* EA0FC4 802406C4 03E00008 */ jr $ra +/* EA0FC8 802406C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EA0C10/func_802406CC_EA0FCC.s b/asm/nonmatchings/code_EA0C10/func_802406CC_EA0FCC.s new file mode 100644 index 0000000000..1852060d78 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_802406CC_EA0FCC.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406CC_EA0FCC +/* EA0FCC 802406CC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EA0FD0 802406D0 AFB40028 */ sw $s4, 0x28($sp) +/* EA0FD4 802406D4 0080A02D */ daddu $s4, $a0, $zero +/* EA0FD8 802406D8 AFBF002C */ sw $ra, 0x2c($sp) +/* EA0FDC 802406DC AFB30024 */ sw $s3, 0x24($sp) +/* EA0FE0 802406E0 AFB20020 */ sw $s2, 0x20($sp) +/* EA0FE4 802406E4 AFB1001C */ sw $s1, 0x1c($sp) +/* EA0FE8 802406E8 AFB00018 */ sw $s0, 0x18($sp) +/* EA0FEC 802406EC 8E910148 */ lw $s1, 0x148($s4) +/* EA0FF0 802406F0 86240008 */ lh $a0, 8($s1) +/* EA0FF4 802406F4 0C00F92F */ jal func_8003E4BC +/* EA0FF8 802406F8 00A0802D */ daddu $s0, $a1, $zero +/* EA0FFC 802406FC 0040902D */ daddu $s2, $v0, $zero +/* EA1000 80240700 C6400038 */ lwc1 $f0, 0x38($s2) +/* EA1004 80240704 E6200108 */ swc1 $f0, 0x108($s1) +/* EA1008 80240708 C640003C */ lwc1 $f0, 0x3c($s2) +/* EA100C 8024070C E620010C */ swc1 $f0, 0x10c($s1) +/* EA1010 80240710 3C0138D1 */ lui $at, 0x38d1 +/* EA1014 80240714 3421B717 */ ori $at, $at, 0xb717 +/* EA1018 80240718 44810000 */ mtc1 $at, $f0 +/* EA101C 8024071C C6420040 */ lwc1 $f2, 0x40($s2) +/* EA1020 80240720 E6200114 */ swc1 $f0, 0x114($s1) +/* EA1024 80240724 E6200118 */ swc1 $f0, 0x118($s1) +/* EA1028 80240728 16000005 */ bnez $s0, .L80240740 +/* EA102C 8024072C E6220110 */ swc1 $f2, 0x110($s1) +/* EA1030 80240730 8E2200B0 */ lw $v0, 0xb0($s1) +/* EA1034 80240734 30420004 */ andi $v0, $v0, 4 +/* EA1038 80240738 10400015 */ beqz $v0, .L80240790 +/* EA103C 8024073C 00000000 */ nop +.L80240740: +/* EA1040 80240740 AE800070 */ sw $zero, 0x70($s4) +/* EA1044 80240744 8E420000 */ lw $v0, ($s2) +/* EA1048 80240748 3C031F30 */ lui $v1, 0x1f30 +/* EA104C 8024074C A640008E */ sh $zero, 0x8e($s2) +/* EA1050 80240750 34420102 */ ori $v0, $v0, 0x102 +/* EA1054 80240754 AE420000 */ sw $v0, ($s2) +/* EA1058 80240758 8E220000 */ lw $v0, ($s1) +/* EA105C 8024075C 3C01C47A */ lui $at, 0xc47a +/* EA1060 80240760 44810000 */ mtc1 $at, $f0 +/* EA1064 80240764 00431025 */ or $v0, $v0, $v1 +/* EA1068 80240768 AE220000 */ sw $v0, ($s1) +/* EA106C 8024076C AE400038 */ sw $zero, 0x38($s2) +/* EA1070 80240770 E640003C */ swc1 $f0, 0x3c($s2) +/* EA1074 80240774 AE400040 */ sw $zero, 0x40($s2) +/* EA1078 80240778 8E2300B0 */ lw $v1, 0xb0($s1) +/* EA107C 8024077C 30620004 */ andi $v0, $v1, 4 +/* EA1080 80240780 10400003 */ beqz $v0, .L80240790 +/* EA1084 80240784 2402FFFB */ addiu $v0, $zero, -5 +/* EA1088 80240788 00621024 */ and $v0, $v1, $v0 +/* EA108C 8024078C AE2200B0 */ sw $v0, 0xb0($s1) +.L80240790: +/* EA1090 80240790 8E930070 */ lw $s3, 0x70($s4) +/* EA1094 80240794 12600005 */ beqz $s3, .L802407AC +/* EA1098 80240798 24020001 */ addiu $v0, $zero, 1 +/* EA109C 8024079C 12620048 */ beq $s3, $v0, .L802408C0 +/* EA10A0 802407A0 00000000 */ nop +/* EA10A4 802407A4 0809024D */ j .L80240934 +/* EA10A8 802407A8 00000000 */ nop +.L802407AC: +/* EA10AC 802407AC 86240008 */ lh $a0, 8($s1) +/* EA10B0 802407B0 0C010ABD */ jal func_80042AF4 +/* EA10B4 802407B4 2484FFFF */ addiu $a0, $a0, -1 +/* EA10B8 802407B8 0040802D */ daddu $s0, $v0, $zero +/* EA10BC 802407BC 0C00F92F */ jal func_8003E4BC +/* EA10C0 802407C0 86040008 */ lh $a0, 8($s0) +/* EA10C4 802407C4 24030001 */ addiu $v1, $zero, 1 +/* EA10C8 802407C8 0040982D */ daddu $s3, $v0, $zero +/* EA10CC 802407CC A2230007 */ sb $v1, 7($s1) +/* EA10D0 802407D0 8E03006C */ lw $v1, 0x6c($s0) +/* EA10D4 802407D4 24020003 */ addiu $v0, $zero, 3 +/* EA10D8 802407D8 14620056 */ bne $v1, $v0, .L80240934 +/* EA10DC 802407DC 00000000 */ nop +/* EA10E0 802407E0 8E2500A8 */ lw $a1, 0xa8($s1) +/* EA10E4 802407E4 10A00003 */ beqz $a1, .L802407F4 +/* EA10E8 802407E8 0260202D */ daddu $a0, $s3, $zero +/* EA10EC 802407EC 0C013600 */ jal func_8004D800 +/* EA10F0 802407F0 0000302D */ daddu $a2, $zero, $zero +.L802407F4: +/* EA10F4 802407F4 27A40010 */ addiu $a0, $sp, 0x10 +/* EA10F8 802407F8 C6280070 */ lwc1 $f8, 0x70($s1) +/* EA10FC 802407FC 46804220 */ cvt.s.w $f8, $f8 +/* EA1100 80240800 C6620034 */ lwc1 $f2, 0x34($s3) +/* EA1104 80240804 3C014387 */ lui $at, 0x4387 +/* EA1108 80240808 44810000 */ mtc1 $at, $f0 +/* EA110C 8024080C 44064000 */ mfc1 $a2, $f8 +/* EA1110 80240810 46020001 */ sub.s $f0, $f0, $f2 +/* EA1114 80240814 C6660038 */ lwc1 $f6, 0x38($s3) +/* EA1118 80240818 C6640040 */ lwc1 $f4, 0x40($s3) +/* EA111C 8024081C 44070000 */ mfc1 $a3, $f0 +/* EA1120 80240820 27A50014 */ addiu $a1, $sp, 0x14 +/* EA1124 80240824 E7A60010 */ swc1 $f6, 0x10($sp) +/* EA1128 80240828 0C00ACA3 */ jal func_8002B28C +/* EA112C 8024082C E7A40014 */ swc1 $f4, 0x14($sp) +/* EA1130 80240830 C7A00010 */ lwc1 $f0, 0x10($sp) +/* EA1134 80240834 4600020D */ trunc.w.s $f8, $f0 +/* EA1138 80240838 44024000 */ mfc1 $v0, $f8 +/* EA113C 8024083C E6400038 */ swc1 $f0, 0x38($s2) +/* EA1140 80240840 A6220010 */ sh $v0, 0x10($s1) +/* EA1144 80240844 C660003C */ lwc1 $f0, 0x3c($s3) +/* EA1148 80240848 C622006C */ lwc1 $f2, 0x6c($s1) +/* EA114C 8024084C 468010A0 */ cvt.s.w $f2, $f2 +/* EA1150 80240850 46020000 */ add.s $f0, $f0, $f2 +/* EA1154 80240854 3C038010 */ lui $v1, %hi(D_800FFC90) +/* EA1158 80240858 8C63FC90 */ lw $v1, %lo(D_800FFC90)($v1) +/* EA115C 8024085C E640003C */ swc1 $f0, 0x3c($s2) +/* EA1160 80240860 C7A20014 */ lwc1 $f2, 0x14($sp) +/* EA1164 80240864 4600020D */ trunc.w.s $f8, $f0 +/* EA1168 80240868 44024000 */ mfc1 $v0, $f8 +/* EA116C 8024086C 00000000 */ nop +/* EA1170 80240870 A6220012 */ sh $v0, 0x12($s1) +/* EA1174 80240874 4600120D */ trunc.w.s $f8, $f2 +/* EA1178 80240878 44024000 */ mfc1 $v0, $f8 +/* EA117C 8024087C E6420040 */ swc1 $f2, 0x40($s2) +/* EA1180 80240880 A6220014 */ sh $v0, 0x14($s1) +/* EA1184 80240884 8C660028 */ lw $a2, 0x28($v1) +/* EA1188 80240888 8C670030 */ lw $a3, 0x30($v1) +/* EA118C 8024088C C64C0038 */ lwc1 $f12, 0x38($s2) +/* EA1190 80240890 0C00ABDC */ jal fio_validate_header_checksums +/* EA1194 80240894 C64E0040 */ lwc1 $f14, 0x40($s2) +/* EA1198 80240898 3C03E0EF */ lui $v1, 0xe0ef +/* EA119C 8024089C E640000C */ swc1 $f0, 0xc($s2) +/* EA11A0 802408A0 8E220000 */ lw $v0, ($s1) +/* EA11A4 802408A4 3463FFFF */ ori $v1, $v1, 0xffff +/* EA11A8 802408A8 00431024 */ and $v0, $v0, $v1 +/* EA11AC 802408AC AE220000 */ sw $v0, ($s1) +/* EA11B0 802408B0 24020001 */ addiu $v0, $zero, 1 +/* EA11B4 802408B4 A640008E */ sh $zero, 0x8e($s2) +/* EA11B8 802408B8 0809024D */ j .L80240934 +/* EA11BC 802408BC AE820070 */ sw $v0, 0x70($s4) +.L802408C0: +/* EA11C0 802408C0 86240008 */ lh $a0, 8($s1) +/* EA11C4 802408C4 0C010ABD */ jal func_80042AF4 +/* EA11C8 802408C8 2484FFFF */ addiu $a0, $a0, -1 +/* EA11CC 802408CC 0040802D */ daddu $s0, $v0, $zero +/* EA11D0 802408D0 0C00F92F */ jal func_8003E4BC +/* EA11D4 802408D4 86040008 */ lh $a0, 8($s0) +/* EA11D8 802408D8 9642008E */ lhu $v0, 0x8e($s2) +/* EA11DC 802408DC 24420001 */ addiu $v0, $v0, 1 +/* EA11E0 802408E0 A642008E */ sh $v0, 0x8e($s2) +/* EA11E4 802408E4 00021400 */ sll $v0, $v0, 0x10 +/* EA11E8 802408E8 8E23007C */ lw $v1, 0x7c($s1) +/* EA11EC 802408EC 00021403 */ sra $v0, $v0, 0x10 +/* EA11F0 802408F0 0043102A */ slt $v0, $v0, $v1 +/* EA11F4 802408F4 50400001 */ beql $v0, $zero, .L802408FC +/* EA11F8 802408F8 A2200007 */ sb $zero, 7($s1) +.L802408FC: +/* EA11FC 802408FC 8E03006C */ lw $v1, 0x6c($s0) +/* EA1200 80240900 24020004 */ addiu $v0, $zero, 4 +/* EA1204 80240904 1462000B */ bne $v1, $v0, .L80240934 +/* EA1208 80240908 3C021F10 */ lui $v0, 0x1f10 +/* EA120C 8024090C 8E230000 */ lw $v1, ($s1) +/* EA1210 80240910 3C01C47A */ lui $at, 0xc47a +/* EA1214 80240914 44810000 */ mtc1 $at, $f0 +/* EA1218 80240918 00621825 */ or $v1, $v1, $v0 +/* EA121C 8024091C AE230000 */ sw $v1, ($s1) +/* EA1220 80240920 AE400038 */ sw $zero, 0x38($s2) +/* EA1224 80240924 E640003C */ swc1 $f0, 0x3c($s2) +/* EA1228 80240928 AE400040 */ sw $zero, 0x40($s2) +/* EA122C 8024092C A2330007 */ sb $s3, 7($s1) +/* EA1230 80240930 AE800070 */ sw $zero, 0x70($s4) +.L80240934: +/* EA1234 80240934 82220007 */ lb $v0, 7($s1) +/* EA1238 80240938 10400007 */ beqz $v0, .L80240958 +/* EA123C 8024093C 00000000 */ nop +/* EA1240 80240940 3C0140E0 */ lui $at, 0x40e0 +/* EA1244 80240944 44810000 */ mtc1 $at, $f0 +/* EA1248 80240948 3C013F80 */ lui $at, 0x3f80 +/* EA124C 8024094C 44811000 */ mtc1 $at, $f2 +/* EA1250 80240950 E6200114 */ swc1 $f0, 0x114($s1) +/* EA1254 80240954 E6220118 */ swc1 $f2, 0x118($s1) +.L80240958: +/* EA1258 80240958 8FBF002C */ lw $ra, 0x2c($sp) +/* EA125C 8024095C 8FB40028 */ lw $s4, 0x28($sp) +/* EA1260 80240960 8FB30024 */ lw $s3, 0x24($sp) +/* EA1264 80240964 8FB20020 */ lw $s2, 0x20($sp) +/* EA1268 80240968 8FB1001C */ lw $s1, 0x1c($sp) +/* EA126C 8024096C 8FB00018 */ lw $s0, 0x18($sp) +/* EA1270 80240970 0000102D */ daddu $v0, $zero, $zero +/* EA1274 80240974 03E00008 */ jr $ra +/* EA1278 80240978 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s b/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s new file mode 100644 index 0000000000..9dc9fbfc6e --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s @@ -0,0 +1,195 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024097C_EA127C +/* EA127C 8024097C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EA1280 80240980 AFB3003C */ sw $s3, 0x3c($sp) +/* EA1284 80240984 0080982D */ daddu $s3, $a0, $zero +/* EA1288 80240988 AFBF0048 */ sw $ra, 0x48($sp) +/* EA128C 8024098C AFB50044 */ sw $s5, 0x44($sp) +/* EA1290 80240990 AFB40040 */ sw $s4, 0x40($sp) +/* EA1294 80240994 AFB20038 */ sw $s2, 0x38($sp) +/* EA1298 80240998 AFB10034 */ sw $s1, 0x34($sp) +/* EA129C 8024099C AFB00030 */ sw $s0, 0x30($sp) +/* EA12A0 802409A0 8E710148 */ lw $s1, 0x148($s3) +/* EA12A4 802409A4 86240008 */ lh $a0, 8($s1) +/* EA12A8 802409A8 0C00F92F */ jal func_8003E4BC +/* EA12AC 802409AC 00A0802D */ daddu $s0, $a1, $zero +/* EA12B0 802409B0 8E63000C */ lw $v1, 0xc($s3) +/* EA12B4 802409B4 0260202D */ daddu $a0, $s3, $zero +/* EA12B8 802409B8 8C650000 */ lw $a1, ($v1) +/* EA12BC 802409BC 0C0B53A3 */ jal func_802D4E8C +/* EA12C0 802409C0 0040902D */ daddu $s2, $v0, $zero +/* EA12C4 802409C4 AFA00010 */ sw $zero, 0x10($sp) +/* EA12C8 802409C8 8E2300D0 */ lw $v1, 0xd0($s1) +/* EA12CC 802409CC 8C630030 */ lw $v1, 0x30($v1) +/* EA12D0 802409D0 AFA30014 */ sw $v1, 0x14($sp) +/* EA12D4 802409D4 8E2300D0 */ lw $v1, 0xd0($s1) +/* EA12D8 802409D8 8C63001C */ lw $v1, 0x1c($v1) +/* EA12DC 802409DC AFA30018 */ sw $v1, 0x18($sp) +/* EA12E0 802409E0 8E2300D0 */ lw $v1, 0xd0($s1) +/* EA12E4 802409E4 8C630024 */ lw $v1, 0x24($v1) +/* EA12E8 802409E8 AFA3001C */ sw $v1, 0x1c($sp) +/* EA12EC 802409EC 8E2300D0 */ lw $v1, 0xd0($s1) +/* EA12F0 802409F0 8C630028 */ lw $v1, 0x28($v1) +/* EA12F4 802409F4 AFA30020 */ sw $v1, 0x20($sp) +/* EA12F8 802409F8 8E2300D0 */ lw $v1, 0xd0($s1) +/* EA12FC 802409FC 3C014282 */ lui $at, 0x4282 +/* EA1300 80240A00 44810000 */ mtc1 $at, $f0 +/* EA1304 80240A04 8C63002C */ lw $v1, 0x2c($v1) +/* EA1308 80240A08 E7A00028 */ swc1 $f0, 0x28($sp) +/* EA130C 80240A0C A7A0002C */ sh $zero, 0x2c($sp) +/* EA1310 80240A10 AFA30024 */ sw $v1, 0x24($sp) +/* EA1314 80240A14 C6400038 */ lwc1 $f0, 0x38($s2) +/* EA1318 80240A18 E6200108 */ swc1 $f0, 0x108($s1) +/* EA131C 80240A1C C640003C */ lwc1 $f0, 0x3c($s2) +/* EA1320 80240A20 27B50010 */ addiu $s5, $sp, 0x10 +/* EA1324 80240A24 E620010C */ swc1 $f0, 0x10c($s1) +/* EA1328 80240A28 3C0138D1 */ lui $at, 0x38d1 +/* EA132C 80240A2C 3421B717 */ ori $at, $at, 0xb717 +/* EA1330 80240A30 44810000 */ mtc1 $at, $f0 +/* EA1334 80240A34 C6420040 */ lwc1 $f2, 0x40($s2) +/* EA1338 80240A38 0040A02D */ daddu $s4, $v0, $zero +/* EA133C 80240A3C E6200114 */ swc1 $f0, 0x114($s1) +/* EA1340 80240A40 E6200118 */ swc1 $f0, 0x118($s1) +/* EA1344 80240A44 16000005 */ bnez $s0, .L80240A5C +/* EA1348 80240A48 E6220110 */ swc1 $f2, 0x110($s1) +/* EA134C 80240A4C 8E2200B0 */ lw $v0, 0xb0($s1) +/* EA1350 80240A50 30420004 */ andi $v0, $v0, 4 +/* EA1354 80240A54 10400020 */ beqz $v0, .L80240AD8 +/* EA1358 80240A58 00000000 */ nop +.L80240A5C: +/* EA135C 80240A5C 2404F7FF */ addiu $a0, $zero, -0x801 +/* EA1360 80240A60 AE600070 */ sw $zero, 0x70($s3) +/* EA1364 80240A64 A640008E */ sh $zero, 0x8e($s2) +/* EA1368 80240A68 8E2200CC */ lw $v0, 0xcc($s1) +/* EA136C 80240A6C 8E430000 */ lw $v1, ($s2) +/* EA1370 80240A70 8C420000 */ lw $v0, ($v0) +/* EA1374 80240A74 00641824 */ and $v1, $v1, $a0 +/* EA1378 80240A78 AE430000 */ sw $v1, ($s2) +/* EA137C 80240A7C AE420028 */ sw $v0, 0x28($s2) +/* EA1380 80240A80 8E2200D0 */ lw $v0, 0xd0($s1) +/* EA1384 80240A84 8C420034 */ lw $v0, 0x34($v0) +/* EA1388 80240A88 54400005 */ bnel $v0, $zero, .L80240AA0 +/* EA138C 80240A8C 2402FDFF */ addiu $v0, $zero, -0x201 +/* EA1390 80240A90 34620200 */ ori $v0, $v1, 0x200 +/* EA1394 80240A94 2403FFF7 */ addiu $v1, $zero, -9 +/* EA1398 80240A98 080902AA */ j .L80240AA8 +/* EA139C 80240A9C 00431024 */ and $v0, $v0, $v1 +.L80240AA0: +/* EA13A0 80240AA0 00621024 */ and $v0, $v1, $v0 +/* EA13A4 80240AA4 34420008 */ ori $v0, $v0, 8 +.L80240AA8: +/* EA13A8 80240AA8 AE420000 */ sw $v0, ($s2) +/* EA13AC 80240AAC 8E2200B0 */ lw $v0, 0xb0($s1) +/* EA13B0 80240AB0 30420004 */ andi $v0, $v0, 4 +/* EA13B4 80240AB4 10400007 */ beqz $v0, .L80240AD4 +/* EA13B8 80240AB8 24020063 */ addiu $v0, $zero, 0x63 +/* EA13BC 80240ABC AE620070 */ sw $v0, 0x70($s3) +/* EA13C0 80240AC0 AE600074 */ sw $zero, 0x74($s3) +/* EA13C4 80240AC4 8E2200B0 */ lw $v0, 0xb0($s1) +/* EA13C8 80240AC8 2403FFFB */ addiu $v1, $zero, -5 +/* EA13CC 80240ACC 00431024 */ and $v0, $v0, $v1 +/* EA13D0 80240AD0 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240AD4: +/* EA13D4 80240AD4 AE20006C */ sw $zero, 0x6c($s1) +.L80240AD8: +/* EA13D8 80240AD8 8E620070 */ lw $v0, 0x70($s3) +/* EA13DC 80240ADC 2842001E */ slti $v0, $v0, 0x1e +/* EA13E0 80240AE0 10400009 */ beqz $v0, .L80240B08 +/* EA13E4 80240AE4 00000000 */ nop +/* EA13E8 80240AE8 8E22006C */ lw $v0, 0x6c($s1) +/* EA13EC 80240AEC 14400006 */ bnez $v0, .L80240B08 +/* EA13F0 80240AF0 00000000 */ nop +/* EA13F4 80240AF4 0C090146 */ jal func_80240518_EA0E18 +/* EA13F8 80240AF8 0260202D */ daddu $a0, $s3, $zero +/* EA13FC 80240AFC 10400002 */ beqz $v0, .L80240B08 +/* EA1400 80240B00 2402001E */ addiu $v0, $zero, 0x1e +/* EA1404 80240B04 AE620070 */ sw $v0, 0x70($s3) +.L80240B08: +/* EA1408 80240B08 8E630070 */ lw $v1, 0x70($s3) +/* EA140C 80240B0C 2C620064 */ sltiu $v0, $v1, 0x64 +/* EA1410 80240B10 10400048 */ beqz $v0, .L80240C34 +/* EA1414 80240B14 00031080 */ sll $v0, $v1, 2 +/* EA1418 80240B18 3C018024 */ lui $at, %hi(D_80246488) +/* EA141C 80240B1C 00220821 */ addu $at, $at, $v0 +/* EA1420 80240B20 8C226488 */ lw $v0, %lo(D_80246488)($at) +/* EA1424 80240B24 00400008 */ jr $v0 +/* EA1428 80240B28 00000000 */ nop +/* EA142C 80240B2C 0260202D */ daddu $a0, $s3, $zero +/* EA1430 80240B30 0280282D */ daddu $a1, $s4, $zero +/* EA1434 80240B34 0C013670 */ jal func_8004D9C0 +/* EA1438 80240B38 02A0302D */ daddu $a2, $s5, $zero +/* EA143C 80240B3C 0260202D */ daddu $a0, $s3, $zero +/* EA1440 80240B40 0280282D */ daddu $a1, $s4, $zero +/* EA1444 80240B44 0C0136B6 */ jal func_8004DAD8 +/* EA1448 80240B48 02A0302D */ daddu $a2, $s5, $zero +/* EA144C 80240B4C 0809030D */ j .L80240C34 +/* EA1450 80240B50 00000000 */ nop +/* EA1454 80240B54 0260202D */ daddu $a0, $s3, $zero +/* EA1458 80240B58 0280282D */ daddu $a1, $s4, $zero +/* EA145C 80240B5C 0C0137D9 */ jal func_8004DF64 +/* EA1460 80240B60 02A0302D */ daddu $a2, $s5, $zero +/* EA1464 80240B64 0260202D */ daddu $a0, $s3, $zero +/* EA1468 80240B68 0280282D */ daddu $a1, $s4, $zero +/* EA146C 80240B6C 0C013809 */ jal func_8004E024 +/* EA1470 80240B70 02A0302D */ daddu $a2, $s5, $zero +/* EA1474 80240B74 0809030D */ j .L80240C34 +/* EA1478 80240B78 00000000 */ nop +/* EA147C 80240B7C 0260202D */ daddu $a0, $s3, $zero +/* EA1480 80240B80 0280282D */ daddu $a1, $s4, $zero +/* EA1484 80240B84 0C013897 */ jal func_8004E25C +/* EA1488 80240B88 02A0302D */ daddu $a2, $s5, $zero +/* EA148C 80240B8C 0260202D */ daddu $a0, $s3, $zero +/* EA1490 80240B90 0280282D */ daddu $a1, $s4, $zero +/* EA1494 80240B94 0C0138BB */ jal func_8004E2EC +/* EA1498 80240B98 02A0302D */ daddu $a2, $s5, $zero +/* EA149C 80240B9C 0809030D */ j .L80240C34 +/* EA14A0 80240BA0 00000000 */ nop +/* EA14A4 80240BA4 0260202D */ daddu $a0, $s3, $zero +/* EA14A8 80240BA8 0280282D */ daddu $a1, $s4, $zero +/* EA14AC 80240BAC 0C0138E7 */ jal func_8004E39C +/* EA14B0 80240BB0 02A0302D */ daddu $a2, $s5, $zero +/* EA14B4 80240BB4 0260202D */ daddu $a0, $s3, $zero +/* EA14B8 80240BB8 0280282D */ daddu $a1, $s4, $zero +/* EA14BC 80240BBC 0C013951 */ jal func_8004E544 +/* EA14C0 80240BC0 02A0302D */ daddu $a2, $s5, $zero +/* EA14C4 80240BC4 0809030D */ j .L80240C34 +/* EA14C8 80240BC8 00000000 */ nop +/* EA14CC 80240BCC 0260202D */ daddu $a0, $s3, $zero +/* EA14D0 80240BD0 0280282D */ daddu $a1, $s4, $zero +/* EA14D4 80240BD4 0C013A02 */ jal func_8004E808 +/* EA14D8 80240BD8 02A0302D */ daddu $a2, $s5, $zero +/* EA14DC 80240BDC 0809030D */ j .L80240C34 +/* EA14E0 80240BE0 00000000 */ nop +/* EA14E4 80240BE4 0C0900C4 */ jal func_80240310_EA0C10 +/* EA14E8 80240BE8 0260202D */ daddu $a0, $s3, $zero +/* EA14EC 80240BEC 0C0900DF */ jal func_8024037C_EA0C7C +/* EA14F0 80240BF0 0260202D */ daddu $a0, $s3, $zero +/* EA14F4 80240BF4 8E630070 */ lw $v1, 0x70($s3) +/* EA14F8 80240BF8 24020020 */ addiu $v0, $zero, 0x20 +/* EA14FC 80240BFC 1462000D */ bne $v1, $v0, .L80240C34 +/* EA1500 80240C00 00000000 */ nop +/* EA1504 80240C04 0C0900FB */ jal func_802403EC_EA0CEC +/* EA1508 80240C08 0260202D */ daddu $a0, $s3, $zero +/* EA150C 80240C0C 8E630070 */ lw $v1, 0x70($s3) +/* EA1510 80240C10 24020021 */ addiu $v0, $zero, 0x21 +/* EA1514 80240C14 14620007 */ bne $v1, $v0, .L80240C34 +/* EA1518 80240C18 00000000 */ nop +/* EA151C 80240C1C 0C090131 */ jal func_802404C4_EA0DC4 +/* EA1520 80240C20 0260202D */ daddu $a0, $s3, $zero +/* EA1524 80240C24 0809030D */ j .L80240C34 +/* EA1528 80240C28 00000000 */ nop +/* EA152C 80240C2C 0C013AE3 */ jal func_8004EB8C +/* EA1530 80240C30 0260202D */ daddu $a0, $s3, $zero +.L80240C34: +/* EA1534 80240C34 8FBF0048 */ lw $ra, 0x48($sp) +/* EA1538 80240C38 8FB50044 */ lw $s5, 0x44($sp) +/* EA153C 80240C3C 8FB40040 */ lw $s4, 0x40($sp) +/* EA1540 80240C40 8FB3003C */ lw $s3, 0x3c($sp) +/* EA1544 80240C44 8FB20038 */ lw $s2, 0x38($sp) +/* EA1548 80240C48 8FB10034 */ lw $s1, 0x34($sp) +/* EA154C 80240C4C 8FB00030 */ lw $s0, 0x30($sp) +/* EA1550 80240C50 0000102D */ daddu $v0, $zero, $zero +/* EA1554 80240C54 03E00008 */ jr $ra +/* EA1558 80240C58 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EA0C10/func_80240C5C_EA155C.s b/asm/nonmatchings/code_EA0C10/func_80240C5C_EA155C.s new file mode 100644 index 0000000000..5def1cadb5 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80240C5C_EA155C.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C5C_EA155C +/* EA155C 80240C5C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA1560 80240C60 AFB10014 */ sw $s1, 0x14($sp) +/* EA1564 80240C64 0080882D */ daddu $s1, $a0, $zero +/* EA1568 80240C68 AFBF0018 */ sw $ra, 0x18($sp) +/* EA156C 80240C6C AFB00010 */ sw $s0, 0x10($sp) +/* EA1570 80240C70 8E300148 */ lw $s0, 0x148($s1) +/* EA1574 80240C74 0C00F92F */ jal func_8003E4BC +/* EA1578 80240C78 86040008 */ lh $a0, 8($s0) +/* EA157C 80240C7C 0040202D */ daddu $a0, $v0, $zero +/* EA1580 80240C80 8482008E */ lh $v0, 0x8e($a0) +/* EA1584 80240C84 9483008E */ lhu $v1, 0x8e($a0) +/* EA1588 80240C88 18400003 */ blez $v0, .L80240C98 +/* EA158C 80240C8C 2462FFFF */ addiu $v0, $v1, -1 +/* EA1590 80240C90 0809032D */ j .L80240CB4 +/* EA1594 80240C94 A482008E */ sh $v0, 0x8e($a0) +.L80240C98: +/* EA1598 80240C98 8E0200CC */ lw $v0, 0xcc($s0) +/* EA159C 80240C9C AE00006C */ sw $zero, 0x6c($s0) +/* EA15A0 80240CA0 8C420000 */ lw $v0, ($v0) +/* EA15A4 80240CA4 AC820028 */ sw $v0, 0x28($a0) +/* EA15A8 80240CA8 24020001 */ addiu $v0, $zero, 1 +/* EA15AC 80240CAC AE200074 */ sw $zero, 0x74($s1) +/* EA15B0 80240CB0 AE220070 */ sw $v0, 0x70($s1) +.L80240CB4: +/* EA15B4 80240CB4 8FBF0018 */ lw $ra, 0x18($sp) +/* EA15B8 80240CB8 8FB10014 */ lw $s1, 0x14($sp) +/* EA15BC 80240CBC 8FB00010 */ lw $s0, 0x10($sp) +/* EA15C0 80240CC0 03E00008 */ jr $ra +/* EA15C4 80240CC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_80240CC8_EA15C8.s b/asm/nonmatchings/code_EA0C10/func_80240CC8_EA15C8.s new file mode 100644 index 0000000000..a20b7cbbfe --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80240CC8_EA15C8.s @@ -0,0 +1,68 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CC8_EA15C8 +/* EA15C8 80240CC8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EA15CC 80240CCC AFB3003C */ sw $s3, 0x3c($sp) +/* EA15D0 80240CD0 0080982D */ daddu $s3, $a0, $zero +/* EA15D4 80240CD4 AFBF0040 */ sw $ra, 0x40($sp) +/* EA15D8 80240CD8 AFB20038 */ sw $s2, 0x38($sp) +/* EA15DC 80240CDC AFB10034 */ sw $s1, 0x34($sp) +/* EA15E0 80240CE0 AFB00030 */ sw $s0, 0x30($sp) +/* EA15E4 80240CE4 8E720148 */ lw $s2, 0x148($s3) +/* EA15E8 80240CE8 00A0882D */ daddu $s1, $a1, $zero +/* EA15EC 80240CEC 86440008 */ lh $a0, 8($s2) +/* EA15F0 80240CF0 0C00F92F */ jal func_8003E4BC +/* EA15F4 80240CF4 00C0802D */ daddu $s0, $a2, $zero +/* EA15F8 80240CF8 0200202D */ daddu $a0, $s0, $zero +/* EA15FC 80240CFC 0240282D */ daddu $a1, $s2, $zero +/* EA1600 80240D00 AFA00010 */ sw $zero, 0x10($sp) +/* EA1604 80240D04 8E26000C */ lw $a2, 0xc($s1) +/* EA1608 80240D08 8E270010 */ lw $a3, 0x10($s1) +/* EA160C 80240D0C 0C013469 */ jal func_8004D1A4 +/* EA1610 80240D10 0040882D */ daddu $s1, $v0, $zero +/* EA1614 80240D14 10400024 */ beqz $v0, .L80240DA8 +/* EA1618 80240D18 0220202D */ daddu $a0, $s1, $zero +/* EA161C 80240D1C 24050322 */ addiu $a1, $zero, 0x322 +/* EA1620 80240D20 0C013600 */ jal func_8004D800 +/* EA1624 80240D24 0000302D */ daddu $a2, $zero, $zero +/* EA1628 80240D28 0000202D */ daddu $a0, $zero, $zero +/* EA162C 80240D2C 0220282D */ daddu $a1, $s1, $zero +/* EA1630 80240D30 0000302D */ daddu $a2, $zero, $zero +/* EA1634 80240D34 2410000A */ addiu $s0, $zero, 0xa +/* EA1638 80240D38 862300A8 */ lh $v1, 0xa8($s1) +/* EA163C 80240D3C 3C013F80 */ lui $at, 0x3f80 +/* EA1640 80240D40 44810000 */ mtc1 $at, $f0 +/* EA1644 80240D44 3C014000 */ lui $at, 0x4000 +/* EA1648 80240D48 44811000 */ mtc1 $at, $f2 +/* EA164C 80240D4C 3C01C1A0 */ lui $at, 0xc1a0 +/* EA1650 80240D50 44812000 */ mtc1 $at, $f4 +/* EA1654 80240D54 44833000 */ mtc1 $v1, $f6 +/* EA1658 80240D58 00000000 */ nop +/* EA165C 80240D5C 468031A0 */ cvt.s.w $f6, $f6 +/* EA1660 80240D60 44073000 */ mfc1 $a3, $f6 +/* EA1664 80240D64 27A20028 */ addiu $v0, $sp, 0x28 +/* EA1668 80240D68 AFB0001C */ sw $s0, 0x1c($sp) +/* EA166C 80240D6C AFA20020 */ sw $v0, 0x20($sp) +/* EA1670 80240D70 E7A00010 */ swc1 $f0, 0x10($sp) +/* EA1674 80240D74 E7A20014 */ swc1 $f2, 0x14($sp) +/* EA1678 80240D78 0C01D444 */ jal func_80075110 +/* EA167C 80240D7C E7A40018 */ swc1 $f4, 0x18($sp) +/* EA1680 80240D80 0220202D */ daddu $a0, $s1, $zero +/* EA1684 80240D84 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EA1688 80240D88 0C013600 */ jal func_8004D800 +/* EA168C 80240D8C 3C060020 */ lui $a2, 0x20 +/* EA1690 80240D90 8E4200CC */ lw $v0, 0xcc($s2) +/* EA1694 80240D94 8C420020 */ lw $v0, 0x20($v0) +/* EA1698 80240D98 AE220028 */ sw $v0, 0x28($s1) +/* EA169C 80240D9C 9642008E */ lhu $v0, 0x8e($s2) +/* EA16A0 80240DA0 A622008E */ sh $v0, 0x8e($s1) +/* EA16A4 80240DA4 AE700070 */ sw $s0, 0x70($s3) +.L80240DA8: +/* EA16A8 80240DA8 8FBF0040 */ lw $ra, 0x40($sp) +/* EA16AC 80240DAC 8FB3003C */ lw $s3, 0x3c($sp) +/* EA16B0 80240DB0 8FB20038 */ lw $s2, 0x38($sp) +/* EA16B4 80240DB4 8FB10034 */ lw $s1, 0x34($sp) +/* EA16B8 80240DB8 8FB00030 */ lw $s0, 0x30($sp) +/* EA16BC 80240DBC 03E00008 */ jr $ra +/* EA16C0 80240DC0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EA0C10/func_80240DC4_EA16C4.s b/asm/nonmatchings/code_EA0C10/func_80240DC4_EA16C4.s new file mode 100644 index 0000000000..03e00d6430 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80240DC4_EA16C4.s @@ -0,0 +1,688 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DC4_EA16C4 +/* EA16C4 80240DC4 27BDFF80 */ addiu $sp, $sp, -0x80 +/* EA16C8 80240DC8 AFBF0064 */ sw $ra, 0x64($sp) +/* EA16CC 80240DCC AFBE0060 */ sw $fp, 0x60($sp) +/* EA16D0 80240DD0 AFB7005C */ sw $s7, 0x5c($sp) +/* EA16D4 80240DD4 AFB60058 */ sw $s6, 0x58($sp) +/* EA16D8 80240DD8 AFB50054 */ sw $s5, 0x54($sp) +/* EA16DC 80240DDC AFB40050 */ sw $s4, 0x50($sp) +/* EA16E0 80240DE0 AFB3004C */ sw $s3, 0x4c($sp) +/* EA16E4 80240DE4 AFB20048 */ sw $s2, 0x48($sp) +/* EA16E8 80240DE8 AFB10044 */ sw $s1, 0x44($sp) +/* EA16EC 80240DEC AFB00040 */ sw $s0, 0x40($sp) +/* EA16F0 80240DF0 F7B80078 */ sdc1 $f24, 0x78($sp) +/* EA16F4 80240DF4 F7B60070 */ sdc1 $f22, 0x70($sp) +/* EA16F8 80240DF8 F7B40068 */ sdc1 $f20, 0x68($sp) +/* EA16FC 80240DFC AFA40080 */ sw $a0, 0x80($sp) +/* EA1700 80240E00 8C960148 */ lw $s6, 0x148($a0) +/* EA1704 80240E04 00C0902D */ daddu $s2, $a2, $zero +/* EA1708 80240E08 86C40008 */ lh $a0, 8($s6) +/* EA170C 80240E0C 0C00F92F */ jal func_8003E4BC +/* EA1710 80240E10 0000B82D */ daddu $s7, $zero, $zero +/* EA1714 80240E14 0040882D */ daddu $s1, $v0, $zero +/* EA1718 80240E18 9622008E */ lhu $v0, 0x8e($s1) +/* EA171C 80240E1C 2442FFFF */ addiu $v0, $v0, -1 +/* EA1720 80240E20 A622008E */ sh $v0, 0x8e($s1) +/* EA1724 80240E24 00021400 */ sll $v0, $v0, 0x10 +/* EA1728 80240E28 8EC30090 */ lw $v1, 0x90($s6) +/* EA172C 80240E2C 00021403 */ sra $v0, $v0, 0x10 +/* EA1730 80240E30 0062182A */ slt $v1, $v1, $v0 +/* EA1734 80240E34 14600005 */ bnez $v1, .L80240E4C +/* EA1738 80240E38 02E0F02D */ daddu $fp, $s7, $zero +/* EA173C 80240E3C 8EC20000 */ lw $v0, ($s6) +/* EA1740 80240E40 3C031F10 */ lui $v1, 0x1f10 +/* EA1744 80240E44 00431025 */ or $v0, $v0, $v1 +/* EA1748 80240E48 AEC20000 */ sw $v0, ($s6) +.L80240E4C: +/* EA174C 80240E4C 8622008E */ lh $v0, 0x8e($s1) +/* EA1750 80240E50 1440025D */ bnez $v0, .L802417C8 +/* EA1754 80240E54 00000000 */ nop +/* EA1758 80240E58 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EA175C 80240E5C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EA1760 80240E60 0C00AB85 */ jal func_8002AE14 +/* EA1764 80240E64 C44C00A8 */ lwc1 $f12, 0xa8($v0) +/* EA1768 80240E68 3C014334 */ lui $at, 0x4334 +/* EA176C 80240E6C 44811000 */ mtc1 $at, $f2 +/* EA1770 80240E70 00000000 */ nop +/* EA1774 80240E74 4602003C */ c.lt.s $f0, $f2 +/* EA1778 80240E78 00000000 */ nop +/* EA177C 80240E7C 45000011 */ bc1f .L80240EC4 +/* EA1780 80240E80 00000000 */ nop +/* EA1784 80240E84 3C038008 */ lui $v1, %hi(D_8007C760) +/* EA1788 80240E88 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EA178C 80240E8C 3C0142B4 */ lui $at, 0x42b4 +/* EA1790 80240E90 44816000 */ mtc1 $at, $f12 +/* EA1794 80240E94 00031080 */ sll $v0, $v1, 2 +/* EA1798 80240E98 00431021 */ addu $v0, $v0, $v1 +/* EA179C 80240E9C 00021080 */ sll $v0, $v0, 2 +/* EA17A0 80240EA0 00431023 */ subu $v0, $v0, $v1 +/* EA17A4 80240EA4 000218C0 */ sll $v1, $v0, 3 +/* EA17A8 80240EA8 00431021 */ addu $v0, $v0, $v1 +/* EA17AC 80240EAC 000210C0 */ sll $v0, $v0, 3 +/* EA17B0 80240EB0 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EA17B4 80240EB4 00220821 */ addu $at, $at, $v0 +/* EA17B8 80240EB8 C4208DEC */ lwc1 $f0, %lo(D_800B8DEC)($at) +/* EA17BC 80240EBC 080903C0 */ j .L80240F00 +/* EA17C0 80240EC0 460C0301 */ sub.s $f12, $f0, $f12 +.L80240EC4: +/* EA17C4 80240EC4 3C038008 */ lui $v1, %hi(D_8007C760) +/* EA17C8 80240EC8 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EA17CC 80240ECC 3C0142B4 */ lui $at, 0x42b4 +/* EA17D0 80240ED0 44816000 */ mtc1 $at, $f12 +/* EA17D4 80240ED4 00031080 */ sll $v0, $v1, 2 +/* EA17D8 80240ED8 00431021 */ addu $v0, $v0, $v1 +/* EA17DC 80240EDC 00021080 */ sll $v0, $v0, 2 +/* EA17E0 80240EE0 00431023 */ subu $v0, $v0, $v1 +/* EA17E4 80240EE4 000218C0 */ sll $v1, $v0, 3 +/* EA17E8 80240EE8 00431021 */ addu $v0, $v0, $v1 +/* EA17EC 80240EEC 000210C0 */ sll $v0, $v0, 3 +/* EA17F0 80240EF0 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EA17F4 80240EF4 00220821 */ addu $at, $at, $v0 +/* EA17F8 80240EF8 C4208DEC */ lwc1 $f0, %lo(D_800B8DEC)($at) +/* EA17FC 80240EFC 460C0300 */ add.s $f12, $f0, $f12 +.L80240F00: +/* EA1800 80240F00 0C00AB85 */ jal func_8002AE14 +/* EA1804 80240F04 00000000 */ nop +/* EA1808 80240F08 46000586 */ mov.s $f22, $f0 +/* EA180C 80240F0C 3C014334 */ lui $at, 0x4334 +/* EA1810 80240F10 44816000 */ mtc1 $at, $f12 +/* EA1814 80240F14 0C00AB85 */ jal func_8002AE14 +/* EA1818 80240F18 460CB300 */ add.s $f12, $f22, $f12 +/* EA181C 80240F1C 8EC20088 */ lw $v0, 0x88($s6) +/* EA1820 80240F20 14400010 */ bnez $v0, .L80240F64 +/* EA1824 80240F24 46000606 */ mov.s $f24, $f0 +/* EA1828 80240F28 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EA182C 80240F2C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EA1830 80240F30 804300B4 */ lb $v1, 0xb4($v0) +/* EA1834 80240F34 3C014200 */ lui $at, 0x4200 +/* EA1838 80240F38 4481A000 */ mtc1 $at, $f20 +/* EA183C 80240F3C 10600016 */ beqz $v1, .L80240F98 +/* EA1840 80240F40 24020001 */ addiu $v0, $zero, 1 +/* EA1844 80240F44 3C0142C8 */ lui $at, 0x42c8 +/* EA1848 80240F48 4481A000 */ mtc1 $at, $f20 +/* EA184C 80240F4C 14620013 */ bne $v1, $v0, .L80240F9C +/* EA1850 80240F50 26300038 */ addiu $s0, $s1, 0x38 +/* EA1854 80240F54 3C0142B4 */ lui $at, 0x42b4 +/* EA1858 80240F58 4481A000 */ mtc1 $at, $f20 +/* EA185C 80240F5C 080903E8 */ j .L80240FA0 +/* EA1860 80240F60 0200202D */ daddu $a0, $s0, $zero +.L80240F64: +/* EA1864 80240F64 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EA1868 80240F68 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EA186C 80240F6C 804300B4 */ lb $v1, 0xb4($v0) +/* EA1870 80240F70 3C014218 */ lui $at, 0x4218 +/* EA1874 80240F74 4481A000 */ mtc1 $at, $f20 +/* EA1878 80240F78 10600007 */ beqz $v1, .L80240F98 +/* EA187C 80240F7C 24020001 */ addiu $v0, $zero, 1 +/* EA1880 80240F80 3C0142B4 */ lui $at, 0x42b4 +/* EA1884 80240F84 4481A000 */ mtc1 $at, $f20 +/* EA1888 80240F88 14620004 */ bne $v1, $v0, .L80240F9C +/* EA188C 80240F8C 26300038 */ addiu $s0, $s1, 0x38 +/* EA1890 80240F90 3C014296 */ lui $at, 0x4296 +/* EA1894 80240F94 4481A000 */ mtc1 $at, $f20 +.L80240F98: +/* EA1898 80240F98 26300038 */ addiu $s0, $s1, 0x38 +.L80240F9C: +/* EA189C 80240F9C 0200202D */ daddu $a0, $s0, $zero +.L80240FA0: +/* EA18A0 80240FA0 3C158010 */ lui $s5, %hi(D_800FFC90) +/* EA18A4 80240FA4 26B5FC90 */ addiu $s5, $s5, %lo(D_800FFC90) +/* EA18A8 80240FA8 4407C000 */ mfc1 $a3, $f24 +/* EA18AC 80240FAC 862200A6 */ lh $v0, 0xa6($s1) +/* EA18B0 80240FB0 8EA30000 */ lw $v1, ($s5) +/* EA18B4 80240FB4 44824000 */ mtc1 $v0, $f8 +/* EA18B8 80240FB8 00000000 */ nop +/* EA18BC 80240FBC 46804220 */ cvt.s.w $f8, $f8 +/* EA18C0 80240FC0 C4600028 */ lwc1 $f0, 0x28($v1) +/* EA18C4 80240FC4 44064000 */ mfc1 $a2, $f8 +/* EA18C8 80240FC8 26330040 */ addiu $s3, $s1, 0x40 +/* EA18CC 80240FCC E6200038 */ swc1 $f0, 0x38($s1) +/* EA18D0 80240FD0 C4600030 */ lwc1 $f0, 0x30($v1) +/* EA18D4 80240FD4 0260282D */ daddu $a1, $s3, $zero +/* EA18D8 80240FD8 0C00ACA3 */ jal func_8002B28C +/* EA18DC 80240FDC E6200040 */ swc1 $f0, 0x40($s1) +/* EA18E0 80240FE0 862200A6 */ lh $v0, 0xa6($s1) +/* EA18E4 80240FE4 44820000 */ mtc1 $v0, $f0 +/* EA18E8 80240FE8 00000000 */ nop +/* EA18EC 80240FEC 46800020 */ cvt.s.w $f0, $f0 +/* EA18F0 80240FF0 4600A000 */ add.s $f0, $f20, $f0 +/* EA18F4 80240FF4 4406B000 */ mfc1 $a2, $f22 +/* EA18F8 80240FF8 44050000 */ mfc1 $a1, $f0 +/* EA18FC 80240FFC 0C00F909 */ jal func_8003E424 +/* EA1900 80241000 0220202D */ daddu $a0, $s1, $zero +/* EA1904 80241004 8EC20088 */ lw $v0, 0x88($s6) +/* EA1908 80241008 1440005D */ bnez $v0, .L80241180 +/* EA190C 8024100C 00000000 */ nop +/* EA1910 80241010 C6200038 */ lwc1 $f0, 0x38($s1) +/* EA1914 80241014 3C018024 */ lui $at, %hi(D_80246618) +/* EA1918 80241018 D4246618 */ ldc1 $f4, %lo(D_80246618)($at) +/* EA191C 8024101C 46000021 */ cvt.d.s $f0, $f0 +/* EA1920 80241020 4620203C */ c.lt.d $f4, $f0 +/* EA1924 80241024 00000000 */ nop +/* EA1928 80241028 45000005 */ bc1f .L80241040 +/* EA192C 8024102C 00000000 */ nop +/* EA1930 80241030 3C0143BE */ lui $at, 0x43be +/* EA1934 80241034 44810000 */ mtc1 $at, $f0 +/* EA1938 80241038 00000000 */ nop +/* EA193C 8024103C E6200038 */ swc1 $f0, 0x38($s1) +.L80241040: +/* EA1940 80241040 C6200038 */ lwc1 $f0, 0x38($s1) +/* EA1944 80241044 3C018024 */ lui $at, %hi(D_80246620) +/* EA1948 80241048 D4226620 */ ldc1 $f2, %lo(D_80246620)($at) +/* EA194C 8024104C 46000021 */ cvt.d.s $f0, $f0 +/* EA1950 80241050 4622003C */ c.lt.d $f0, $f2 +/* EA1954 80241054 00000000 */ nop +/* EA1958 80241058 45000005 */ bc1f .L80241070 +/* EA195C 8024105C 00000000 */ nop +/* EA1960 80241060 3C01C3BE */ lui $at, 0xc3be +/* EA1964 80241064 44810000 */ mtc1 $at, $f0 +/* EA1968 80241068 00000000 */ nop +/* EA196C 8024106C E6200038 */ swc1 $f0, 0x38($s1) +.L80241070: +/* EA1970 80241070 C6200040 */ lwc1 $f0, 0x40($s1) +/* EA1974 80241074 46000021 */ cvt.d.s $f0, $f0 +/* EA1978 80241078 4620203C */ c.lt.d $f4, $f0 +/* EA197C 8024107C 00000000 */ nop +/* EA1980 80241080 45000005 */ bc1f .L80241098 +/* EA1984 80241084 00000000 */ nop +/* EA1988 80241088 3C0143BE */ lui $at, 0x43be +/* EA198C 8024108C 44810000 */ mtc1 $at, $f0 +/* EA1990 80241090 00000000 */ nop +/* EA1994 80241094 E6200040 */ swc1 $f0, 0x40($s1) +.L80241098: +/* EA1998 80241098 C6200040 */ lwc1 $f0, 0x40($s1) +/* EA199C 8024109C 46000021 */ cvt.d.s $f0, $f0 +/* EA19A0 802410A0 4622003C */ c.lt.d $f0, $f2 +/* EA19A4 802410A4 00000000 */ nop +/* EA19A8 802410A8 45000005 */ bc1f .L802410C0 +/* EA19AC 802410AC 00000000 */ nop +/* EA19B0 802410B0 3C01C3BE */ lui $at, 0xc3be +/* EA19B4 802410B4 44810000 */ mtc1 $at, $f0 +/* EA19B8 802410B8 00000000 */ nop +/* EA19BC 802410BC E6200040 */ swc1 $f0, 0x40($s1) +.L802410C0: +/* EA19C0 802410C0 C6220038 */ lwc1 $f2, 0x38($s1) +/* EA19C4 802410C4 46021082 */ mul.s $f2, $f2, $f2 +/* EA19C8 802410C8 00000000 */ nop +/* EA19CC 802410CC C6200040 */ lwc1 $f0, 0x40($s1) +/* EA19D0 802410D0 46000002 */ mul.s $f0, $f0, $f0 +/* EA19D4 802410D4 00000000 */ nop +/* EA19D8 802410D8 46001300 */ add.s $f12, $f2, $f0 +/* EA19DC 802410DC 46006004 */ sqrt.s $f0, $f12 +/* EA19E0 802410E0 46000032 */ c.eq.s $f0, $f0 +/* EA19E4 802410E4 00000000 */ nop +/* EA19E8 802410E8 45010003 */ bc1t .L802410F8 +/* EA19EC 802410EC 00000000 */ nop +/* EA19F0 802410F0 0C019C10 */ jal func_80067040 +/* EA19F4 802410F4 00000000 */ nop +.L802410F8: +/* EA19F8 802410F8 8E260038 */ lw $a2, 0x38($s1) +/* EA19FC 802410FC 8E270040 */ lw $a3, 0x40($s1) +/* EA1A00 80241100 4480A000 */ mtc1 $zero, $f20 +/* EA1A04 80241104 E7A00038 */ swc1 $f0, 0x38($sp) +/* EA1A08 80241108 4600A306 */ mov.s $f12, $f20 +/* EA1A0C 8024110C 0C00ABDC */ jal fio_validate_header_checksums +/* EA1A10 80241110 4600A386 */ mov.s $f14, $f20 +/* EA1A14 80241114 46000586 */ mov.s $f22, $f0 +/* EA1A18 80241118 C7A20038 */ lwc1 $f2, 0x38($sp) +/* EA1A1C 8024111C 3C018024 */ lui $at, %hi(D_80246628) +/* EA1A20 80241120 D4206628 */ ldc1 $f0, %lo(D_80246628)($at) +/* EA1A24 80241124 460010A1 */ cvt.d.s $f2, $f2 +/* EA1A28 80241128 4620103C */ c.lt.d $f2, $f0 +/* EA1A2C 8024112C 00000000 */ nop +/* EA1A30 80241130 45000004 */ bc1f .L80241144 +/* EA1A34 80241134 0200202D */ daddu $a0, $s0, $zero +/* EA1A38 80241138 3C064398 */ lui $a2, 0x4398 +/* EA1A3C 8024113C 08090459 */ j .L80241164 +/* EA1A40 80241140 34C68000 */ ori $a2, $a2, 0x8000 +.L80241144: +/* EA1A44 80241144 3C018024 */ lui $at, %hi(D_80246630) +/* EA1A48 80241148 D4206630 */ ldc1 $f0, %lo(D_80246630)($at) +/* EA1A4C 8024114C 4622003C */ c.lt.d $f0, $f2 +/* EA1A50 80241150 00000000 */ nop +/* EA1A54 80241154 450000FA */ bc1f .L80241540 +/* EA1A58 80241158 00000000 */ nop +/* EA1A5C 8024115C 3C0643BB */ lui $a2, 0x43bb +/* EA1A60 80241160 34C68000 */ ori $a2, $a2, 0x8000 +.L80241164: +/* EA1A64 80241164 4407B000 */ mfc1 $a3, $f22 +/* EA1A68 80241168 0260282D */ daddu $a1, $s3, $zero +/* EA1A6C 8024116C E6340038 */ swc1 $f20, 0x38($s1) +/* EA1A70 80241170 0C00ACA3 */ jal func_8002B28C +/* EA1A74 80241174 E6340040 */ swc1 $f20, 0x40($s1) +/* EA1A78 80241178 08090550 */ j .L80241540 +/* EA1A7C 8024117C 00000000 */ nop +.L80241180: +/* EA1A80 80241180 8E220000 */ lw $v0, ($s1) +/* EA1A84 80241184 30420040 */ andi $v0, $v0, 0x40 +/* EA1A88 80241188 144000B0 */ bnez $v0, .L8024144C +/* EA1A8C 8024118C 27A50020 */ addiu $a1, $sp, 0x20 +/* EA1A90 80241190 27B40020 */ addiu $s4, $sp, 0x20 +/* EA1A94 80241194 0280282D */ daddu $a1, $s4, $zero +/* EA1A98 80241198 27B30024 */ addiu $s3, $sp, 0x24 +/* EA1A9C 8024119C 8EA20000 */ lw $v0, ($s5) +/* EA1AA0 802411A0 3C014032 */ lui $at, 0x4032 +/* EA1AA4 802411A4 44811800 */ mtc1 $at, $f3 +/* EA1AA8 802411A8 44801000 */ mtc1 $zero, $f2 +/* EA1AAC 802411AC C440002C */ lwc1 $f0, 0x2c($v0) +/* EA1AB0 802411B0 C4460028 */ lwc1 $f6, 0x28($v0) +/* EA1AB4 802411B4 C4440030 */ lwc1 $f4, 0x30($v0) +/* EA1AB8 802411B8 46000021 */ cvt.d.s $f0, $f0 +/* EA1ABC 802411BC 46220000 */ add.d $f0, $f0, $f2 +/* EA1AC0 802411C0 E7A60020 */ swc1 $f6, 0x20($sp) +/* EA1AC4 802411C4 E7A40028 */ swc1 $f4, 0x28($sp) +/* EA1AC8 802411C8 46200020 */ cvt.s.d $f0, $f0 +/* EA1ACC 802411CC E7A00024 */ swc1 $f0, 0x24($sp) +/* EA1AD0 802411D0 E7B40010 */ swc1 $f20, 0x10($sp) +/* EA1AD4 802411D4 E7B60014 */ swc1 $f22, 0x14($sp) +/* EA1AD8 802411D8 862200A8 */ lh $v0, 0xa8($s1) +/* EA1ADC 802411DC 0260302D */ daddu $a2, $s3, $zero +/* EA1AE0 802411E0 44820000 */ mtc1 $v0, $f0 +/* EA1AE4 802411E4 00000000 */ nop +/* EA1AE8 802411E8 46800020 */ cvt.s.w $f0, $f0 +/* EA1AEC 802411EC E7A00018 */ swc1 $f0, 0x18($sp) +/* EA1AF0 802411F0 862200A6 */ lh $v0, 0xa6($s1) +/* EA1AF4 802411F4 27B00028 */ addiu $s0, $sp, 0x28 +/* EA1AF8 802411F8 44820000 */ mtc1 $v0, $f0 +/* EA1AFC 802411FC 00000000 */ nop +/* EA1B00 80241200 46800020 */ cvt.s.w $f0, $f0 +/* EA1B04 80241204 E7A0001C */ swc1 $f0, 0x1c($sp) +/* EA1B08 80241208 8E240080 */ lw $a0, 0x80($s1) +/* EA1B0C 8024120C 0C0394C1 */ jal func_800E5304 +/* EA1B10 80241210 0200382D */ daddu $a3, $s0, $zero +/* EA1B14 80241214 104000CA */ beqz $v0, .L80241540 +/* EA1B18 80241218 0280282D */ daddu $a1, $s4, $zero +/* EA1B1C 8024121C 8EA20000 */ lw $v0, ($s5) +/* EA1B20 80241220 3C018024 */ lui $at, %hi(D_80246638) +/* EA1B24 80241224 D4226638 */ ldc1 $f2, %lo(D_80246638)($at) +/* EA1B28 80241228 C440002C */ lwc1 $f0, 0x2c($v0) +/* EA1B2C 8024122C C4460028 */ lwc1 $f6, 0x28($v0) +/* EA1B30 80241230 C4440030 */ lwc1 $f4, 0x30($v0) +/* EA1B34 80241234 46000021 */ cvt.d.s $f0, $f0 +/* EA1B38 80241238 46220000 */ add.d $f0, $f0, $f2 +/* EA1B3C 8024123C E7A60020 */ swc1 $f6, 0x20($sp) +/* EA1B40 80241240 E7A40028 */ swc1 $f4, 0x28($sp) +/* EA1B44 80241244 46200020 */ cvt.s.d $f0, $f0 +/* EA1B48 80241248 E7A00024 */ swc1 $f0, 0x24($sp) +/* EA1B4C 8024124C E7B40010 */ swc1 $f20, 0x10($sp) +/* EA1B50 80241250 E7B60014 */ swc1 $f22, 0x14($sp) +/* EA1B54 80241254 862200A8 */ lh $v0, 0xa8($s1) +/* EA1B58 80241258 44820000 */ mtc1 $v0, $f0 +/* EA1B5C 8024125C 00000000 */ nop +/* EA1B60 80241260 46800020 */ cvt.s.w $f0, $f0 +/* EA1B64 80241264 E7A00018 */ swc1 $f0, 0x18($sp) +/* EA1B68 80241268 862200A6 */ lh $v0, 0xa6($s1) +/* EA1B6C 8024126C 0260302D */ daddu $a2, $s3, $zero +/* EA1B70 80241270 44820000 */ mtc1 $v0, $f0 +/* EA1B74 80241274 00000000 */ nop +/* EA1B78 80241278 46800020 */ cvt.s.w $f0, $f0 +/* EA1B7C 8024127C E7A0001C */ swc1 $f0, 0x1c($sp) +/* EA1B80 80241280 8E240080 */ lw $a0, 0x80($s1) +/* EA1B84 80241284 0C0394C1 */ jal func_800E5304 +/* EA1B88 80241288 0200382D */ daddu $a3, $s0, $zero +/* EA1B8C 8024128C 27A5002C */ addiu $a1, $sp, 0x2c +/* EA1B90 80241290 27A60030 */ addiu $a2, $sp, 0x30 +/* EA1B94 80241294 27A70034 */ addiu $a3, $sp, 0x34 +/* EA1B98 80241298 27A30038 */ addiu $v1, $sp, 0x38 +/* EA1B9C 8024129C C6220038 */ lwc1 $f2, 0x38($s1) +/* EA1BA0 802412A0 C620003C */ lwc1 $f0, 0x3c($s1) +/* EA1BA4 802412A4 3C014348 */ lui $at, 0x4348 +/* EA1BA8 802412A8 44813000 */ mtc1 $at, $f6 +/* EA1BAC 802412AC 46000021 */ cvt.d.s $f0, $f0 +/* EA1BB0 802412B0 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EA1BB4 802412B4 3C014059 */ lui $at, 0x4059 +/* EA1BB8 802412B8 44811800 */ mtc1 $at, $f3 +/* EA1BBC 802412BC 44801000 */ mtc1 $zero, $f2 +/* EA1BC0 802412C0 C6240040 */ lwc1 $f4, 0x40($s1) +/* EA1BC4 802412C4 46220000 */ add.d $f0, $f0, $f2 +/* EA1BC8 802412C8 E7A60038 */ swc1 $f6, 0x38($sp) +/* EA1BCC 802412CC E7A40034 */ swc1 $f4, 0x34($sp) +/* EA1BD0 802412D0 46200020 */ cvt.s.d $f0, $f0 +/* EA1BD4 802412D4 E7A00030 */ swc1 $f0, 0x30($sp) +/* EA1BD8 802412D8 AFA30010 */ sw $v1, 0x10($sp) +/* EA1BDC 802412DC 8E240080 */ lw $a0, 0x80($s1) +/* EA1BE0 802412E0 0C03908F */ jal func_800E423C +/* EA1BE4 802412E4 0040802D */ daddu $s0, $v0, $zero +/* EA1BE8 802412E8 1600001C */ bnez $s0, .L8024135C +/* EA1BEC 802412EC 00000000 */ nop +/* EA1BF0 802412F0 1040001A */ beqz $v0, .L8024135C +/* EA1BF4 802412F4 00000000 */ nop +/* EA1BF8 802412F8 C7A20038 */ lwc1 $f2, 0x38($sp) +/* EA1BFC 802412FC 3C014054 */ lui $at, 0x4054 +/* EA1C00 80241300 44810800 */ mtc1 $at, $f1 +/* EA1C04 80241304 44800000 */ mtc1 $zero, $f0 +/* EA1C08 80241308 460010A1 */ cvt.d.s $f2, $f2 +/* EA1C0C 8024130C 4622003C */ c.lt.d $f0, $f2 +/* EA1C10 80241310 00000000 */ nop +/* EA1C14 80241314 45000011 */ bc1f .L8024135C +/* EA1C18 80241318 00000000 */ nop +/* EA1C1C 8024131C 3C01405E */ lui $at, 0x405e +/* EA1C20 80241320 44810800 */ mtc1 $at, $f1 +/* EA1C24 80241324 44800000 */ mtc1 $zero, $f0 +/* EA1C28 80241328 00000000 */ nop +/* EA1C2C 8024132C 4620103C */ c.lt.d $f2, $f0 +/* EA1C30 80241330 00000000 */ nop +/* EA1C34 80241334 45000009 */ bc1f .L8024135C +/* EA1C38 80241338 00000000 */ nop +/* EA1C3C 8024133C C622003C */ lwc1 $f2, 0x3c($s1) +/* EA1C40 80241340 C7A00030 */ lwc1 $f0, 0x30($sp) +/* EA1C44 80241344 46001032 */ c.eq.s $f2, $f0 +/* EA1C48 80241348 00000000 */ nop +/* EA1C4C 8024134C 45010003 */ bc1t .L8024135C +/* EA1C50 80241350 00000000 */ nop +/* EA1C54 80241354 08090550 */ j .L80241540 +/* EA1C58 80241358 241E0001 */ addiu $fp, $zero, 1 +.L8024135C: +/* EA1C5C 8024135C 3C108010 */ lui $s0, %hi(D_800FFC90) +/* EA1C60 80241360 2610FC90 */ addiu $s0, $s0, %lo(D_800FFC90) +/* EA1C64 80241364 8E020000 */ lw $v0, ($s0) +/* EA1C68 80241368 3C014024 */ lui $at, 0x4024 +/* EA1C6C 8024136C 44811800 */ mtc1 $at, $f3 +/* EA1C70 80241370 44801000 */ mtc1 $zero, $f2 +/* EA1C74 80241374 C440002C */ lwc1 $f0, 0x2c($v0) +/* EA1C78 80241378 C4460028 */ lwc1 $f6, 0x28($v0) +/* EA1C7C 8024137C C4440030 */ lwc1 $f4, 0x30($v0) +/* EA1C80 80241380 46000021 */ cvt.d.s $f0, $f0 +/* EA1C84 80241384 46220000 */ add.d $f0, $f0, $f2 +/* EA1C88 80241388 E7A60020 */ swc1 $f6, 0x20($sp) +/* EA1C8C 8024138C E7A40028 */ swc1 $f4, 0x28($sp) +/* EA1C90 80241390 46200020 */ cvt.s.d $f0, $f0 +/* EA1C94 80241394 E7A00024 */ swc1 $f0, 0x24($sp) +/* EA1C98 80241398 E7B40010 */ swc1 $f20, 0x10($sp) +/* EA1C9C 8024139C E7B60014 */ swc1 $f22, 0x14($sp) +/* EA1CA0 802413A0 862200A8 */ lh $v0, 0xa8($s1) +/* EA1CA4 802413A4 27A50020 */ addiu $a1, $sp, 0x20 +/* EA1CA8 802413A8 44820000 */ mtc1 $v0, $f0 +/* EA1CAC 802413AC 00000000 */ nop +/* EA1CB0 802413B0 46800020 */ cvt.s.w $f0, $f0 +/* EA1CB4 802413B4 E7A00018 */ swc1 $f0, 0x18($sp) +/* EA1CB8 802413B8 862200A6 */ lh $v0, 0xa6($s1) +/* EA1CBC 802413BC 27A60024 */ addiu $a2, $sp, 0x24 +/* EA1CC0 802413C0 44820000 */ mtc1 $v0, $f0 +/* EA1CC4 802413C4 00000000 */ nop +/* EA1CC8 802413C8 46800020 */ cvt.s.w $f0, $f0 +/* EA1CCC 802413CC E7A0001C */ swc1 $f0, 0x1c($sp) +/* EA1CD0 802413D0 8E240080 */ lw $a0, 0x80($s1) +/* EA1CD4 802413D4 0C0394C1 */ jal func_800E5304 +/* EA1CD8 802413D8 27A70028 */ addiu $a3, $sp, 0x28 +/* EA1CDC 802413DC 8FA60020 */ lw $a2, 0x20($sp) +/* EA1CE0 802413E0 8E020000 */ lw $v0, ($s0) +/* EA1CE4 802413E4 8FA70028 */ lw $a3, 0x28($sp) +/* EA1CE8 802413E8 C44C0028 */ lwc1 $f12, 0x28($v0) +/* EA1CEC 802413EC C44E0030 */ lwc1 $f14, 0x30($v0) +/* EA1CF0 802413F0 0C00AC71 */ jal func_8002B1C4 +/* EA1CF4 802413F4 24170001 */ addiu $s7, $zero, 1 +/* EA1CF8 802413F8 46000506 */ mov.s $f20, $f0 +/* EA1CFC 802413FC 8E030000 */ lw $v1, ($s0) +/* EA1D00 80241400 862200A6 */ lh $v0, 0xa6($s1) +/* EA1D04 80241404 4407C000 */ mfc1 $a3, $f24 +/* EA1D08 80241408 44824000 */ mtc1 $v0, $f8 +/* EA1D0C 8024140C 00000000 */ nop +/* EA1D10 80241410 46804220 */ cvt.s.w $f8, $f8 +/* EA1D14 80241414 C4600028 */ lwc1 $f0, 0x28($v1) +/* EA1D18 80241418 44064000 */ mfc1 $a2, $f8 +/* EA1D1C 8024141C 26240038 */ addiu $a0, $s1, 0x38 +/* EA1D20 80241420 E6200038 */ swc1 $f0, 0x38($s1) +/* EA1D24 80241424 C4600030 */ lwc1 $f0, 0x30($v1) +/* EA1D28 80241428 26250040 */ addiu $a1, $s1, 0x40 +/* EA1D2C 8024142C 0C00ACA3 */ jal func_8002B28C +/* EA1D30 80241430 E6200040 */ swc1 $f0, 0x40($s1) +/* EA1D34 80241434 862200A6 */ lh $v0, 0xa6($s1) +/* EA1D38 80241438 44820000 */ mtc1 $v0, $f0 +/* EA1D3C 8024143C 00000000 */ nop +/* EA1D40 80241440 46800020 */ cvt.s.w $f0, $f0 +/* EA1D44 80241444 0809054C */ j .L80241530 +/* EA1D48 80241448 4600A500 */ add.s $f20, $f20, $f0 +.L8024144C: +/* EA1D4C 8024144C 8EA20000 */ lw $v0, ($s5) +/* EA1D50 80241450 3C014032 */ lui $at, 0x4032 +/* EA1D54 80241454 44811800 */ mtc1 $at, $f3 +/* EA1D58 80241458 44801000 */ mtc1 $zero, $f2 +/* EA1D5C 8024145C C440002C */ lwc1 $f0, 0x2c($v0) +/* EA1D60 80241460 C4460028 */ lwc1 $f6, 0x28($v0) +/* EA1D64 80241464 C4440030 */ lwc1 $f4, 0x30($v0) +/* EA1D68 80241468 46000021 */ cvt.d.s $f0, $f0 +/* EA1D6C 8024146C 46220000 */ add.d $f0, $f0, $f2 +/* EA1D70 80241470 E7A60020 */ swc1 $f6, 0x20($sp) +/* EA1D74 80241474 E7A40028 */ swc1 $f4, 0x28($sp) +/* EA1D78 80241478 46200020 */ cvt.s.d $f0, $f0 +/* EA1D7C 8024147C E7A00024 */ swc1 $f0, 0x24($sp) +/* EA1D80 80241480 E7B40010 */ swc1 $f20, 0x10($sp) +/* EA1D84 80241484 E7B60014 */ swc1 $f22, 0x14($sp) +/* EA1D88 80241488 862200A8 */ lh $v0, 0xa8($s1) +/* EA1D8C 8024148C 44820000 */ mtc1 $v0, $f0 +/* EA1D90 80241490 00000000 */ nop +/* EA1D94 80241494 46800020 */ cvt.s.w $f0, $f0 +/* EA1D98 80241498 E7A00018 */ swc1 $f0, 0x18($sp) +/* EA1D9C 8024149C 862200A6 */ lh $v0, 0xa6($s1) +/* EA1DA0 802414A0 27A60024 */ addiu $a2, $sp, 0x24 +/* EA1DA4 802414A4 44820000 */ mtc1 $v0, $f0 +/* EA1DA8 802414A8 00000000 */ nop +/* EA1DAC 802414AC 46800020 */ cvt.s.w $f0, $f0 +/* EA1DB0 802414B0 E7A0001C */ swc1 $f0, 0x1c($sp) +/* EA1DB4 802414B4 8E240080 */ lw $a0, 0x80($s1) +/* EA1DB8 802414B8 0C0394C1 */ jal func_800E5304 +/* EA1DBC 802414BC 27A70028 */ addiu $a3, $sp, 0x28 +/* EA1DC0 802414C0 1040001F */ beqz $v0, .L80241540 +/* EA1DC4 802414C4 00000000 */ nop +/* EA1DC8 802414C8 8FA60020 */ lw $a2, 0x20($sp) +/* EA1DCC 802414CC 8EA20000 */ lw $v0, ($s5) +/* EA1DD0 802414D0 8FA70028 */ lw $a3, 0x28($sp) +/* EA1DD4 802414D4 C44C0028 */ lwc1 $f12, 0x28($v0) +/* EA1DD8 802414D8 0C00AC71 */ jal func_8002B1C4 +/* EA1DDC 802414DC C44E0030 */ lwc1 $f14, 0x30($v0) +/* EA1DE0 802414E0 46000506 */ mov.s $f20, $f0 +/* EA1DE4 802414E4 8EA30000 */ lw $v1, ($s5) +/* EA1DE8 802414E8 862200A6 */ lh $v0, 0xa6($s1) +/* EA1DEC 802414EC 4407C000 */ mfc1 $a3, $f24 +/* EA1DF0 802414F0 44824000 */ mtc1 $v0, $f8 +/* EA1DF4 802414F4 00000000 */ nop +/* EA1DF8 802414F8 46804220 */ cvt.s.w $f8, $f8 +/* EA1DFC 802414FC C4600028 */ lwc1 $f0, 0x28($v1) +/* EA1E00 80241500 44064000 */ mfc1 $a2, $f8 +/* EA1E04 80241504 0200202D */ daddu $a0, $s0, $zero +/* EA1E08 80241508 E6200038 */ swc1 $f0, 0x38($s1) +/* EA1E0C 8024150C C4600030 */ lwc1 $f0, 0x30($v1) +/* EA1E10 80241510 0260282D */ daddu $a1, $s3, $zero +/* EA1E14 80241514 0C00ACA3 */ jal func_8002B28C +/* EA1E18 80241518 E6200040 */ swc1 $f0, 0x40($s1) +/* EA1E1C 8024151C 862200A6 */ lh $v0, 0xa6($s1) +/* EA1E20 80241520 44820000 */ mtc1 $v0, $f0 +/* EA1E24 80241524 00000000 */ nop +/* EA1E28 80241528 46800020 */ cvt.s.w $f0, $f0 +/* EA1E2C 8024152C 4600A500 */ add.s $f20, $f20, $f0 +.L80241530: +/* EA1E30 80241530 4406B000 */ mfc1 $a2, $f22 +/* EA1E34 80241534 4405A000 */ mfc1 $a1, $f20 +/* EA1E38 80241538 0C00F909 */ jal func_8003E424 +/* EA1E3C 8024153C 0220202D */ daddu $a0, $s1, $zero +.L80241540: +/* EA1E40 80241540 C6400008 */ lwc1 $f0, 8($s2) +/* EA1E44 80241544 46800020 */ cvt.s.w $f0, $f0 +/* EA1E48 80241548 44050000 */ mfc1 $a1, $f0 +/* EA1E4C 8024154C C640000C */ lwc1 $f0, 0xc($s2) +/* EA1E50 80241550 46800020 */ cvt.s.w $f0, $f0 +/* EA1E54 80241554 44060000 */ mfc1 $a2, $f0 +/* EA1E58 80241558 C6200040 */ lwc1 $f0, 0x40($s1) +/* EA1E5C 8024155C 26300038 */ addiu $s0, $s1, 0x38 +/* EA1E60 80241560 E7A00010 */ swc1 $f0, 0x10($sp) +/* EA1E64 80241564 C6400010 */ lwc1 $f0, 0x10($s2) +/* EA1E68 80241568 46800020 */ cvt.s.w $f0, $f0 +/* EA1E6C 8024156C E7A00014 */ swc1 $f0, 0x14($sp) +/* EA1E70 80241570 C6400014 */ lwc1 $f0, 0x14($s2) +/* EA1E74 80241574 46800020 */ cvt.s.w $f0, $f0 +/* EA1E78 80241578 E7A00018 */ swc1 $f0, 0x18($sp) +/* EA1E7C 8024157C 8E440004 */ lw $a0, 4($s2) +/* EA1E80 80241580 8E270038 */ lw $a3, 0x38($s1) +/* EA1E84 80241584 0C013431 */ jal func_8004D0C4 +/* EA1E88 80241588 26330040 */ addiu $s3, $s1, 0x40 +/* EA1E8C 8024158C 1040005A */ beqz $v0, .L802416F8 +/* EA1E90 80241590 00000000 */ nop +/* EA1E94 80241594 8E430004 */ lw $v1, 4($s2) +/* EA1E98 80241598 10600005 */ beqz $v1, .L802415B0 +/* EA1E9C 8024159C 24020001 */ addiu $v0, $zero, 1 +/* EA1EA0 802415A0 10620029 */ beq $v1, $v0, .L80241648 +/* EA1EA4 802415A4 00000000 */ nop +/* EA1EA8 802415A8 080905BE */ j .L802416F8 +/* EA1EAC 802415AC 00000000 */ nop +.L802415B0: +/* EA1EB0 802415B0 C6480008 */ lwc1 $f8, 8($s2) +/* EA1EB4 802415B4 46804220 */ cvt.s.w $f8, $f8 +/* EA1EB8 802415B8 44064000 */ mfc1 $a2, $f8 +/* EA1EBC 802415BC C648000C */ lwc1 $f8, 0xc($s2) +/* EA1EC0 802415C0 46804220 */ cvt.s.w $f8, $f8 +/* EA1EC4 802415C4 C62C0038 */ lwc1 $f12, 0x38($s1) +/* EA1EC8 802415C8 C62E0040 */ lwc1 $f14, 0x40($s1) +/* EA1ECC 802415CC 44074000 */ mfc1 $a3, $f8 +/* EA1ED0 802415D0 0C00AC71 */ jal func_8002B1C4 +/* EA1ED4 802415D4 00000000 */ nop +/* EA1ED8 802415D8 C6420010 */ lwc1 $f2, 0x10($s2) +/* EA1EDC 802415DC 468010A0 */ cvt.s.w $f2, $f2 +/* EA1EE0 802415E0 4600103C */ c.lt.s $f2, $f0 +/* EA1EE4 802415E4 00000000 */ nop +/* EA1EE8 802415E8 45000043 */ bc1f .L802416F8 +/* EA1EEC 802415EC E7A00038 */ swc1 $f0, 0x38($sp) +/* EA1EF0 802415F0 C64C0008 */ lwc1 $f12, 8($s2) +/* EA1EF4 802415F4 46806320 */ cvt.s.w $f12, $f12 +/* EA1EF8 802415F8 8E260038 */ lw $a2, 0x38($s1) +/* EA1EFC 802415FC 8E270040 */ lw $a3, 0x40($s1) +/* EA1F00 80241600 C64E000C */ lwc1 $f14, 0xc($s2) +/* EA1F04 80241604 0C00ABDC */ jal fio_validate_header_checksums +/* EA1F08 80241608 468073A0 */ cvt.s.w $f14, $f14 +/* EA1F0C 8024160C 0200202D */ daddu $a0, $s0, $zero +/* EA1F10 80241610 44070000 */ mfc1 $a3, $f0 +/* EA1F14 80241614 C6400008 */ lwc1 $f0, 8($s2) +/* EA1F18 80241618 46800020 */ cvt.s.w $f0, $f0 +/* EA1F1C 8024161C E6200038 */ swc1 $f0, 0x38($s1) +/* EA1F20 80241620 C640000C */ lwc1 $f0, 0xc($s2) +/* EA1F24 80241624 46800020 */ cvt.s.w $f0, $f0 +/* EA1F28 80241628 E6200040 */ swc1 $f0, 0x40($s1) +/* EA1F2C 8024162C C6480010 */ lwc1 $f8, 0x10($s2) +/* EA1F30 80241630 46804220 */ cvt.s.w $f8, $f8 +/* EA1F34 80241634 44064000 */ mfc1 $a2, $f8 +/* EA1F38 80241638 0C00ACA3 */ jal func_8002B28C +/* EA1F3C 8024163C 0260282D */ daddu $a1, $s3, $zero +/* EA1F40 80241640 080905BE */ j .L802416F8 +/* EA1F44 80241644 00000000 */ nop +.L80241648: +/* EA1F48 80241648 8E420008 */ lw $v0, 8($s2) +/* EA1F4C 8024164C 8E430010 */ lw $v1, 0x10($s2) +/* EA1F50 80241650 C6200038 */ lwc1 $f0, 0x38($s1) +/* EA1F54 80241654 00431021 */ addu $v0, $v0, $v1 +/* EA1F58 80241658 44821000 */ mtc1 $v0, $f2 +/* EA1F5C 8024165C 00000000 */ nop +/* EA1F60 80241660 468010A0 */ cvt.s.w $f2, $f2 +/* EA1F64 80241664 4600103C */ c.lt.s $f2, $f0 +/* EA1F68 80241668 00000000 */ nop +/* EA1F6C 8024166C 45030001 */ bc1tl .L80241674 +/* EA1F70 80241670 E6220038 */ swc1 $f2, 0x38($s1) +.L80241674: +/* EA1F74 80241674 8E420008 */ lw $v0, 8($s2) +/* EA1F78 80241678 8E430010 */ lw $v1, 0x10($s2) +/* EA1F7C 8024167C C6200038 */ lwc1 $f0, 0x38($s1) +/* EA1F80 80241680 00431023 */ subu $v0, $v0, $v1 +/* EA1F84 80241684 44821000 */ mtc1 $v0, $f2 +/* EA1F88 80241688 00000000 */ nop +/* EA1F8C 8024168C 468010A0 */ cvt.s.w $f2, $f2 +/* EA1F90 80241690 4602003C */ c.lt.s $f0, $f2 +/* EA1F94 80241694 00000000 */ nop +/* EA1F98 80241698 45030001 */ bc1tl .L802416A0 +/* EA1F9C 8024169C E6220038 */ swc1 $f2, 0x38($s1) +.L802416A0: +/* EA1FA0 802416A0 8E42000C */ lw $v0, 0xc($s2) +/* EA1FA4 802416A4 8E430014 */ lw $v1, 0x14($s2) +/* EA1FA8 802416A8 C6200040 */ lwc1 $f0, 0x40($s1) +/* EA1FAC 802416AC 00431021 */ addu $v0, $v0, $v1 +/* EA1FB0 802416B0 44821000 */ mtc1 $v0, $f2 +/* EA1FB4 802416B4 00000000 */ nop +/* EA1FB8 802416B8 468010A0 */ cvt.s.w $f2, $f2 +/* EA1FBC 802416BC 4600103C */ c.lt.s $f2, $f0 +/* EA1FC0 802416C0 00000000 */ nop +/* EA1FC4 802416C4 45030001 */ bc1tl .L802416CC +/* EA1FC8 802416C8 E6220040 */ swc1 $f2, 0x40($s1) +.L802416CC: +/* EA1FCC 802416CC 8E42000C */ lw $v0, 0xc($s2) +/* EA1FD0 802416D0 8E430014 */ lw $v1, 0x14($s2) +/* EA1FD4 802416D4 C6200040 */ lwc1 $f0, 0x40($s1) +/* EA1FD8 802416D8 00431023 */ subu $v0, $v0, $v1 +/* EA1FDC 802416DC 44821000 */ mtc1 $v0, $f2 +/* EA1FE0 802416E0 00000000 */ nop +/* EA1FE4 802416E4 468010A0 */ cvt.s.w $f2, $f2 +/* EA1FE8 802416E8 4602003C */ c.lt.s $f0, $f2 +/* EA1FEC 802416EC 00000000 */ nop +/* EA1FF0 802416F0 45030001 */ bc1tl .L802416F8 +/* EA1FF4 802416F4 E6220040 */ swc1 $f2, 0x40($s1) +.L802416F8: +/* EA1FF8 802416F8 16E0001F */ bnez $s7, .L80241778 +/* EA1FFC 802416FC 00000000 */ nop +/* EA2000 80241700 8E220000 */ lw $v0, ($s1) +/* EA2004 80241704 30420008 */ andi $v0, $v0, 8 +/* EA2008 80241708 10400003 */ beqz $v0, .L80241718 +/* EA200C 8024170C 27A50020 */ addiu $a1, $sp, 0x20 +/* EA2010 80241710 13C00019 */ beqz $fp, .L80241778 +/* EA2014 80241714 00000000 */ nop +.L80241718: +/* EA2018 80241718 27A60024 */ addiu $a2, $sp, 0x24 +/* EA201C 8024171C 27A20038 */ addiu $v0, $sp, 0x38 +/* EA2020 80241720 C6220038 */ lwc1 $f2, 0x38($s1) +/* EA2024 80241724 C620003C */ lwc1 $f0, 0x3c($s1) +/* EA2028 80241728 3C0143C8 */ lui $at, 0x43c8 +/* EA202C 8024172C 44813000 */ mtc1 $at, $f6 +/* EA2030 80241730 46000021 */ cvt.d.s $f0, $f0 +/* EA2034 80241734 E7A20020 */ swc1 $f2, 0x20($sp) +/* EA2038 80241738 3C018024 */ lui $at, %hi(D_80246640) +/* EA203C 8024173C D4226640 */ ldc1 $f2, %lo(D_80246640)($at) +/* EA2040 80241740 C6240040 */ lwc1 $f4, 0x40($s1) +/* EA2044 80241744 46220000 */ add.d $f0, $f0, $f2 +/* EA2048 80241748 E7A60038 */ swc1 $f6, 0x38($sp) +/* EA204C 8024174C E7A40028 */ swc1 $f4, 0x28($sp) +/* EA2050 80241750 46200020 */ cvt.s.d $f0, $f0 +/* EA2054 80241754 E7A00024 */ swc1 $f0, 0x24($sp) +/* EA2058 80241758 AFA20010 */ sw $v0, 0x10($sp) +/* EA205C 8024175C 8E240080 */ lw $a0, 0x80($s1) +/* EA2060 80241760 0C03908F */ jal func_800E423C +/* EA2064 80241764 27A70028 */ addiu $a3, $sp, 0x28 +/* EA2068 80241768 10400003 */ beqz $v0, .L80241778 +/* EA206C 8024176C 00000000 */ nop +/* EA2070 80241770 C7A00024 */ lwc1 $f0, 0x24($sp) +/* EA2074 80241774 E620003C */ swc1 $f0, 0x3c($s1) +.L80241778: +/* EA2078 80241778 C62C0038 */ lwc1 $f12, 0x38($s1) +/* EA207C 8024177C 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EA2080 80241780 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EA2084 80241784 C62E0040 */ lwc1 $f14, 0x40($s1) +/* EA2088 80241788 8C460028 */ lw $a2, 0x28($v0) +/* EA208C 8024178C 0C00ABDC */ jal fio_validate_header_checksums +/* EA2090 80241790 8C470030 */ lw $a3, 0x30($v0) +/* EA2094 80241794 0220202D */ daddu $a0, $s1, $zero +/* EA2098 80241798 24050321 */ addiu $a1, $zero, 0x321 +/* EA209C 8024179C 0000302D */ daddu $a2, $zero, $zero +/* EA20A0 802417A0 0C013600 */ jal func_8004D800 +/* EA20A4 802417A4 E620000C */ swc1 $f0, 0xc($s1) +/* EA20A8 802417A8 8EC200CC */ lw $v0, 0xcc($s6) +/* EA20AC 802417AC 8C420024 */ lw $v0, 0x24($v0) +/* EA20B0 802417B0 AE220028 */ sw $v0, 0x28($s1) +/* EA20B4 802417B4 96C20096 */ lhu $v0, 0x96($s6) +/* EA20B8 802417B8 A622008E */ sh $v0, 0x8e($s1) +/* EA20BC 802417BC 8FA80080 */ lw $t0, 0x80($sp) +/* EA20C0 802417C0 2402000B */ addiu $v0, $zero, 0xb +/* EA20C4 802417C4 AD020070 */ sw $v0, 0x70($t0) +.L802417C8: +/* EA20C8 802417C8 8FBF0064 */ lw $ra, 0x64($sp) +/* EA20CC 802417CC 8FBE0060 */ lw $fp, 0x60($sp) +/* EA20D0 802417D0 8FB7005C */ lw $s7, 0x5c($sp) +/* EA20D4 802417D4 8FB60058 */ lw $s6, 0x58($sp) +/* EA20D8 802417D8 8FB50054 */ lw $s5, 0x54($sp) +/* EA20DC 802417DC 8FB40050 */ lw $s4, 0x50($sp) +/* EA20E0 802417E0 8FB3004C */ lw $s3, 0x4c($sp) +/* EA20E4 802417E4 8FB20048 */ lw $s2, 0x48($sp) +/* EA20E8 802417E8 8FB10044 */ lw $s1, 0x44($sp) +/* EA20EC 802417EC 8FB00040 */ lw $s0, 0x40($sp) +/* EA20F0 802417F0 D7B80078 */ ldc1 $f24, 0x78($sp) +/* EA20F4 802417F4 D7B60070 */ ldc1 $f22, 0x70($sp) +/* EA20F8 802417F8 D7B40068 */ ldc1 $f20, 0x68($sp) +/* EA20FC 802417FC 03E00008 */ jr $ra +/* EA2100 80241800 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/code_EA0C10/func_80241804_EA2104.s b/asm/nonmatchings/code_EA0C10/func_80241804_EA2104.s new file mode 100644 index 0000000000..6a51f13591 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80241804_EA2104.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241804_EA2104 +/* EA2104 80241804 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA2108 80241808 AFB10014 */ sw $s1, 0x14($sp) +/* EA210C 8024180C 0080882D */ daddu $s1, $a0, $zero +/* EA2110 80241810 AFBF0018 */ sw $ra, 0x18($sp) +/* EA2114 80241814 AFB00010 */ sw $s0, 0x10($sp) +/* EA2118 80241818 8E300148 */ lw $s0, 0x148($s1) +/* EA211C 8024181C 0C00F92F */ jal func_8003E4BC +/* EA2120 80241820 86040008 */ lh $a0, 8($s0) +/* EA2124 80241824 0040202D */ daddu $a0, $v0, $zero +/* EA2128 80241828 9482008E */ lhu $v0, 0x8e($a0) +/* EA212C 8024182C 2442FFFF */ addiu $v0, $v0, -1 +/* EA2130 80241830 A482008E */ sh $v0, 0x8e($a0) +/* EA2134 80241834 00021400 */ sll $v0, $v0, 0x10 +/* EA2138 80241838 8E030098 */ lw $v1, 0x98($s0) +/* EA213C 8024183C 00021403 */ sra $v0, $v0, 0x10 +/* EA2140 80241840 0062182A */ slt $v1, $v1, $v0 +/* EA2144 80241844 14600005 */ bnez $v1, .L8024185C +/* EA2148 80241848 3C03E0EF */ lui $v1, 0xe0ef +/* EA214C 8024184C 8E020000 */ lw $v0, ($s0) +/* EA2150 80241850 3463FFFF */ ori $v1, $v1, 0xffff +/* EA2154 80241854 00431024 */ and $v0, $v0, $v1 +/* EA2158 80241858 AE020000 */ sw $v0, ($s0) +.L8024185C: +/* EA215C 8024185C 8482008E */ lh $v0, 0x8e($a0) +/* EA2160 80241860 14400007 */ bnez $v0, .L80241880 +/* EA2164 80241864 00000000 */ nop +/* EA2168 80241868 8E0200CC */ lw $v0, 0xcc($s0) +/* EA216C 8024186C 8C420028 */ lw $v0, 0x28($v0) +/* EA2170 80241870 A480008E */ sh $zero, 0x8e($a0) +/* EA2174 80241874 AC820028 */ sw $v0, 0x28($a0) +/* EA2178 80241878 2402000C */ addiu $v0, $zero, 0xc +/* EA217C 8024187C AE220070 */ sw $v0, 0x70($s1) +.L80241880: +/* EA2180 80241880 8FBF0018 */ lw $ra, 0x18($sp) +/* EA2184 80241884 8FB10014 */ lw $s1, 0x14($sp) +/* EA2188 80241888 8FB00010 */ lw $s0, 0x10($sp) +/* EA218C 8024188C 03E00008 */ jr $ra +/* EA2190 80241890 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_80241894_EA2194.s b/asm/nonmatchings/code_EA0C10/func_80241894_EA2194.s new file mode 100644 index 0000000000..529670ecbf --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80241894_EA2194.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241894_EA2194 +/* EA2194 80241894 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* EA2198 80241898 AFB10034 */ sw $s1, 0x34($sp) +/* EA219C 8024189C 0080882D */ daddu $s1, $a0, $zero +/* EA21A0 802418A0 AFBF0038 */ sw $ra, 0x38($sp) +/* EA21A4 802418A4 AFB00030 */ sw $s0, 0x30($sp) +/* EA21A8 802418A8 8E300148 */ lw $s0, 0x148($s1) +/* EA21AC 802418AC 0C00F92F */ jal func_8003E4BC +/* EA21B0 802418B0 86040008 */ lh $a0, 8($s0) +/* EA21B4 802418B4 0040282D */ daddu $a1, $v0, $zero +/* EA21B8 802418B8 94A2008E */ lhu $v0, 0x8e($a1) +/* EA21BC 802418BC 24420001 */ addiu $v0, $v0, 1 +/* EA21C0 802418C0 A4A2008E */ sh $v0, 0x8e($a1) +/* EA21C4 802418C4 00021400 */ sll $v0, $v0, 0x10 +/* EA21C8 802418C8 8E0300A0 */ lw $v1, 0xa0($s0) +/* EA21CC 802418CC 00021403 */ sra $v0, $v0, 0x10 +/* EA21D0 802418D0 14430004 */ bne $v0, $v1, .L802418E4 +/* EA21D4 802418D4 00000000 */ nop +/* EA21D8 802418D8 8E0200CC */ lw $v0, 0xcc($s0) +/* EA21DC 802418DC 8C42002C */ lw $v0, 0x2c($v0) +/* EA21E0 802418E0 ACA20028 */ sw $v0, 0x28($a1) +.L802418E4: +/* EA21E4 802418E4 84A3008E */ lh $v1, 0x8e($a1) +/* EA21E8 802418E8 8E0200A4 */ lw $v0, 0xa4($s0) +/* EA21EC 802418EC 14620002 */ bne $v1, $v0, .L802418F8 +/* EA21F0 802418F0 24020003 */ addiu $v0, $zero, 3 +/* EA21F4 802418F4 AE02006C */ sw $v0, 0x6c($s0) +.L802418F8: +/* EA21F8 802418F8 84A2008E */ lh $v0, 0x8e($a1) +/* EA21FC 802418FC 8E03009C */ lw $v1, 0x9c($s0) +/* EA2200 80241900 0043102A */ slt $v0, $v0, $v1 +/* EA2204 80241904 1440001E */ bnez $v0, .L80241980 +/* EA2208 80241908 24020004 */ addiu $v0, $zero, 4 +/* EA220C 8024190C AE02006C */ sw $v0, 0x6c($s0) +/* EA2210 80241910 24020008 */ addiu $v0, $zero, 8 +/* EA2214 80241914 24040003 */ addiu $a0, $zero, 3 +/* EA2218 80241918 A4A2008E */ sh $v0, 0x8e($a1) +/* EA221C 8024191C 8E0200CC */ lw $v0, 0xcc($s0) +/* EA2220 80241920 84A300A8 */ lh $v1, 0xa8($a1) +/* EA2224 80241924 3C013F80 */ lui $at, 0x3f80 +/* EA2228 80241928 44810000 */ mtc1 $at, $f0 +/* EA222C 8024192C 3C014000 */ lui $at, 0x4000 +/* EA2230 80241930 44811000 */ mtc1 $at, $f2 +/* EA2234 80241934 3C01C1A0 */ lui $at, 0xc1a0 +/* EA2238 80241938 44812000 */ mtc1 $at, $f4 +/* EA223C 8024193C 44833000 */ mtc1 $v1, $f6 +/* EA2240 80241940 00000000 */ nop +/* EA2244 80241944 468031A0 */ cvt.s.w $f6, $f6 +/* EA2248 80241948 8C420000 */ lw $v0, ($v0) +/* EA224C 8024194C 44073000 */ mfc1 $a3, $f6 +/* EA2250 80241950 0000302D */ daddu $a2, $zero, $zero +/* EA2254 80241954 ACA20028 */ sw $v0, 0x28($a1) +/* EA2258 80241958 2402000A */ addiu $v0, $zero, 0xa +/* EA225C 8024195C AFA2001C */ sw $v0, 0x1c($sp) +/* EA2260 80241960 27A20028 */ addiu $v0, $sp, 0x28 +/* EA2264 80241964 E7A00010 */ swc1 $f0, 0x10($sp) +/* EA2268 80241968 E7A20014 */ swc1 $f2, 0x14($sp) +/* EA226C 8024196C E7A40018 */ swc1 $f4, 0x18($sp) +/* EA2270 80241970 0C01D444 */ jal func_80075110 +/* EA2274 80241974 AFA20020 */ sw $v0, 0x20($sp) +/* EA2278 80241978 2402000D */ addiu $v0, $zero, 0xd +/* EA227C 8024197C AE220070 */ sw $v0, 0x70($s1) +.L80241980: +/* EA2280 80241980 8FBF0038 */ lw $ra, 0x38($sp) +/* EA2284 80241984 8FB10034 */ lw $s1, 0x34($sp) +/* EA2288 80241988 8FB00030 */ lw $s0, 0x30($sp) +/* EA228C 8024198C 03E00008 */ jr $ra +/* EA2290 80241990 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_EA0C10/func_80241994_EA2294.s b/asm/nonmatchings/code_EA0C10/func_80241994_EA2294.s new file mode 100644 index 0000000000..1b03b8d1a0 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80241994_EA2294.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241994_EA2294 +/* EA2294 80241994 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA2298 80241998 AFB10014 */ sw $s1, 0x14($sp) +/* EA229C 8024199C 0080882D */ daddu $s1, $a0, $zero +/* EA22A0 802419A0 AFBF0018 */ sw $ra, 0x18($sp) +/* EA22A4 802419A4 AFB00010 */ sw $s0, 0x10($sp) +/* EA22A8 802419A8 8E300148 */ lw $s0, 0x148($s1) +/* EA22AC 802419AC 0C00F92F */ jal func_8003E4BC +/* EA22B0 802419B0 86040008 */ lh $a0, 8($s0) +/* EA22B4 802419B4 0040182D */ daddu $v1, $v0, $zero +/* EA22B8 802419B8 9462008E */ lhu $v0, 0x8e($v1) +/* EA22BC 802419BC 2442FFFF */ addiu $v0, $v0, -1 +/* EA22C0 802419C0 A462008E */ sh $v0, 0x8e($v1) +/* EA22C4 802419C4 00021400 */ sll $v0, $v0, 0x10 +/* EA22C8 802419C8 14400005 */ bnez $v0, .L802419E0 +/* EA22CC 802419CC 00000000 */ nop +/* EA22D0 802419D0 960200AA */ lhu $v0, 0xaa($s0) +/* EA22D4 802419D4 A462008E */ sh $v0, 0x8e($v1) +/* EA22D8 802419D8 2402000E */ addiu $v0, $zero, 0xe +/* EA22DC 802419DC AE220070 */ sw $v0, 0x70($s1) +.L802419E0: +/* EA22E0 802419E0 8FBF0018 */ lw $ra, 0x18($sp) +/* EA22E4 802419E4 8FB10014 */ lw $s1, 0x14($sp) +/* EA22E8 802419E8 8FB00010 */ lw $s0, 0x10($sp) +/* EA22EC 802419EC 03E00008 */ jr $ra +/* EA22F0 802419F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_802419F4_EA22F4.s b/asm/nonmatchings/code_EA0C10/func_802419F4_EA22F4.s new file mode 100644 index 0000000000..eb450ae738 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_802419F4_EA22F4.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419F4_EA22F4 +/* EA22F4 802419F4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EA22F8 802419F8 AFB40040 */ sw $s4, 0x40($sp) +/* EA22FC 802419FC 0080A02D */ daddu $s4, $a0, $zero +/* EA2300 80241A00 AFBF0044 */ sw $ra, 0x44($sp) +/* EA2304 80241A04 AFB3003C */ sw $s3, 0x3c($sp) +/* EA2308 80241A08 AFB20038 */ sw $s2, 0x38($sp) +/* EA230C 80241A0C AFB10034 */ sw $s1, 0x34($sp) +/* EA2310 80241A10 AFB00030 */ sw $s0, 0x30($sp) +/* EA2314 80241A14 8E910148 */ lw $s1, 0x148($s4) +/* EA2318 80241A18 00A0902D */ daddu $s2, $a1, $zero +/* EA231C 80241A1C 86240008 */ lh $a0, 8($s1) +/* EA2320 80241A20 0C00F92F */ jal func_8003E4BC +/* EA2324 80241A24 00C0982D */ daddu $s3, $a2, $zero +/* EA2328 80241A28 0040802D */ daddu $s0, $v0, $zero +/* EA232C 80241A2C 9602008E */ lhu $v0, 0x8e($s0) +/* EA2330 80241A30 2442FFFF */ addiu $v0, $v0, -1 +/* EA2334 80241A34 A602008E */ sh $v0, 0x8e($s0) +/* EA2338 80241A38 00021400 */ sll $v0, $v0, 0x10 +/* EA233C 80241A3C 14400020 */ bnez $v0, .L80241AC0 +/* EA2340 80241A40 0260202D */ daddu $a0, $s3, $zero +/* EA2344 80241A44 AFA00010 */ sw $zero, 0x10($sp) +/* EA2348 80241A48 8E46000C */ lw $a2, 0xc($s2) +/* EA234C 80241A4C 8E470010 */ lw $a3, 0x10($s2) +/* EA2350 80241A50 0C013469 */ jal func_8004D1A4 +/* EA2354 80241A54 0220282D */ daddu $a1, $s1, $zero +/* EA2358 80241A58 54400018 */ bnel $v0, $zero, .L80241ABC +/* EA235C 80241A5C A600008E */ sh $zero, 0x8e($s0) +/* EA2360 80241A60 24040002 */ addiu $a0, $zero, 2 +/* EA2364 80241A64 0200282D */ daddu $a1, $s0, $zero +/* EA2368 80241A68 0000302D */ daddu $a2, $zero, $zero +/* EA236C 80241A6C 860300A8 */ lh $v1, 0xa8($s0) +/* EA2370 80241A70 3C013F80 */ lui $at, 0x3f80 +/* EA2374 80241A74 44810000 */ mtc1 $at, $f0 +/* EA2378 80241A78 3C014000 */ lui $at, 0x4000 +/* EA237C 80241A7C 44811000 */ mtc1 $at, $f2 +/* EA2380 80241A80 3C01C1A0 */ lui $at, 0xc1a0 +/* EA2384 80241A84 44812000 */ mtc1 $at, $f4 +/* EA2388 80241A88 2402000F */ addiu $v0, $zero, 0xf +/* EA238C 80241A8C AFA2001C */ sw $v0, 0x1c($sp) +/* EA2390 80241A90 44833000 */ mtc1 $v1, $f6 +/* EA2394 80241A94 00000000 */ nop +/* EA2398 80241A98 468031A0 */ cvt.s.w $f6, $f6 +/* EA239C 80241A9C 44073000 */ mfc1 $a3, $f6 +/* EA23A0 80241AA0 27A20028 */ addiu $v0, $sp, 0x28 +/* EA23A4 80241AA4 AFA20020 */ sw $v0, 0x20($sp) +/* EA23A8 80241AA8 E7A00010 */ swc1 $f0, 0x10($sp) +/* EA23AC 80241AAC E7A20014 */ swc1 $f2, 0x14($sp) +/* EA23B0 80241AB0 0C01D444 */ jal func_80075110 +/* EA23B4 80241AB4 E7A40018 */ swc1 $f4, 0x18($sp) +/* EA23B8 80241AB8 A600008E */ sh $zero, 0x8e($s0) +.L80241ABC: +/* EA23BC 80241ABC AE800070 */ sw $zero, 0x70($s4) +.L80241AC0: +/* EA23C0 80241AC0 8FBF0044 */ lw $ra, 0x44($sp) +/* EA23C4 80241AC4 8FB40040 */ lw $s4, 0x40($sp) +/* EA23C8 80241AC8 8FB3003C */ lw $s3, 0x3c($sp) +/* EA23CC 80241ACC 8FB20038 */ lw $s2, 0x38($sp) +/* EA23D0 80241AD0 8FB10034 */ lw $s1, 0x34($sp) +/* EA23D4 80241AD4 8FB00030 */ lw $s0, 0x30($sp) +/* EA23D8 80241AD8 03E00008 */ jr $ra +/* EA23DC 80241ADC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EA0C10/func_80241AE0_EA23E0.s b/asm/nonmatchings/code_EA0C10/func_80241AE0_EA23E0.s new file mode 100644 index 0000000000..57efd36da9 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80241AE0_EA23E0.s @@ -0,0 +1,180 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AE0_EA23E0 +/* EA23E0 80241AE0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EA23E4 80241AE4 AFB10034 */ sw $s1, 0x34($sp) +/* EA23E8 80241AE8 0080882D */ daddu $s1, $a0, $zero +/* EA23EC 80241AEC AFBF0048 */ sw $ra, 0x48($sp) +/* EA23F0 80241AF0 AFB50044 */ sw $s5, 0x44($sp) +/* EA23F4 80241AF4 AFB40040 */ sw $s4, 0x40($sp) +/* EA23F8 80241AF8 AFB3003C */ sw $s3, 0x3c($sp) +/* EA23FC 80241AFC AFB20038 */ sw $s2, 0x38($sp) +/* EA2400 80241B00 AFB00030 */ sw $s0, 0x30($sp) +/* EA2404 80241B04 8E300148 */ lw $s0, 0x148($s1) +/* EA2408 80241B08 86040008 */ lh $a0, 8($s0) +/* EA240C 80241B0C 0C00F92F */ jal func_8003E4BC +/* EA2410 80241B10 00A0A82D */ daddu $s5, $a1, $zero +/* EA2414 80241B14 8E23000C */ lw $v1, 0xc($s1) +/* EA2418 80241B18 0220202D */ daddu $a0, $s1, $zero +/* EA241C 80241B1C 8C650000 */ lw $a1, ($v1) +/* EA2420 80241B20 0C0B53A3 */ jal func_802D4E8C +/* EA2424 80241B24 0040A02D */ daddu $s4, $v0, $zero +/* EA2428 80241B28 AFA00010 */ sw $zero, 0x10($sp) +/* EA242C 80241B2C 8E0300D0 */ lw $v1, 0xd0($s0) +/* EA2430 80241B30 8C630030 */ lw $v1, 0x30($v1) +/* EA2434 80241B34 AFA30014 */ sw $v1, 0x14($sp) +/* EA2438 80241B38 8E0300D0 */ lw $v1, 0xd0($s0) +/* EA243C 80241B3C 8C63001C */ lw $v1, 0x1c($v1) +/* EA2440 80241B40 AFA30018 */ sw $v1, 0x18($sp) +/* EA2444 80241B44 8E0300D0 */ lw $v1, 0xd0($s0) +/* EA2448 80241B48 8C630024 */ lw $v1, 0x24($v1) +/* EA244C 80241B4C AFA3001C */ sw $v1, 0x1c($sp) +/* EA2450 80241B50 8E0300D0 */ lw $v1, 0xd0($s0) +/* EA2454 80241B54 8C630028 */ lw $v1, 0x28($v1) +/* EA2458 80241B58 0200202D */ daddu $a0, $s0, $zero +/* EA245C 80241B5C AFA30020 */ sw $v1, 0x20($sp) +/* EA2460 80241B60 8E0300D0 */ lw $v1, 0xd0($s0) +/* EA2464 80241B64 3C014348 */ lui $at, 0x4348 +/* EA2468 80241B68 44810000 */ mtc1 $at, $f0 +/* EA246C 80241B6C 8C63002C */ lw $v1, 0x2c($v1) +/* EA2470 80241B70 0040902D */ daddu $s2, $v0, $zero +/* EA2474 80241B74 E7A00028 */ swc1 $f0, 0x28($sp) +/* EA2478 80241B78 A7A0002C */ sh $zero, 0x2c($sp) +/* EA247C 80241B7C 0C013638 */ jal func_8004D8E0 +/* EA2480 80241B80 AFA30024 */ sw $v1, 0x24($sp) +/* EA2484 80241B84 8E020000 */ lw $v0, ($s0) +/* EA2488 80241B88 3C030010 */ lui $v1, 0x10 +/* EA248C 80241B8C 00431024 */ and $v0, $v0, $v1 +/* EA2490 80241B90 10400008 */ beqz $v0, .L80241BB4 +/* EA2494 80241B94 27B30010 */ addiu $s3, $sp, 0x10 +/* EA2498 80241B98 3C014120 */ lui $at, 0x4120 +/* EA249C 80241B9C 44810000 */ mtc1 $at, $f0 +/* EA24A0 80241BA0 3C013F33 */ lui $at, 0x3f33 +/* EA24A4 80241BA4 34213333 */ ori $at, $at, 0x3333 +/* EA24A8 80241BA8 44811000 */ mtc1 $at, $f2 +/* EA24AC 80241BAC E6000114 */ swc1 $f0, 0x114($s0) +/* EA24B0 80241BB0 E6020118 */ swc1 $f2, 0x118($s0) +.L80241BB4: +/* EA24B4 80241BB4 56A00006 */ bnel $s5, $zero, .L80241BD0 +/* EA24B8 80241BB8 AE200070 */ sw $zero, 0x70($s1) +/* EA24BC 80241BBC 8E0200B0 */ lw $v0, 0xb0($s0) +/* EA24C0 80241BC0 30420004 */ andi $v0, $v0, 4 +/* EA24C4 80241BC4 10400011 */ beqz $v0, .L80241C0C +/* EA24C8 80241BC8 00000000 */ nop +/* EA24CC 80241BCC AE200070 */ sw $zero, 0x70($s1) +.L80241BD0: +/* EA24D0 80241BD0 A680008E */ sh $zero, 0x8e($s4) +/* EA24D4 80241BD4 8E0200CC */ lw $v0, 0xcc($s0) +/* EA24D8 80241BD8 8C420000 */ lw $v0, ($v0) +/* EA24DC 80241BDC AE820028 */ sw $v0, 0x28($s4) +/* EA24E0 80241BE0 8E0200B0 */ lw $v0, 0xb0($s0) +/* EA24E4 80241BE4 30420004 */ andi $v0, $v0, 4 +/* EA24E8 80241BE8 10400008 */ beqz $v0, .L80241C0C +/* EA24EC 80241BEC AE00006C */ sw $zero, 0x6c($s0) +/* EA24F0 80241BF0 24020063 */ addiu $v0, $zero, 0x63 +/* EA24F4 80241BF4 AE220070 */ sw $v0, 0x70($s1) +/* EA24F8 80241BF8 AE200074 */ sw $zero, 0x74($s1) +/* EA24FC 80241BFC 8E0200B0 */ lw $v0, 0xb0($s0) +/* EA2500 80241C00 2403FFFB */ addiu $v1, $zero, -5 +/* EA2504 80241C04 00431024 */ and $v0, $v0, $v1 +/* EA2508 80241C08 AE0200B0 */ sw $v0, 0xb0($s0) +.L80241C0C: +/* EA250C 80241C0C 8E230070 */ lw $v1, 0x70($s1) +/* EA2510 80241C10 2410000B */ addiu $s0, $zero, 0xb +/* EA2514 80241C14 1070002A */ beq $v1, $s0, .L80241CC0 +/* EA2518 80241C18 2862000C */ slti $v0, $v1, 0xc +/* EA251C 80241C1C 1040000D */ beqz $v0, .L80241C54 +/* EA2520 80241C20 24020001 */ addiu $v0, $zero, 1 +/* EA2524 80241C24 1062001A */ beq $v1, $v0, .L80241C90 +/* EA2528 80241C28 28620002 */ slti $v0, $v1, 2 +/* EA252C 80241C2C 10400005 */ beqz $v0, .L80241C44 +/* EA2530 80241C30 2402000A */ addiu $v0, $zero, 0xa +/* EA2534 80241C34 10600013 */ beqz $v1, .L80241C84 +/* EA2538 80241C38 0220202D */ daddu $a0, $s1, $zero +/* EA253C 80241C3C 08090750 */ j .L80241D40 +/* EA2540 80241C40 00000000 */ nop +.L80241C44: +/* EA2544 80241C44 10620018 */ beq $v1, $v0, .L80241CA8 +/* EA2548 80241C48 0220202D */ daddu $a0, $s1, $zero +/* EA254C 80241C4C 08090750 */ j .L80241D40 +/* EA2550 80241C50 00000000 */ nop +.L80241C54: +/* EA2554 80241C54 2402000D */ addiu $v0, $zero, 0xd +/* EA2558 80241C58 10620029 */ beq $v1, $v0, .L80241D00 +/* EA255C 80241C5C 0062102A */ slt $v0, $v1, $v0 +/* EA2560 80241C60 14400020 */ bnez $v0, .L80241CE4 +/* EA2564 80241C64 0220202D */ daddu $a0, $s1, $zero +/* EA2568 80241C68 2402000E */ addiu $v0, $zero, 0xe +/* EA256C 80241C6C 1062002D */ beq $v1, $v0, .L80241D24 +/* EA2570 80241C70 24020063 */ addiu $v0, $zero, 0x63 +/* EA2574 80241C74 10620030 */ beq $v1, $v0, .L80241D38 +/* EA2578 80241C78 00000000 */ nop +/* EA257C 80241C7C 08090750 */ j .L80241D40 +/* EA2580 80241C80 00000000 */ nop +.L80241C84: +/* EA2584 80241C84 0240282D */ daddu $a1, $s2, $zero +/* EA2588 80241C88 0C090317 */ jal func_80240C5C_EA155C +/* EA258C 80241C8C 0260302D */ daddu $a2, $s3, $zero +.L80241C90: +/* EA2590 80241C90 0220202D */ daddu $a0, $s1, $zero +/* EA2594 80241C94 0240282D */ daddu $a1, $s2, $zero +/* EA2598 80241C98 0C090332 */ jal func_80240CC8_EA15C8 +/* EA259C 80241C9C 0260302D */ daddu $a2, $s3, $zero +/* EA25A0 80241CA0 08090750 */ j .L80241D40 +/* EA25A4 80241CA4 00000000 */ nop +.L80241CA8: +/* EA25A8 80241CA8 0240282D */ daddu $a1, $s2, $zero +/* EA25AC 80241CAC 0C090371 */ jal func_80240DC4_EA16C4 +/* EA25B0 80241CB0 0260302D */ daddu $a2, $s3, $zero +/* EA25B4 80241CB4 8E220070 */ lw $v0, 0x70($s1) +/* EA25B8 80241CB8 14500021 */ bne $v0, $s0, .L80241D40 +/* EA25BC 80241CBC 00000000 */ nop +.L80241CC0: +/* EA25C0 80241CC0 0220202D */ daddu $a0, $s1, $zero +/* EA25C4 80241CC4 0240282D */ daddu $a1, $s2, $zero +/* EA25C8 80241CC8 0C090601 */ jal func_80241804_EA2104 +/* EA25CC 80241CCC 0260302D */ daddu $a2, $s3, $zero +/* EA25D0 80241CD0 8E230070 */ lw $v1, 0x70($s1) +/* EA25D4 80241CD4 2402000C */ addiu $v0, $zero, 0xc +/* EA25D8 80241CD8 14620019 */ bne $v1, $v0, .L80241D40 +/* EA25DC 80241CDC 00000000 */ nop +/* EA25E0 80241CE0 0220202D */ daddu $a0, $s1, $zero +.L80241CE4: +/* EA25E4 80241CE4 0240282D */ daddu $a1, $s2, $zero +/* EA25E8 80241CE8 0C090625 */ jal func_80241894_EA2194 +/* EA25EC 80241CEC 0260302D */ daddu $a2, $s3, $zero +/* EA25F0 80241CF0 8E230070 */ lw $v1, 0x70($s1) +/* EA25F4 80241CF4 2402000D */ addiu $v0, $zero, 0xd +/* EA25F8 80241CF8 14620011 */ bne $v1, $v0, .L80241D40 +/* EA25FC 80241CFC 00000000 */ nop +.L80241D00: +/* EA2600 80241D00 0220202D */ daddu $a0, $s1, $zero +/* EA2604 80241D04 0240282D */ daddu $a1, $s2, $zero +/* EA2608 80241D08 0C090665 */ jal func_80241994_EA2294 +/* EA260C 80241D0C 0260302D */ daddu $a2, $s3, $zero +/* EA2610 80241D10 8E230070 */ lw $v1, 0x70($s1) +/* EA2614 80241D14 2402000E */ addiu $v0, $zero, 0xe +/* EA2618 80241D18 14620009 */ bne $v1, $v0, .L80241D40 +/* EA261C 80241D1C 00000000 */ nop +/* EA2620 80241D20 0220202D */ daddu $a0, $s1, $zero +.L80241D24: +/* EA2624 80241D24 0240282D */ daddu $a1, $s2, $zero +/* EA2628 80241D28 0C09067D */ jal func_802419F4_EA22F4 +/* EA262C 80241D2C 0260302D */ daddu $a2, $s3, $zero +/* EA2630 80241D30 08090750 */ j .L80241D40 +/* EA2634 80241D34 00000000 */ nop +.L80241D38: +/* EA2638 80241D38 0C013AE3 */ jal func_8004EB8C +/* EA263C 80241D3C 0220202D */ daddu $a0, $s1, $zero +.L80241D40: +/* EA2640 80241D40 8FBF0048 */ lw $ra, 0x48($sp) +/* EA2644 80241D44 8FB50044 */ lw $s5, 0x44($sp) +/* EA2648 80241D48 8FB40040 */ lw $s4, 0x40($sp) +/* EA264C 80241D4C 8FB3003C */ lw $s3, 0x3c($sp) +/* EA2650 80241D50 8FB20038 */ lw $s2, 0x38($sp) +/* EA2654 80241D54 8FB10034 */ lw $s1, 0x34($sp) +/* EA2658 80241D58 8FB00030 */ lw $s0, 0x30($sp) +/* EA265C 80241D5C 0000102D */ daddu $v0, $zero, $zero +/* EA2660 80241D60 03E00008 */ jr $ra +/* EA2664 80241D64 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EA0C10/func_80241D68_EA2668.s b/asm/nonmatchings/code_EA0C10/func_80241D68_EA2668.s new file mode 100644 index 0000000000..2a169f5305 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80241D68_EA2668.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D68_EA2668 +/* EA2668 80241D68 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA266C 80241D6C AFB20018 */ sw $s2, 0x18($sp) +/* EA2670 80241D70 0080902D */ daddu $s2, $a0, $zero +/* EA2674 80241D74 AFBF001C */ sw $ra, 0x1c($sp) +/* EA2678 80241D78 AFB10014 */ sw $s1, 0x14($sp) +/* EA267C 80241D7C AFB00010 */ sw $s0, 0x10($sp) +/* EA2680 80241D80 8E510148 */ lw $s1, 0x148($s2) +/* EA2684 80241D84 0C00F92F */ jal func_8003E4BC +/* EA2688 80241D88 86240008 */ lh $a0, 8($s1) +/* EA268C 80241D8C 0040802D */ daddu $s0, $v0, $zero +/* EA2690 80241D90 8E2300CC */ lw $v1, 0xcc($s1) +/* EA2694 80241D94 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EA2698 80241D98 8C630020 */ lw $v1, 0x20($v1) +/* EA269C 80241D9C AE030028 */ sw $v1, 0x28($s0) +/* EA26A0 80241DA0 96220076 */ lhu $v0, 0x76($s1) +/* EA26A4 80241DA4 A602008E */ sh $v0, 0x8e($s0) +/* EA26A8 80241DA8 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EA26AC 80241DAC 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EA26B0 80241DB0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EA26B4 80241DB4 8C460028 */ lw $a2, 0x28($v0) +/* EA26B8 80241DB8 0C00ABDC */ jal fio_validate_header_checksums +/* EA26BC 80241DBC 8C470030 */ lw $a3, 0x30($v0) +/* EA26C0 80241DC0 2402000D */ addiu $v0, $zero, 0xd +/* EA26C4 80241DC4 E600000C */ swc1 $f0, 0xc($s0) +/* EA26C8 80241DC8 AE420070 */ sw $v0, 0x70($s2) +/* EA26CC 80241DCC 8FBF001C */ lw $ra, 0x1c($sp) +/* EA26D0 80241DD0 8FB20018 */ lw $s2, 0x18($sp) +/* EA26D4 80241DD4 8FB10014 */ lw $s1, 0x14($sp) +/* EA26D8 80241DD8 8FB00010 */ lw $s0, 0x10($sp) +/* EA26DC 80241DDC 03E00008 */ jr $ra +/* EA26E0 80241DE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_80241DE4_EA26E4.s b/asm/nonmatchings/code_EA0C10/func_80241DE4_EA26E4.s new file mode 100644 index 0000000000..502a85d895 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80241DE4_EA26E4.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DE4_EA26E4 +/* EA26E4 80241DE4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EA26E8 80241DE8 AFB3001C */ sw $s3, 0x1c($sp) +/* EA26EC 80241DEC 0080982D */ daddu $s3, $a0, $zero +/* EA26F0 80241DF0 AFBF0020 */ sw $ra, 0x20($sp) +/* EA26F4 80241DF4 AFB20018 */ sw $s2, 0x18($sp) +/* EA26F8 80241DF8 AFB10014 */ sw $s1, 0x14($sp) +/* EA26FC 80241DFC AFB00010 */ sw $s0, 0x10($sp) +/* EA2700 80241E00 8E710148 */ lw $s1, 0x148($s3) +/* EA2704 80241E04 86240008 */ lh $a0, 8($s1) +/* EA2708 80241E08 0C00F92F */ jal func_8003E4BC +/* EA270C 80241E0C 00A0902D */ daddu $s2, $a1, $zero +/* EA2710 80241E10 0040802D */ daddu $s0, $v0, $zero +/* EA2714 80241E14 8602008E */ lh $v0, 0x8e($s0) +/* EA2718 80241E18 9603008E */ lhu $v1, 0x8e($s0) +/* EA271C 80241E1C 18400005 */ blez $v0, .L80241E34 +/* EA2720 80241E20 2462FFFF */ addiu $v0, $v1, -1 +/* EA2724 80241E24 A602008E */ sh $v0, 0x8e($s0) +/* EA2728 80241E28 00021400 */ sll $v0, $v0, 0x10 +/* EA272C 80241E2C 1C400033 */ bgtz $v0, .L80241EFC +/* EA2730 80241E30 00000000 */ nop +.L80241E34: +/* EA2734 80241E34 8602008C */ lh $v0, 0x8c($s0) +/* EA2738 80241E38 14400030 */ bnez $v0, .L80241EFC +/* EA273C 80241E3C 00000000 */ nop +/* EA2740 80241E40 8E2200CC */ lw $v0, 0xcc($s1) +/* EA2744 80241E44 8C420024 */ lw $v0, 0x24($v0) +/* EA2748 80241E48 AE020028 */ sw $v0, 0x28($s0) +/* EA274C 80241E4C C6400018 */ lwc1 $f0, 0x18($s2) +/* EA2750 80241E50 E6000018 */ swc1 $f0, 0x18($s0) +/* EA2754 80241E54 8E230088 */ lw $v1, 0x88($s1) +/* EA2758 80241E58 24020005 */ addiu $v0, $zero, 5 +/* EA275C 80241E5C 10620005 */ beq $v1, $v0, .L80241E74 +/* EA2760 80241E60 00000000 */ nop +/* EA2764 80241E64 10600003 */ beqz $v1, .L80241E74 +/* EA2768 80241E68 24020001 */ addiu $v0, $zero, 1 +/* EA276C 80241E6C 14620006 */ bne $v1, $v0, .L80241E88 +/* EA2770 80241E70 00000000 */ nop +.L80241E74: +/* EA2774 80241E74 8E220084 */ lw $v0, 0x84($s1) +/* EA2778 80241E78 00021FC2 */ srl $v1, $v0, 0x1f +/* EA277C 80241E7C 00431021 */ addu $v0, $v0, $v1 +/* EA2780 80241E80 00021043 */ sra $v0, $v0, 1 +/* EA2784 80241E84 A60200A8 */ sh $v0, 0xa8($s0) +.L80241E88: +/* EA2788 80241E88 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EA278C 80241E8C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EA2790 80241E90 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EA2794 80241E94 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EA2798 80241E98 8C460028 */ lw $a2, 0x28($v0) +/* EA279C 80241E9C 0C00AC71 */ jal func_8002B1C4 +/* EA27A0 80241EA0 8C470030 */ lw $a3, 0x30($v0) +/* EA27A4 80241EA4 C6020018 */ lwc1 $f2, 0x18($s0) +/* EA27A8 80241EA8 46020003 */ div.s $f0, $f0, $f2 +/* EA27AC 80241EAC 3C018024 */ lui $at, %hi(D_80246648) +/* EA27B0 80241EB0 D4226648 */ ldc1 $f2, %lo(D_80246648)($at) +/* EA27B4 80241EB4 46000021 */ cvt.d.s $f0, $f0 +/* EA27B8 80241EB8 46220000 */ add.d $f0, $f0, $f2 +/* EA27BC 80241EBC 4620010D */ trunc.w.d $f4, $f0 +/* EA27C0 80241EC0 44022000 */ mfc1 $v0, $f4 +/* EA27C4 80241EC4 00000000 */ nop +/* EA27C8 80241EC8 A602008E */ sh $v0, 0x8e($s0) +/* EA27CC 80241ECC 00021400 */ sll $v0, $v0, 0x10 +/* EA27D0 80241ED0 8E230078 */ lw $v1, 0x78($s1) +/* EA27D4 80241ED4 00021403 */ sra $v0, $v0, 0x10 +/* EA27D8 80241ED8 0043102A */ slt $v0, $v0, $v1 +/* EA27DC 80241EDC 10400003 */ beqz $v0, .L80241EEC +/* EA27E0 80241EE0 00000000 */ nop +/* EA27E4 80241EE4 9622007A */ lhu $v0, 0x7a($s1) +/* EA27E8 80241EE8 A602008E */ sh $v0, 0x8e($s0) +.L80241EEC: +/* EA27EC 80241EEC 8602008E */ lh $v0, 0x8e($s0) +/* EA27F0 80241EF0 AE22007C */ sw $v0, 0x7c($s1) +/* EA27F4 80241EF4 2402000E */ addiu $v0, $zero, 0xe +/* EA27F8 80241EF8 AE620070 */ sw $v0, 0x70($s3) +.L80241EFC: +/* EA27FC 80241EFC 8FBF0020 */ lw $ra, 0x20($sp) +/* EA2800 80241F00 8FB3001C */ lw $s3, 0x1c($sp) +/* EA2804 80241F04 8FB20018 */ lw $s2, 0x18($sp) +/* EA2808 80241F08 8FB10014 */ lw $s1, 0x14($sp) +/* EA280C 80241F0C 8FB00010 */ lw $s0, 0x10($sp) +/* EA2810 80241F10 03E00008 */ jr $ra +/* EA2814 80241F14 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EA0C10/func_80241F18_EA2818.s b/asm/nonmatchings/code_EA0C10/func_80241F18_EA2818.s new file mode 100644 index 0000000000..1c60a2746a --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80241F18_EA2818.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F18_EA2818 +/* EA2818 80241F18 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EA281C 80241F1C AFB3003C */ sw $s3, 0x3c($sp) +/* EA2820 80241F20 0080982D */ daddu $s3, $a0, $zero +/* EA2824 80241F24 AFBF0040 */ sw $ra, 0x40($sp) +/* EA2828 80241F28 AFB20038 */ sw $s2, 0x38($sp) +/* EA282C 80241F2C AFB10034 */ sw $s1, 0x34($sp) +/* EA2830 80241F30 AFB00030 */ sw $s0, 0x30($sp) +/* EA2834 80241F34 8E710148 */ lw $s1, 0x148($s3) +/* EA2838 80241F38 0C00F92F */ jal func_8003E4BC +/* EA283C 80241F3C 86240008 */ lh $a0, 8($s1) +/* EA2840 80241F40 0040802D */ daddu $s0, $v0, $zero +/* EA2844 80241F44 8E22007C */ lw $v0, 0x7c($s1) +/* EA2848 80241F48 8603008E */ lh $v1, 0x8e($s0) +/* EA284C 80241F4C 2442FFFF */ addiu $v0, $v0, -1 +/* EA2850 80241F50 14620012 */ bne $v1, $v0, .L80241F9C +/* EA2854 80241F54 00000000 */ nop +/* EA2858 80241F58 C6000038 */ lwc1 $f0, 0x38($s0) +/* EA285C 80241F5C 4600020D */ trunc.w.s $f8, $f0 +/* EA2860 80241F60 44024000 */ mfc1 $v0, $f8 +/* EA2864 80241F64 00000000 */ nop +/* EA2868 80241F68 A6220010 */ sh $v0, 0x10($s1) +/* EA286C 80241F6C C600003C */ lwc1 $f0, 0x3c($s0) +/* EA2870 80241F70 4600020D */ trunc.w.s $f8, $f0 +/* EA2874 80241F74 44024000 */ mfc1 $v0, $f8 +/* EA2878 80241F78 00000000 */ nop +/* EA287C 80241F7C A6220012 */ sh $v0, 0x12($s1) +/* EA2880 80241F80 C6000040 */ lwc1 $f0, 0x40($s0) +/* EA2884 80241F84 24020001 */ addiu $v0, $zero, 1 +/* EA2888 80241F88 A2220007 */ sb $v0, 7($s1) +/* EA288C 80241F8C 4600020D */ trunc.w.s $f8, $f0 +/* EA2890 80241F90 44024000 */ mfc1 $v0, $f8 +/* EA2894 80241F94 00000000 */ nop +/* EA2898 80241F98 A6220014 */ sh $v0, 0x14($s1) +.L80241F9C: +/* EA289C 80241F9C C6000038 */ lwc1 $f0, 0x38($s0) +/* EA28A0 80241FA0 C602003C */ lwc1 $f2, 0x3c($s0) +/* EA28A4 80241FA4 C6040040 */ lwc1 $f4, 0x40($s0) +/* EA28A8 80241FA8 C6060018 */ lwc1 $f6, 0x18($s0) +/* EA28AC 80241FAC E7A00020 */ swc1 $f0, 0x20($sp) +/* EA28B0 80241FB0 E7A20024 */ swc1 $f2, 0x24($sp) +/* EA28B4 80241FB4 E7A40028 */ swc1 $f4, 0x28($sp) +/* EA28B8 80241FB8 E7A60010 */ swc1 $f6, 0x10($sp) +/* EA28BC 80241FBC C600000C */ lwc1 $f0, 0xc($s0) +/* EA28C0 80241FC0 E7A00014 */ swc1 $f0, 0x14($sp) +/* EA28C4 80241FC4 860200A8 */ lh $v0, 0xa8($s0) +/* EA28C8 80241FC8 27A50020 */ addiu $a1, $sp, 0x20 +/* EA28CC 80241FCC 44820000 */ mtc1 $v0, $f0 +/* EA28D0 80241FD0 00000000 */ nop +/* EA28D4 80241FD4 46800020 */ cvt.s.w $f0, $f0 +/* EA28D8 80241FD8 E7A00018 */ swc1 $f0, 0x18($sp) +/* EA28DC 80241FDC 860200A6 */ lh $v0, 0xa6($s0) +/* EA28E0 80241FE0 27A60024 */ addiu $a2, $sp, 0x24 +/* EA28E4 80241FE4 44820000 */ mtc1 $v0, $f0 +/* EA28E8 80241FE8 00000000 */ nop +/* EA28EC 80241FEC 46800020 */ cvt.s.w $f0, $f0 +/* EA28F0 80241FF0 E7A0001C */ swc1 $f0, 0x1c($sp) +/* EA28F4 80241FF4 8E040080 */ lw $a0, 0x80($s0) +/* EA28F8 80241FF8 0C0394C1 */ jal func_800E5304 +/* EA28FC 80241FFC 27A70028 */ addiu $a3, $sp, 0x28 +/* EA2900 80242000 0040902D */ daddu $s2, $v0, $zero +/* EA2904 80242004 16400005 */ bnez $s2, .L8024201C +/* EA2908 80242008 00000000 */ nop +/* EA290C 8024200C 8E050018 */ lw $a1, 0x18($s0) +/* EA2910 80242010 8E06000C */ lw $a2, 0xc($s0) +/* EA2914 80242014 0C00F909 */ jal func_8003E424 +/* EA2918 80242018 0200202D */ daddu $a0, $s0, $zero +.L8024201C: +/* EA291C 8024201C 8602008E */ lh $v0, 0x8e($s0) +/* EA2920 80242020 9603008E */ lhu $v1, 0x8e($s0) +/* EA2924 80242024 18400007 */ blez $v0, .L80242044 +/* EA2928 80242028 2462FFFF */ addiu $v0, $v1, -1 +/* EA292C 8024202C A602008E */ sh $v0, 0x8e($s0) +/* EA2930 80242030 00021400 */ sll $v0, $v0, 0x10 +/* EA2934 80242034 18400003 */ blez $v0, .L80242044 +/* EA2938 80242038 00000000 */ nop +/* EA293C 8024203C 12400008 */ beqz $s2, .L80242060 +/* EA2940 80242040 00000000 */ nop +.L80242044: +/* EA2944 80242044 8E2200CC */ lw $v0, 0xcc($s1) +/* EA2948 80242048 A2200007 */ sb $zero, 7($s1) +/* EA294C 8024204C 8C420028 */ lw $v0, 0x28($v0) +/* EA2950 80242050 A600008E */ sh $zero, 0x8e($s0) +/* EA2954 80242054 AE020028 */ sw $v0, 0x28($s0) +/* EA2958 80242058 2402000F */ addiu $v0, $zero, 0xf +/* EA295C 8024205C AE620070 */ sw $v0, 0x70($s3) +.L80242060: +/* EA2960 80242060 8FBF0040 */ lw $ra, 0x40($sp) +/* EA2964 80242064 8FB3003C */ lw $s3, 0x3c($sp) +/* EA2968 80242068 8FB20038 */ lw $s2, 0x38($sp) +/* EA296C 8024206C 8FB10034 */ lw $s1, 0x34($sp) +/* EA2970 80242070 8FB00030 */ lw $s0, 0x30($sp) +/* EA2974 80242074 03E00008 */ jr $ra +/* EA2978 80242078 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EA0C10/func_8024207C_EA297C.s b/asm/nonmatchings/code_EA0C10/func_8024207C_EA297C.s new file mode 100644 index 0000000000..e33cb54597 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_8024207C_EA297C.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024207C_EA297C +/* EA297C 8024207C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA2980 80242080 AFB10014 */ sw $s1, 0x14($sp) +/* EA2984 80242084 0080882D */ daddu $s1, $a0, $zero +/* EA2988 80242088 AFBF0018 */ sw $ra, 0x18($sp) +/* EA298C 8024208C AFB00010 */ sw $s0, 0x10($sp) +/* EA2990 80242090 8E300148 */ lw $s0, 0x148($s1) +/* EA2994 80242094 0C00F92F */ jal func_8003E4BC +/* EA2998 80242098 86040008 */ lh $a0, 8($s0) +/* EA299C 8024209C 0040202D */ daddu $a0, $v0, $zero +/* EA29A0 802420A0 9482008E */ lhu $v0, 0x8e($a0) +/* EA29A4 802420A4 24030003 */ addiu $v1, $zero, 3 +/* EA29A8 802420A8 24420001 */ addiu $v0, $v0, 1 +/* EA29AC 802420AC A482008E */ sh $v0, 0x8e($a0) +/* EA29B0 802420B0 00021400 */ sll $v0, $v0, 0x10 +/* EA29B4 802420B4 00021403 */ sra $v0, $v0, 0x10 +/* EA29B8 802420B8 14430003 */ bne $v0, $v1, .L802420C8 +/* EA29BC 802420BC 00000000 */ nop +/* EA29C0 802420C0 96020086 */ lhu $v0, 0x86($s0) +/* EA29C4 802420C4 A48200A8 */ sh $v0, 0xa8($a0) +.L802420C8: +/* EA29C8 802420C8 8482008E */ lh $v0, 0x8e($a0) +/* EA29CC 802420CC 8E030080 */ lw $v1, 0x80($s0) +/* EA29D0 802420D0 0043102A */ slt $v0, $v0, $v1 +/* EA29D4 802420D4 14400004 */ bnez $v0, .L802420E8 +/* EA29D8 802420D8 00000000 */ nop +/* EA29DC 802420DC 96020086 */ lhu $v0, 0x86($s0) +/* EA29E0 802420E0 A48200A8 */ sh $v0, 0xa8($a0) +/* EA29E4 802420E4 AE200070 */ sw $zero, 0x70($s1) +.L802420E8: +/* EA29E8 802420E8 8FBF0018 */ lw $ra, 0x18($sp) +/* EA29EC 802420EC 8FB10014 */ lw $s1, 0x14($sp) +/* EA29F0 802420F0 8FB00010 */ lw $s0, 0x10($sp) +/* EA29F4 802420F4 03E00008 */ jr $ra +/* EA29F8 802420F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s b/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s new file mode 100644 index 0000000000..9789a48d10 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s @@ -0,0 +1,312 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802420FC_EA29FC +/* EA29FC 802420FC 27BDFF90 */ addiu $sp, $sp, -0x70 +/* EA2A00 80242100 AFB3005C */ sw $s3, 0x5c($sp) +/* EA2A04 80242104 0080982D */ daddu $s3, $a0, $zero +/* EA2A08 80242108 AFBF0068 */ sw $ra, 0x68($sp) +/* EA2A0C 8024210C AFB50064 */ sw $s5, 0x64($sp) +/* EA2A10 80242110 AFB40060 */ sw $s4, 0x60($sp) +/* EA2A14 80242114 AFB20058 */ sw $s2, 0x58($sp) +/* EA2A18 80242118 AFB10054 */ sw $s1, 0x54($sp) +/* EA2A1C 8024211C AFB00050 */ sw $s0, 0x50($sp) +/* EA2A20 80242120 8E710148 */ lw $s1, 0x148($s3) +/* EA2A24 80242124 86240008 */ lh $a0, 8($s1) +/* EA2A28 80242128 0C00F92F */ jal func_8003E4BC +/* EA2A2C 8024212C 00A0802D */ daddu $s0, $a1, $zero +/* EA2A30 80242130 8E63000C */ lw $v1, 0xc($s3) +/* EA2A34 80242134 0260202D */ daddu $a0, $s3, $zero +/* EA2A38 80242138 8C650000 */ lw $a1, ($v1) +/* EA2A3C 8024213C 0C0B53A3 */ jal func_802D4E8C +/* EA2A40 80242140 0040902D */ daddu $s2, $v0, $zero +/* EA2A44 80242144 AFA00028 */ sw $zero, 0x28($sp) +/* EA2A48 80242148 8E2300D0 */ lw $v1, 0xd0($s1) +/* EA2A4C 8024214C 8C630030 */ lw $v1, 0x30($v1) +/* EA2A50 80242150 AFA3002C */ sw $v1, 0x2c($sp) +/* EA2A54 80242154 8E2300D0 */ lw $v1, 0xd0($s1) +/* EA2A58 80242158 8C63001C */ lw $v1, 0x1c($v1) +/* EA2A5C 8024215C AFA30030 */ sw $v1, 0x30($sp) +/* EA2A60 80242160 8E2300D0 */ lw $v1, 0xd0($s1) +/* EA2A64 80242164 8C630024 */ lw $v1, 0x24($v1) +/* EA2A68 80242168 AFA30034 */ sw $v1, 0x34($sp) +/* EA2A6C 8024216C 8E2300D0 */ lw $v1, 0xd0($s1) +/* EA2A70 80242170 8C630028 */ lw $v1, 0x28($v1) +/* EA2A74 80242174 AFA30038 */ sw $v1, 0x38($sp) +/* EA2A78 80242178 8E2300D0 */ lw $v1, 0xd0($s1) +/* EA2A7C 8024217C 3C0142C8 */ lui $at, 0x42c8 +/* EA2A80 80242180 44810000 */ mtc1 $at, $f0 +/* EA2A84 80242184 8C63002C */ lw $v1, 0x2c($v1) +/* EA2A88 80242188 E7A00040 */ swc1 $f0, 0x40($sp) +/* EA2A8C 8024218C A7A00044 */ sh $zero, 0x44($sp) +/* EA2A90 80242190 AFA3003C */ sw $v1, 0x3c($sp) +/* EA2A94 80242194 C6400038 */ lwc1 $f0, 0x38($s2) +/* EA2A98 80242198 E6200108 */ swc1 $f0, 0x108($s1) +/* EA2A9C 8024219C C640003C */ lwc1 $f0, 0x3c($s2) +/* EA2AA0 802421A0 27B50028 */ addiu $s5, $sp, 0x28 +/* EA2AA4 802421A4 E620010C */ swc1 $f0, 0x10c($s1) +/* EA2AA8 802421A8 3C013C23 */ lui $at, 0x3c23 +/* EA2AAC 802421AC 3421D70A */ ori $at, $at, 0xd70a +/* EA2AB0 802421B0 44810000 */ mtc1 $at, $f0 +/* EA2AB4 802421B4 C6420040 */ lwc1 $f2, 0x40($s2) +/* EA2AB8 802421B8 0040A02D */ daddu $s4, $v0, $zero +/* EA2ABC 802421BC E6200114 */ swc1 $f0, 0x114($s1) +/* EA2AC0 802421C0 E6200118 */ swc1 $f0, 0x118($s1) +/* EA2AC4 802421C4 12000009 */ beqz $s0, .L802421EC +/* EA2AC8 802421C8 E6220110 */ swc1 $f2, 0x110($s1) +/* EA2ACC 802421CC 864300A8 */ lh $v1, 0xa8($s2) +/* EA2AD0 802421D0 8E2200B0 */ lw $v0, 0xb0($s1) +/* EA2AD4 802421D4 AE20008C */ sw $zero, 0x8c($s1) +/* EA2AD8 802421D8 A22000B5 */ sb $zero, 0xb5($s1) +/* EA2ADC 802421DC 34420008 */ ori $v0, $v0, 8 +/* EA2AE0 802421E0 AE230084 */ sw $v1, 0x84($s1) +/* EA2AE4 802421E4 0809087F */ j .L802421FC +/* EA2AE8 802421E8 AE2200B0 */ sw $v0, 0xb0($s1) +.L802421EC: +/* EA2AEC 802421EC 8E2200B0 */ lw $v0, 0xb0($s1) +/* EA2AF0 802421F0 30420004 */ andi $v0, $v0, 4 +/* EA2AF4 802421F4 10400047 */ beqz $v0, .L80242314 +/* EA2AF8 802421F8 00000000 */ nop +.L802421FC: +/* EA2AFC 802421FC AE600070 */ sw $zero, 0x70($s3) +/* EA2B00 80242200 A640008E */ sh $zero, 0x8e($s2) +/* EA2B04 80242204 8E2300CC */ lw $v1, 0xcc($s1) +/* EA2B08 80242208 2404F7FF */ addiu $a0, $zero, -0x801 +/* EA2B0C 8024220C A2200007 */ sb $zero, 7($s1) +/* EA2B10 80242210 8E420000 */ lw $v0, ($s2) +/* EA2B14 80242214 8C630000 */ lw $v1, ($v1) +/* EA2B18 80242218 00441024 */ and $v0, $v0, $a0 +/* EA2B1C 8024221C AE420000 */ sw $v0, ($s2) +/* EA2B20 80242220 AE430028 */ sw $v1, 0x28($s2) +/* EA2B24 80242224 96220086 */ lhu $v0, 0x86($s1) +/* EA2B28 80242228 A64200A8 */ sh $v0, 0xa8($s2) +/* EA2B2C 8024222C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EA2B30 80242230 AE200090 */ sw $zero, 0x90($s1) +/* EA2B34 80242234 8C420034 */ lw $v0, 0x34($v0) +/* EA2B38 80242238 14400006 */ bnez $v0, .L80242254 +/* EA2B3C 8024223C 2403FDFF */ addiu $v1, $zero, -0x201 +/* EA2B40 80242240 8E420000 */ lw $v0, ($s2) +/* EA2B44 80242244 2403FFF7 */ addiu $v1, $zero, -9 +/* EA2B48 80242248 34420200 */ ori $v0, $v0, 0x200 +/* EA2B4C 8024224C 08090898 */ j .L80242260 +/* EA2B50 80242250 00431024 */ and $v0, $v0, $v1 +.L80242254: +/* EA2B54 80242254 8E420000 */ lw $v0, ($s2) +/* EA2B58 80242258 00431024 */ and $v0, $v0, $v1 +/* EA2B5C 8024225C 34420008 */ ori $v0, $v0, 8 +.L80242260: +/* EA2B60 80242260 AE420000 */ sw $v0, ($s2) +/* EA2B64 80242264 8E2200B0 */ lw $v0, 0xb0($s1) +/* EA2B68 80242268 30420004 */ andi $v0, $v0, 4 +/* EA2B6C 8024226C 1040001E */ beqz $v0, .L802422E8 +/* EA2B70 80242270 24040002 */ addiu $a0, $zero, 2 +/* EA2B74 80242274 0240282D */ daddu $a1, $s2, $zero +/* EA2B78 80242278 0000302D */ daddu $a2, $zero, $zero +/* EA2B7C 8024227C 24020063 */ addiu $v0, $zero, 0x63 +/* EA2B80 80242280 AE620070 */ sw $v0, 0x70($s3) +/* EA2B84 80242284 AE600074 */ sw $zero, 0x74($s3) +/* EA2B88 80242288 864300A8 */ lh $v1, 0xa8($s2) +/* EA2B8C 8024228C 3C013F80 */ lui $at, 0x3f80 +/* EA2B90 80242290 44810000 */ mtc1 $at, $f0 +/* EA2B94 80242294 3C014000 */ lui $at, 0x4000 +/* EA2B98 80242298 44811000 */ mtc1 $at, $f2 +/* EA2B9C 8024229C 3C01C1A0 */ lui $at, 0xc1a0 +/* EA2BA0 802422A0 44812000 */ mtc1 $at, $f4 +/* EA2BA4 802422A4 24020028 */ addiu $v0, $zero, 0x28 +/* EA2BA8 802422A8 AFA2001C */ sw $v0, 0x1c($sp) +/* EA2BAC 802422AC 44833000 */ mtc1 $v1, $f6 +/* EA2BB0 802422B0 00000000 */ nop +/* EA2BB4 802422B4 468031A0 */ cvt.s.w $f6, $f6 +/* EA2BB8 802422B8 44073000 */ mfc1 $a3, $f6 +/* EA2BBC 802422BC 27A20048 */ addiu $v0, $sp, 0x48 +/* EA2BC0 802422C0 AFA20020 */ sw $v0, 0x20($sp) +/* EA2BC4 802422C4 E7A00010 */ swc1 $f0, 0x10($sp) +/* EA2BC8 802422C8 E7A20014 */ swc1 $f2, 0x14($sp) +/* EA2BCC 802422CC 0C01D444 */ jal func_80075110 +/* EA2BD0 802422D0 E7A40018 */ swc1 $f4, 0x18($sp) +/* EA2BD4 802422D4 8E2200B0 */ lw $v0, 0xb0($s1) +/* EA2BD8 802422D8 2403FFFB */ addiu $v1, $zero, -5 +/* EA2BDC 802422DC 00431024 */ and $v0, $v0, $v1 +/* EA2BE0 802422E0 080908C5 */ j .L80242314 +/* EA2BE4 802422E4 AE2200B0 */ sw $v0, 0xb0($s1) +.L802422E8: +/* EA2BE8 802422E8 8E220000 */ lw $v0, ($s1) +/* EA2BEC 802422EC 3C034000 */ lui $v1, 0x4000 +/* EA2BF0 802422F0 00431024 */ and $v0, $v0, $v1 +/* EA2BF4 802422F4 10400007 */ beqz $v0, .L80242314 +/* EA2BF8 802422F8 3C03BFFF */ lui $v1, 0xbfff +/* EA2BFC 802422FC 2402000C */ addiu $v0, $zero, 0xc +/* EA2C00 80242300 AE620070 */ sw $v0, 0x70($s3) +/* EA2C04 80242304 8E220000 */ lw $v0, ($s1) +/* EA2C08 80242308 3463FFFF */ ori $v1, $v1, 0xffff +/* EA2C0C 8024230C 00431024 */ and $v0, $v0, $v1 +/* EA2C10 80242310 AE220000 */ sw $v0, ($s1) +.L80242314: +/* EA2C14 80242314 8E220090 */ lw $v0, 0x90($s1) +/* EA2C18 80242318 1840000C */ blez $v0, .L8024234C +/* EA2C1C 8024231C 2442FFFF */ addiu $v0, $v0, -1 +/* EA2C20 80242320 14400087 */ bnez $v0, .L80242540 +/* EA2C24 80242324 AE220090 */ sw $v0, 0x90($s1) +/* EA2C28 80242328 3C03FFAA */ lui $v1, 0xffaa +/* EA2C2C 8024232C 8E420028 */ lw $v0, 0x28($s2) +/* EA2C30 80242330 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* EA2C34 80242334 00431021 */ addu $v0, $v0, $v1 +/* EA2C38 80242338 2C420002 */ sltiu $v0, $v0, 2 +/* EA2C3C 8024233C 10400003 */ beqz $v0, .L8024234C +/* EA2C40 80242340 3C020055 */ lui $v0, 0x55 +/* EA2C44 80242344 3442000C */ ori $v0, $v0, 0xc +/* EA2C48 80242348 AE420028 */ sw $v0, 0x28($s2) +.L8024234C: +/* EA2C4C 8024234C 8E630070 */ lw $v1, 0x70($s3) +/* EA2C50 80242350 2402000C */ addiu $v0, $zero, 0xc +/* EA2C54 80242354 10620048 */ beq $v1, $v0, .L80242478 +/* EA2C58 80242358 2862000D */ slti $v0, $v1, 0xd +/* EA2C5C 8024235C 1040000F */ beqz $v0, .L8024239C +/* EA2C60 80242360 24100001 */ addiu $s0, $zero, 1 +/* EA2C64 80242364 1070001E */ beq $v1, $s0, .L802423E0 +/* EA2C68 80242368 28620002 */ slti $v0, $v1, 2 +/* EA2C6C 8024236C 10400005 */ beqz $v0, .L80242384 +/* EA2C70 80242370 24020002 */ addiu $v0, $zero, 2 +/* EA2C74 80242374 10600015 */ beqz $v1, .L802423CC +/* EA2C78 80242378 0260202D */ daddu $a0, $s3, $zero +/* EA2C7C 8024237C 08090935 */ j .L802424D4 +/* EA2C80 80242380 00000000 */ nop +.L80242384: +/* EA2C84 80242384 1062001C */ beq $v1, $v0, .L802423F8 +/* EA2C88 80242388 24020003 */ addiu $v0, $zero, 3 +/* EA2C8C 8024238C 10620035 */ beq $v1, $v0, .L80242464 +/* EA2C90 80242390 0260202D */ daddu $a0, $s3, $zero +/* EA2C94 80242394 08090935 */ j .L802424D4 +/* EA2C98 80242398 00000000 */ nop +.L8024239C: +/* EA2C9C 8024239C 2402000E */ addiu $v0, $zero, 0xe +/* EA2CA0 802423A0 1062003F */ beq $v1, $v0, .L802424A0 +/* EA2CA4 802423A4 0062102A */ slt $v0, $v1, $v0 +/* EA2CA8 802423A8 14400038 */ bnez $v0, .L8024248C +/* EA2CAC 802423AC 0260202D */ daddu $a0, $s3, $zero +/* EA2CB0 802423B0 2402000F */ addiu $v0, $zero, 0xf +/* EA2CB4 802423B4 10620040 */ beq $v1, $v0, .L802424B8 +/* EA2CB8 802423B8 24020063 */ addiu $v0, $zero, 0x63 +/* EA2CBC 802423BC 10620043 */ beq $v1, $v0, .L802424CC +/* EA2CC0 802423C0 00000000 */ nop +/* EA2CC4 802423C4 08090935 */ j .L802424D4 +/* EA2CC8 802423C8 00000000 */ nop +.L802423CC: +/* EA2CCC 802423CC 0280282D */ daddu $a1, $s4, $zero +/* EA2CD0 802423D0 0C013670 */ jal func_8004D9C0 +/* EA2CD4 802423D4 02A0302D */ daddu $a2, $s5, $zero +/* EA2CD8 802423D8 96220086 */ lhu $v0, 0x86($s1) +/* EA2CDC 802423DC A64200A8 */ sh $v0, 0xa8($s2) +.L802423E0: +/* EA2CE0 802423E0 0260202D */ daddu $a0, $s3, $zero +/* EA2CE4 802423E4 0280282D */ daddu $a1, $s4, $zero +/* EA2CE8 802423E8 0C0136B6 */ jal func_8004DAD8 +/* EA2CEC 802423EC 02A0302D */ daddu $a2, $s5, $zero +/* EA2CF0 802423F0 08090935 */ j .L802424D4 +/* EA2CF4 802423F4 00000000 */ nop +.L802423F8: +/* EA2CF8 802423F8 0260202D */ daddu $a0, $s3, $zero +/* EA2CFC 802423FC 0280282D */ daddu $a1, $s4, $zero +/* EA2D00 80242400 0C0137D9 */ jal func_8004DF64 +/* EA2D04 80242404 02A0302D */ daddu $a2, $s5, $zero +/* EA2D08 80242408 8E230088 */ lw $v1, 0x88($s1) +/* EA2D0C 8024240C 24020006 */ addiu $v0, $zero, 6 +/* EA2D10 80242410 14620014 */ bne $v1, $v0, .L80242464 +/* EA2D14 80242414 0260202D */ daddu $a0, $s3, $zero +/* EA2D18 80242418 0C00AB3B */ jal func_8002ACEC +/* EA2D1C 8024241C 24040064 */ addiu $a0, $zero, 0x64 +/* EA2D20 80242420 28420021 */ slti $v0, $v0, 0x21 +/* EA2D24 80242424 5040000F */ beql $v0, $zero, .L80242464 +/* EA2D28 80242428 0260202D */ daddu $a0, $s3, $zero +/* EA2D2C 8024242C 8E22008C */ lw $v0, 0x8c($s1) +/* EA2D30 80242430 10400005 */ beqz $v0, .L80242448 +/* EA2D34 80242434 3C020055 */ lui $v0, 0x55 +/* EA2D38 80242438 3442002F */ ori $v0, $v0, 0x2f +/* EA2D3C 8024243C AE20008C */ sw $zero, 0x8c($s1) +/* EA2D40 80242440 08090915 */ j .L80242454 +/* EA2D44 80242444 A22000B5 */ sb $zero, 0xb5($s1) +.L80242448: +/* EA2D48 80242448 3442002E */ ori $v0, $v0, 0x2e +/* EA2D4C 8024244C AE30008C */ sw $s0, 0x8c($s1) +/* EA2D50 80242450 A23000B5 */ sb $s0, 0xb5($s1) +.L80242454: +/* EA2D54 80242454 AE420028 */ sw $v0, 0x28($s2) +/* EA2D58 80242458 24020007 */ addiu $v0, $zero, 7 +/* EA2D5C 8024245C 08090950 */ j .L80242540 +/* EA2D60 80242460 AE220090 */ sw $v0, 0x90($s1) +.L80242464: +/* EA2D64 80242464 0280282D */ daddu $a1, $s4, $zero +/* EA2D68 80242468 0C013809 */ jal func_8004E024 +/* EA2D6C 8024246C 02A0302D */ daddu $a2, $s5, $zero +/* EA2D70 80242470 08090935 */ j .L802424D4 +/* EA2D74 80242474 00000000 */ nop +.L80242478: +/* EA2D78 80242478 0260202D */ daddu $a0, $s3, $zero +/* EA2D7C 8024247C 0280282D */ daddu $a1, $s4, $zero +/* EA2D80 80242480 0C09075A */ jal func_80241D68_EA2668 +/* EA2D84 80242484 02A0302D */ daddu $a2, $s5, $zero +/* EA2D88 80242488 0260202D */ daddu $a0, $s3, $zero +.L8024248C: +/* EA2D8C 8024248C 0280282D */ daddu $a1, $s4, $zero +/* EA2D90 80242490 0C090779 */ jal func_80241DE4_EA26E4 +/* EA2D94 80242494 02A0302D */ daddu $a2, $s5, $zero +/* EA2D98 80242498 08090935 */ j .L802424D4 +/* EA2D9C 8024249C 00000000 */ nop +.L802424A0: +/* EA2DA0 802424A0 0260202D */ daddu $a0, $s3, $zero +/* EA2DA4 802424A4 0280282D */ daddu $a1, $s4, $zero +/* EA2DA8 802424A8 0C0907C6 */ jal func_80241F18_EA2818 +/* EA2DAC 802424AC 02A0302D */ daddu $a2, $s5, $zero +/* EA2DB0 802424B0 08090935 */ j .L802424D4 +/* EA2DB4 802424B4 00000000 */ nop +.L802424B8: +/* EA2DB8 802424B8 0280282D */ daddu $a1, $s4, $zero +/* EA2DBC 802424BC 0C09081F */ jal func_8024207C_EA297C +/* EA2DC0 802424C0 02A0302D */ daddu $a2, $s5, $zero +/* EA2DC4 802424C4 08090935 */ j .L802424D4 +/* EA2DC8 802424C8 00000000 */ nop +.L802424CC: +/* EA2DCC 802424CC 0C013AE3 */ jal func_8004EB8C +/* EA2DD0 802424D0 0260202D */ daddu $a0, $s3, $zero +.L802424D4: +/* EA2DD4 802424D4 8E230088 */ lw $v1, 0x88($s1) +/* EA2DD8 802424D8 24020006 */ addiu $v0, $zero, 6 +/* EA2DDC 802424DC 14620019 */ bne $v1, $v0, .L80242544 +/* EA2DE0 802424E0 0000102D */ daddu $v0, $zero, $zero +/* EA2DE4 802424E4 8E22008C */ lw $v0, 0x8c($s1) +/* EA2DE8 802424E8 10400003 */ beqz $v0, .L802424F8 +/* EA2DEC 802424EC 24020001 */ addiu $v0, $zero, 1 +/* EA2DF0 802424F0 0809093F */ j .L802424FC +/* EA2DF4 802424F4 A22200B5 */ sb $v0, 0xb5($s1) +.L802424F8: +/* EA2DF8 802424F8 A22000B5 */ sb $zero, 0xb5($s1) +.L802424FC: +/* EA2DFC 802424FC 8E22008C */ lw $v0, 0x8c($s1) +/* EA2E00 80242500 1040000F */ beqz $v0, .L80242540 +/* EA2E04 80242504 3C03FFAA */ lui $v1, 0xffaa +/* EA2E08 80242508 8E420028 */ lw $v0, 0x28($s2) +/* EA2E0C 8024250C 3463FFFC */ ori $v1, $v1, 0xfffc +/* EA2E10 80242510 00431821 */ addu $v1, $v0, $v1 +/* EA2E14 80242514 2C620015 */ sltiu $v0, $v1, 0x15 +/* EA2E18 80242518 10400009 */ beqz $v0, .L80242540 +/* EA2E1C 8024251C 00031080 */ sll $v0, $v1, 2 +/* EA2E20 80242520 3C018024 */ lui $at, %hi(D_80246650) +/* EA2E24 80242524 00220821 */ addu $at, $at, $v0 +/* EA2E28 80242528 8C226650 */ lw $v0, %lo(D_80246650)($at) +/* EA2E2C 8024252C 00400008 */ jr $v0 +/* EA2E30 80242530 00000000 */ nop +/* EA2E34 80242534 8E420028 */ lw $v0, 0x28($s2) +/* EA2E38 80242538 24420001 */ addiu $v0, $v0, 1 +/* EA2E3C 8024253C AE420028 */ sw $v0, 0x28($s2) +.L80242540: +/* EA2E40 80242540 0000102D */ daddu $v0, $zero, $zero +.L80242544: +/* EA2E44 80242544 8FBF0068 */ lw $ra, 0x68($sp) +/* EA2E48 80242548 8FB50064 */ lw $s5, 0x64($sp) +/* EA2E4C 8024254C 8FB40060 */ lw $s4, 0x60($sp) +/* EA2E50 80242550 8FB3005C */ lw $s3, 0x5c($sp) +/* EA2E54 80242554 8FB20058 */ lw $s2, 0x58($sp) +/* EA2E58 80242558 8FB10054 */ lw $s1, 0x54($sp) +/* EA2E5C 8024255C 8FB00050 */ lw $s0, 0x50($sp) +/* EA2E60 80242560 03E00008 */ jr $ra +/* EA2E64 80242564 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/code_EA0C10/func_80242568_EA2E68.s b/asm/nonmatchings/code_EA0C10/func_80242568_EA2E68.s new file mode 100644 index 0000000000..78f9d3e50b --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80242568_EA2E68.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242568_EA2E68 +/* EA2E68 80242568 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA2E6C 8024256C AFBF0010 */ sw $ra, 0x10($sp) +/* EA2E70 80242570 0C00F94D */ jal func_8003E534 +/* EA2E74 80242574 8C84014C */ lw $a0, 0x14c($a0) +/* EA2E78 80242578 0040182D */ daddu $v1, $v0, $zero +/* EA2E7C 8024257C 846200A8 */ lh $v0, 0xa8($v1) +/* EA2E80 80242580 C462003C */ lwc1 $f2, 0x3c($v1) +/* EA2E84 80242584 906400A9 */ lbu $a0, 0xa9($v1) +/* EA2E88 80242588 44820000 */ mtc1 $v0, $f0 +/* EA2E8C 8024258C 00000000 */ nop +/* EA2E90 80242590 46800020 */ cvt.s.w $f0, $f0 +/* EA2E94 80242594 46001081 */ sub.s $f2, $f2, $f0 +/* EA2E98 80242598 A06400AB */ sb $a0, 0xab($v1) +/* EA2E9C 8024259C E462003C */ swc1 $f2, 0x3c($v1) +/* EA2EA0 802425A0 8FBF0010 */ lw $ra, 0x10($sp) +/* EA2EA4 802425A4 24020002 */ addiu $v0, $zero, 2 +/* EA2EA8 802425A8 03E00008 */ jr $ra +/* EA2EAC 802425AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA0C10/func_802425B0_EA2EB0.s b/asm/nonmatchings/code_EA0C10/func_802425B0_EA2EB0.s new file mode 100644 index 0000000000..121028c538 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_802425B0_EA2EB0.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425B0_EA2EB0 +/* EA2EB0 802425B0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA2EB4 802425B4 AFBF0010 */ sw $ra, 0x10($sp) +/* EA2EB8 802425B8 0C00F94D */ jal func_8003E534 +/* EA2EBC 802425BC 8C84014C */ lw $a0, 0x14c($a0) +/* EA2EC0 802425C0 3C038011 */ lui $v1, %hi(D_80117578) +/* EA2EC4 802425C4 24637578 */ addiu $v1, $v1, %lo(D_80117578) +/* EA2EC8 802425C8 C44C0038 */ lwc1 $f12, 0x38($v0) +/* EA2ECC 802425CC C44E0040 */ lwc1 $f14, 0x40($v0) +/* EA2ED0 802425D0 8C660028 */ lw $a2, 0x28($v1) +/* EA2ED4 802425D4 0C00AC71 */ jal func_8002B1C4 +/* EA2ED8 802425D8 8C670030 */ lw $a3, 0x30($v1) +/* EA2EDC 802425DC 3C014248 */ lui $at, 0x4248 +/* EA2EE0 802425E0 44811000 */ mtc1 $at, $f2 +/* EA2EE4 802425E4 00000000 */ nop +/* EA2EE8 802425E8 4602003C */ c.lt.s $f0, $f2 +/* EA2EEC 802425EC 00000000 */ nop +/* EA2EF0 802425F0 45010002 */ bc1t .L802425FC +/* EA2EF4 802425F4 24020002 */ addiu $v0, $zero, 2 +/* EA2EF8 802425F8 0000102D */ daddu $v0, $zero, $zero +.L802425FC: +/* EA2EFC 802425FC 8FBF0010 */ lw $ra, 0x10($sp) +/* EA2F00 80242600 03E00008 */ jr $ra +/* EA2F04 80242604 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA0C10/func_80242608_EA2F08.s b/asm/nonmatchings/code_EA0C10/func_80242608_EA2F08.s new file mode 100644 index 0000000000..155df154c7 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80242608_EA2F08.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242608_EA2F08 +/* EA2F08 80242608 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA2F0C 8024260C 0080102D */ daddu $v0, $a0, $zero +/* EA2F10 80242610 AFB00010 */ sw $s0, 0x10($sp) +/* EA2F14 80242614 AFBF0018 */ sw $ra, 0x18($sp) +/* EA2F18 80242618 AFB10014 */ sw $s1, 0x14($sp) +/* EA2F1C 8024261C 8C44014C */ lw $a0, 0x14c($v0) +/* EA2F20 80242620 8C510148 */ lw $s1, 0x148($v0) +/* EA2F24 80242624 0C00F94D */ jal func_8003E534 +/* EA2F28 80242628 00A0802D */ daddu $s0, $a1, $zero +/* EA2F2C 8024262C 56000001 */ bnel $s0, $zero, .L80242634 +/* EA2F30 80242630 A04000AB */ sb $zero, 0xab($v0) +.L80242634: +/* EA2F34 80242634 8C420000 */ lw $v0, ($v0) +/* EA2F38 80242638 30421000 */ andi $v0, $v0, 0x1000 +/* EA2F3C 8024263C 1040000A */ beqz $v0, .L80242668 +/* EA2F40 80242640 0000102D */ daddu $v0, $zero, $zero +/* EA2F44 80242644 82220004 */ lb $v0, 4($s1) +/* EA2F48 80242648 3C03800B */ lui $v1, %hi(D_800B7EF0) +/* EA2F4C 8024264C 24637EF0 */ addiu $v1, $v1, %lo(D_800B7EF0) +/* EA2F50 80242650 00021080 */ sll $v0, $v0, 2 +/* EA2F54 80242654 00431021 */ addu $v0, $v0, $v1 +/* EA2F58 80242658 8C440028 */ lw $a0, 0x28($v0) +/* EA2F5C 8024265C 9623006E */ lhu $v1, 0x6e($s1) +/* EA2F60 80242660 24020002 */ addiu $v0, $zero, 2 +/* EA2F64 80242664 A4830044 */ sh $v1, 0x44($a0) +.L80242668: +/* EA2F68 80242668 8FBF0018 */ lw $ra, 0x18($sp) +/* EA2F6C 8024266C 8FB10014 */ lw $s1, 0x14($sp) +/* EA2F70 80242670 8FB00010 */ lw $s0, 0x10($sp) +/* EA2F74 80242674 03E00008 */ jr $ra +/* EA2F78 80242678 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_8024267C_EA2F7C.s b/asm/nonmatchings/code_EA0C10/func_8024267C_EA2F7C.s new file mode 100644 index 0000000000..e38d8d9966 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_8024267C_EA2F7C.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024267C_EA2F7C +/* EA2F7C 8024267C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA2F80 80242680 AFB00010 */ sw $s0, 0x10($sp) +/* EA2F84 80242684 3C108024 */ lui $s0, %hi(D_80244154) +/* EA2F88 80242688 26104154 */ addiu $s0, $s0, %lo(D_80244154) +/* EA2F8C 8024268C AFBF0018 */ sw $ra, 0x18($sp) +/* EA2F90 80242690 AFB10014 */ sw $s1, 0x14($sp) +/* EA2F94 80242694 8E020000 */ lw $v0, ($s0) +/* EA2F98 80242698 14400010 */ bnez $v0, .L802426DC +/* EA2F9C 8024269C 0080882D */ daddu $s1, $a0, $zero +/* EA2FA0 802426A0 0C00AFF5 */ jal func_8002BFD4 +/* EA2FA4 802426A4 24040040 */ addiu $a0, $zero, 0x40 +/* EA2FA8 802426A8 AE020000 */ sw $v0, ($s0) +/* EA2FAC 802426AC 0000182D */ daddu $v1, $zero, $zero +/* EA2FB0 802426B0 0040282D */ daddu $a1, $v0, $zero +/* EA2FB4 802426B4 0220202D */ daddu $a0, $s1, $zero +.L802426B8: +/* EA2FB8 802426B8 8C820084 */ lw $v0, 0x84($a0) +/* EA2FBC 802426BC 24840004 */ addiu $a0, $a0, 4 +/* EA2FC0 802426C0 24630001 */ addiu $v1, $v1, 1 +/* EA2FC4 802426C4 ACA20000 */ sw $v0, ($a1) +/* EA2FC8 802426C8 28620010 */ slti $v0, $v1, 0x10 +/* EA2FCC 802426CC 1440FFFA */ bnez $v0, .L802426B8 +/* EA2FD0 802426D0 24A50004 */ addiu $a1, $a1, 4 +/* EA2FD4 802426D4 080909C6 */ j .L80242718 +/* EA2FD8 802426D8 00000000 */ nop +.L802426DC: +/* EA2FDC 802426DC 0000182D */ daddu $v1, $zero, $zero +/* EA2FE0 802426E0 0040282D */ daddu $a1, $v0, $zero +/* EA2FE4 802426E4 0220202D */ daddu $a0, $s1, $zero +.L802426E8: +/* EA2FE8 802426E8 8CA20000 */ lw $v0, ($a1) +/* EA2FEC 802426EC 24A50004 */ addiu $a1, $a1, 4 +/* EA2FF0 802426F0 24630001 */ addiu $v1, $v1, 1 +/* EA2FF4 802426F4 AC820084 */ sw $v0, 0x84($a0) +/* EA2FF8 802426F8 28620010 */ slti $v0, $v1, 0x10 +/* EA2FFC 802426FC 1440FFFA */ bnez $v0, .L802426E8 +/* EA3000 80242700 24840004 */ addiu $a0, $a0, 4 +/* EA3004 80242704 3C108024 */ lui $s0, %hi(D_80244154) +/* EA3008 80242708 26104154 */ addiu $s0, $s0, %lo(D_80244154) +/* EA300C 8024270C 0C00B007 */ jal func_8002C01C +/* EA3010 80242710 8E040000 */ lw $a0, ($s0) +/* EA3014 80242714 AE000000 */ sw $zero, ($s0) +.L80242718: +/* EA3018 80242718 8FBF0018 */ lw $ra, 0x18($sp) +/* EA301C 8024271C 8FB10014 */ lw $s1, 0x14($sp) +/* EA3020 80242720 8FB00010 */ lw $s0, 0x10($sp) +/* EA3024 80242724 24020002 */ addiu $v0, $zero, 2 +/* EA3028 80242728 03E00008 */ jr $ra +/* EA302C 8024272C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_80242730_EA3030.s b/asm/nonmatchings/code_EA0C10/func_80242730_EA3030.s new file mode 100644 index 0000000000..5b49def3a2 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80242730_EA3030.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242730_EA3030 +/* EA3030 80242730 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA3034 80242734 AFB00010 */ sw $s0, 0x10($sp) +/* EA3038 80242738 0080802D */ daddu $s0, $a0, $zero +/* EA303C 8024273C AFBF0018 */ sw $ra, 0x18($sp) +/* EA3040 80242740 AFB10014 */ sw $s1, 0x14($sp) +/* EA3044 80242744 8E02000C */ lw $v0, 0xc($s0) +/* EA3048 80242748 8C510000 */ lw $s1, ($v0) +/* EA304C 8024274C 0C0B53A3 */ jal func_802D4E8C +/* EA3050 80242750 0220282D */ daddu $a1, $s1, $zero +/* EA3054 80242754 3C03FFF0 */ lui $v1, 0xfff0 +/* EA3058 80242758 3463FFFF */ ori $v1, $v1, 0xffff +/* EA305C 8024275C 0200202D */ daddu $a0, $s0, $zero +/* EA3060 80242760 00431024 */ and $v0, $v0, $v1 +/* EA3064 80242764 00021140 */ sll $v0, $v0, 5 +/* EA3068 80242768 3C068009 */ lui $a2, %hi(D_8008D2C0) +/* EA306C 8024276C 00C23021 */ addu $a2, $a2, $v0 +/* EA3070 80242770 8CC6D2C0 */ lw $a2, %lo(D_8008D2C0)($a2) +/* EA3074 80242774 0C0B551A */ jal func_802D5468 +/* EA3078 80242778 0220282D */ daddu $a1, $s1, $zero +/* EA307C 8024277C 8FBF0018 */ lw $ra, 0x18($sp) +/* EA3080 80242780 8FB10014 */ lw $s1, 0x14($sp) +/* EA3084 80242784 8FB00010 */ lw $s0, 0x10($sp) +/* EA3088 80242788 24020002 */ addiu $v0, $zero, 2 +/* EA308C 8024278C 03E00008 */ jr $ra +/* EA3090 80242790 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_80242794_EA3094.s b/asm/nonmatchings/code_EA0C10/func_80242794_EA3094.s new file mode 100644 index 0000000000..b434d2780d --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80242794_EA3094.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242794_EA3094 +/* EA3094 80242794 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA3098 80242798 AFB10014 */ sw $s1, 0x14($sp) +/* EA309C 8024279C 0080882D */ daddu $s1, $a0, $zero +/* EA30A0 802427A0 AFBF0018 */ sw $ra, 0x18($sp) +/* EA30A4 802427A4 AFB00010 */ sw $s0, 0x10($sp) +/* EA30A8 802427A8 8E30000C */ lw $s0, 0xc($s1) +/* EA30AC 802427AC 8E050000 */ lw $a1, ($s0) +/* EA30B0 802427B0 0C0B53A3 */ jal func_802D4E8C +/* EA30B4 802427B4 26100004 */ addiu $s0, $s0, 4 +/* EA30B8 802427B8 0C00F94D */ jal func_8003E534 +/* EA30BC 802427BC 0040202D */ daddu $a0, $v0, $zero +/* EA30C0 802427C0 10400005 */ beqz $v0, .L802427D8 +/* EA30C4 802427C4 00000000 */ nop +/* EA30C8 802427C8 8E050000 */ lw $a1, ($s0) +/* EA30CC 802427CC 844600A8 */ lh $a2, 0xa8($v0) +/* EA30D0 802427D0 0C0B551A */ jal func_802D5468 +/* EA30D4 802427D4 0220202D */ daddu $a0, $s1, $zero +.L802427D8: +/* EA30D8 802427D8 8FBF0018 */ lw $ra, 0x18($sp) +/* EA30DC 802427DC 8FB10014 */ lw $s1, 0x14($sp) +/* EA30E0 802427E0 8FB00010 */ lw $s0, 0x10($sp) +/* EA30E4 802427E4 24020002 */ addiu $v0, $zero, 2 +/* EA30E8 802427E8 03E00008 */ jr $ra +/* EA30EC 802427EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_802427F0_EA30F0.s b/asm/nonmatchings/code_EA0C10/func_802427F0_EA30F0.s new file mode 100644 index 0000000000..921eac345a --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_802427F0_EA30F0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427F0_EA30F0 +/* EA30F0 802427F0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EA30F4 802427F4 AFB10014 */ sw $s1, 0x14($sp) +/* EA30F8 802427F8 0080882D */ daddu $s1, $a0, $zero +/* EA30FC 802427FC AFBF0024 */ sw $ra, 0x24($sp) +/* EA3100 80242800 AFB40020 */ sw $s4, 0x20($sp) +/* EA3104 80242804 AFB3001C */ sw $s3, 0x1c($sp) +/* EA3108 80242808 AFB20018 */ sw $s2, 0x18($sp) +/* EA310C 8024280C AFB00010 */ sw $s0, 0x10($sp) +/* EA3110 80242810 F7BC0048 */ sdc1 $f28, 0x48($sp) +/* EA3114 80242814 F7BA0040 */ sdc1 $f26, 0x40($sp) +/* EA3118 80242818 F7B80038 */ sdc1 $f24, 0x38($sp) +/* EA311C 8024281C F7B60030 */ sdc1 $f22, 0x30($sp) +/* EA3120 80242820 F7B40028 */ sdc1 $f20, 0x28($sp) +/* EA3124 80242824 8E30000C */ lw $s0, 0xc($s1) +/* EA3128 80242828 8E130000 */ lw $s3, ($s0) +/* EA312C 8024282C 26100004 */ addiu $s0, $s0, 4 +/* EA3130 80242830 0C0B53A3 */ jal func_802D4E8C +/* EA3134 80242834 0260282D */ daddu $a1, $s3, $zero +/* EA3138 80242838 4482E000 */ mtc1 $v0, $f28 +/* EA313C 8024283C 00000000 */ nop +/* EA3140 80242840 4680E720 */ cvt.s.w $f28, $f28 +/* EA3144 80242844 8E140000 */ lw $s4, ($s0) +/* EA3148 80242848 26100004 */ addiu $s0, $s0, 4 +/* EA314C 8024284C 0220202D */ daddu $a0, $s1, $zero +/* EA3150 80242850 0C0B53A3 */ jal func_802D4E8C +/* EA3154 80242854 0280282D */ daddu $a1, $s4, $zero +/* EA3158 80242858 4482D000 */ mtc1 $v0, $f26 +/* EA315C 8024285C 00000000 */ nop +/* EA3160 80242860 4680D6A0 */ cvt.s.w $f26, $f26 +/* EA3164 80242864 8E100000 */ lw $s0, ($s0) +/* EA3168 80242868 0220202D */ daddu $a0, $s1, $zero +/* EA316C 8024286C 0C0B53A3 */ jal func_802D4E8C +/* EA3170 80242870 0200282D */ daddu $a1, $s0, $zero +/* EA3174 80242874 4482C000 */ mtc1 $v0, $f24 +/* EA3178 80242878 00000000 */ nop +/* EA317C 8024287C 4680C620 */ cvt.s.w $f24, $f24 +/* EA3180 80242880 3C128011 */ lui $s2, %hi(D_80117578) +/* EA3184 80242884 26527578 */ addiu $s2, $s2, %lo(D_80117578) +/* EA3188 80242888 3C038008 */ lui $v1, %hi(D_8007C760) +/* EA318C 8024288C 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EA3190 80242890 C64200A8 */ lwc1 $f2, 0xa8($s2) +/* EA3194 80242894 44800000 */ mtc1 $zero, $f0 +/* EA3198 80242898 00031080 */ sll $v0, $v1, 2 +/* EA319C 8024289C 00431021 */ addu $v0, $v0, $v1 +/* EA31A0 802428A0 00021080 */ sll $v0, $v0, 2 +/* EA31A4 802428A4 00431023 */ subu $v0, $v0, $v1 +/* EA31A8 802428A8 000218C0 */ sll $v1, $v0, 3 +/* EA31AC 802428AC 00431021 */ addu $v0, $v0, $v1 +/* EA31B0 802428B0 000210C0 */ sll $v0, $v0, 3 +/* EA31B4 802428B4 46001032 */ c.eq.s $f2, $f0 +/* EA31B8 802428B8 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EA31BC 802428BC 00220821 */ addu $at, $at, $v0 +/* EA31C0 802428C0 C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) +/* EA31C4 802428C4 45000005 */ bc1f .L802428DC +/* EA31C8 802428C8 00000000 */ nop +/* EA31CC 802428CC 3C0142C8 */ lui $at, 0x42c8 +/* EA31D0 802428D0 44810000 */ mtc1 $at, $f0 +/* EA31D4 802428D4 08090A3B */ j .L802428EC +/* EA31D8 802428D8 4600B581 */ sub.s $f22, $f22, $f0 +.L802428DC: +/* EA31DC 802428DC 3C0142C8 */ lui $at, 0x42c8 +/* EA31E0 802428E0 44810000 */ mtc1 $at, $f0 +/* EA31E4 802428E4 00000000 */ nop +/* EA31E8 802428E8 4600B580 */ add.s $f22, $f22, $f0 +.L802428EC: +/* EA31EC 802428EC 0C00AB85 */ jal func_8002AE14 +/* EA31F0 802428F0 4600B306 */ mov.s $f12, $f22 +/* EA31F4 802428F4 46000586 */ mov.s $f22, $f0 +/* EA31F8 802428F8 3C014170 */ lui $at, 0x4170 +/* EA31FC 802428FC 4481A000 */ mtc1 $at, $f20 +/* EA3200 80242900 0C00AD77 */ jal func_8002B5DC +/* EA3204 80242904 4600B306 */ mov.s $f12, $f22 +/* EA3208 80242908 46140002 */ mul.s $f0, $f0, $f20 +/* EA320C 8024290C 00000000 */ nop +/* EA3210 80242910 864200B0 */ lh $v0, 0xb0($s2) +/* EA3214 80242914 3C013F00 */ lui $at, 0x3f00 +/* EA3218 80242918 44812000 */ mtc1 $at, $f4 +/* EA321C 8024291C 44821000 */ mtc1 $v0, $f2 +/* EA3220 80242920 00000000 */ nop +/* EA3224 80242924 468010A0 */ cvt.s.w $f2, $f2 +/* EA3228 80242928 46041082 */ mul.s $f2, $f2, $f4 +/* EA322C 8024292C 00000000 */ nop +/* EA3230 80242930 4600E700 */ add.s $f28, $f28, $f0 +/* EA3234 80242934 4602D680 */ add.s $f26, $f26, $f2 +/* EA3238 80242938 0C00AD90 */ jal func_8002B640 +/* EA323C 8024293C 4600B306 */ mov.s $f12, $f22 +/* EA3240 80242940 46140002 */ mul.s $f0, $f0, $f20 +/* EA3244 80242944 00000000 */ nop +/* EA3248 80242948 0220202D */ daddu $a0, $s1, $zero +/* EA324C 8024294C 0260282D */ daddu $a1, $s3, $zero +/* EA3250 80242950 4600E18D */ trunc.w.s $f6, $f28 +/* EA3254 80242954 44063000 */ mfc1 $a2, $f6 +/* EA3258 80242958 0C0B551A */ jal func_802D5468 +/* EA325C 8024295C 4600C601 */ sub.s $f24, $f24, $f0 +/* EA3260 80242960 0220202D */ daddu $a0, $s1, $zero +/* EA3264 80242964 4600D18D */ trunc.w.s $f6, $f26 +/* EA3268 80242968 44063000 */ mfc1 $a2, $f6 +/* EA326C 8024296C 0C0B551A */ jal func_802D5468 +/* EA3270 80242970 0280282D */ daddu $a1, $s4, $zero +/* EA3274 80242974 0220202D */ daddu $a0, $s1, $zero +/* EA3278 80242978 4600C18D */ trunc.w.s $f6, $f24 +/* EA327C 8024297C 44063000 */ mfc1 $a2, $f6 +/* EA3280 80242980 0C0B551A */ jal func_802D5468 +/* EA3284 80242984 0200282D */ daddu $a1, $s0, $zero +/* EA3288 80242988 8FBF0024 */ lw $ra, 0x24($sp) +/* EA328C 8024298C 8FB40020 */ lw $s4, 0x20($sp) +/* EA3290 80242990 8FB3001C */ lw $s3, 0x1c($sp) +/* EA3294 80242994 8FB20018 */ lw $s2, 0x18($sp) +/* EA3298 80242998 8FB10014 */ lw $s1, 0x14($sp) +/* EA329C 8024299C 8FB00010 */ lw $s0, 0x10($sp) +/* EA32A0 802429A0 D7BC0048 */ ldc1 $f28, 0x48($sp) +/* EA32A4 802429A4 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* EA32A8 802429A8 D7B80038 */ ldc1 $f24, 0x38($sp) +/* EA32AC 802429AC D7B60030 */ ldc1 $f22, 0x30($sp) +/* EA32B0 802429B0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* EA32B4 802429B4 24020002 */ addiu $v0, $zero, 2 +/* EA32B8 802429B8 03E00008 */ jr $ra +/* EA32BC 802429BC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EA0C10/func_802429C0_EA32C0.s b/asm/nonmatchings/code_EA0C10/func_802429C0_EA32C0.s new file mode 100644 index 0000000000..fea5569dcd --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_802429C0_EA32C0.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802429C0_EA32C0 +/* EA32C0 802429C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA32C4 802429C4 AFBF0010 */ sw $ra, 0x10($sp) +/* EA32C8 802429C8 10A00003 */ beqz $a1, .L802429D8 +/* EA32CC 802429CC 8C86000C */ lw $a2, 0xc($a0) +/* EA32D0 802429D0 3C018024 */ lui $at, %hi(D_802441B8) +/* EA32D4 802429D4 AC2041B8 */ sw $zero, %lo(D_802441B8)($at) +.L802429D8: +/* EA32D8 802429D8 3C038024 */ lui $v1, %hi(D_802441B8) +/* EA32DC 802429DC 246341B8 */ addiu $v1, $v1, %lo(D_802441B8) +/* EA32E0 802429E0 8C620000 */ lw $v0, ($v1) +/* EA32E4 802429E4 54400003 */ bnel $v0, $zero, .L802429F4 +/* EA32E8 802429E8 AC600000 */ sw $zero, ($v1) +/* EA32EC 802429EC 08090A82 */ j .L80242A08 +/* EA32F0 802429F0 0000102D */ daddu $v0, $zero, $zero +.L802429F4: +/* EA32F4 802429F4 8CC50000 */ lw $a1, ($a2) +/* EA32F8 802429F8 3C068024 */ lui $a2, %hi(D_802441BC) +/* EA32FC 802429FC 0C0B551A */ jal func_802D5468 +/* EA3300 80242A00 8CC641BC */ lw $a2, %lo(D_802441BC)($a2) +/* EA3304 80242A04 24020002 */ addiu $v0, $zero, 2 +.L80242A08: +/* EA3308 80242A08 8FBF0010 */ lw $ra, 0x10($sp) +/* EA330C 80242A0C 03E00008 */ jr $ra +/* EA3310 80242A10 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA0C10/func_80242A14_EA3314.s b/asm/nonmatchings/code_EA0C10/func_80242A14_EA3314.s new file mode 100644 index 0000000000..72a482003f --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80242A14_EA3314.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A14_EA3314 +/* EA3314 80242A14 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA3318 80242A18 AFBF0010 */ sw $ra, 0x10($sp) +/* EA331C 80242A1C 8C82000C */ lw $v0, 0xc($a0) +/* EA3320 80242A20 0C0B53A3 */ jal func_802D4E8C +/* EA3324 80242A24 8C450000 */ lw $a1, ($v0) +/* EA3328 80242A28 3C018024 */ lui $at, %hi(D_802441BC) +/* EA332C 80242A2C AC2241BC */ sw $v0, %lo(D_802441BC)($at) +/* EA3330 80242A30 24020002 */ addiu $v0, $zero, 2 +/* EA3334 80242A34 8FBF0010 */ lw $ra, 0x10($sp) +/* EA3338 80242A38 24030001 */ addiu $v1, $zero, 1 +/* EA333C 80242A3C 3C018024 */ lui $at, %hi(D_802441B8) +/* EA3340 80242A40 AC2341B8 */ sw $v1, %lo(D_802441B8)($at) +/* EA3344 80242A44 03E00008 */ jr $ra +/* EA3348 80242A48 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA0C10/func_80242A4C_EA334C.s b/asm/nonmatchings/code_EA0C10/func_80242A4C_EA334C.s new file mode 100644 index 0000000000..15cd9086b4 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80242A4C_EA334C.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A4C_EA334C +/* EA334C 80242A4C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA3350 80242A50 AFBF0010 */ sw $ra, 0x10($sp) +/* EA3354 80242A54 8C82000C */ lw $v0, 0xc($a0) +/* EA3358 80242A58 0C0B53A3 */ jal func_802D4E8C +/* EA335C 80242A5C 8C450000 */ lw $a1, ($v0) +/* EA3360 80242A60 0040182D */ daddu $v1, $v0, $zero +/* EA3364 80242A64 10600012 */ beqz $v1, .L80242AB0 +/* EA3368 80242A68 0000202D */ daddu $a0, $zero, $zero +/* EA336C 80242A6C 8C620000 */ lw $v0, ($v1) +/* EA3370 80242A70 5040000A */ beql $v0, $zero, .L80242A9C +/* EA3374 80242A74 00041080 */ sll $v0, $a0, 2 +/* EA3378 80242A78 3C058024 */ lui $a1, %hi(D_802466D0) +/* EA337C 80242A7C 24A566D0 */ addiu $a1, $a1, %lo(D_802466D0) +.L80242A80: +/* EA3380 80242A80 24630004 */ addiu $v1, $v1, 4 +/* EA3384 80242A84 24840001 */ addiu $a0, $a0, 1 +/* EA3388 80242A88 ACA20000 */ sw $v0, ($a1) +/* EA338C 80242A8C 8C620000 */ lw $v0, ($v1) +/* EA3390 80242A90 1440FFFB */ bnez $v0, .L80242A80 +/* EA3394 80242A94 24A50004 */ addiu $a1, $a1, 4 +/* EA3398 80242A98 00041080 */ sll $v0, $a0, 2 +.L80242A9C: +/* EA339C 80242A9C 3C018024 */ lui $at, %hi(D_802466D0) +/* EA33A0 80242AA0 00220821 */ addu $at, $at, $v0 +/* EA33A4 80242AA4 AC2066D0 */ sw $zero, %lo(D_802466D0)($at) +/* EA33A8 80242AA8 08090AB6 */ j .L80242AD8 +/* EA33AC 80242AAC 00000000 */ nop +.L80242AB0: +/* EA33B0 80242AB0 3C038024 */ lui $v1, %hi(D_802466D0) +/* EA33B4 80242AB4 246366D0 */ addiu $v1, $v1, %lo(D_802466D0) +/* EA33B8 80242AB8 0060282D */ daddu $a1, $v1, $zero +.L80242ABC: +/* EA33BC 80242ABC 24820010 */ addiu $v0, $a0, 0x10 +/* EA33C0 80242AC0 AC620000 */ sw $v0, ($v1) +/* EA33C4 80242AC4 24630004 */ addiu $v1, $v1, 4 +/* EA33C8 80242AC8 24840001 */ addiu $a0, $a0, 1 +/* EA33CC 80242ACC 28820070 */ slti $v0, $a0, 0x70 +/* EA33D0 80242AD0 1440FFFA */ bnez $v0, .L80242ABC +/* EA33D4 80242AD4 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80242AD8: +/* EA33D8 80242AD8 8FBF0010 */ lw $ra, 0x10($sp) +/* EA33DC 80242ADC 24020002 */ addiu $v0, $zero, 2 +/* EA33E0 80242AE0 03E00008 */ jr $ra +/* EA33E4 80242AE4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA0C10/func_80242AE8_EA33E8.s b/asm/nonmatchings/code_EA0C10/func_80242AE8_EA33E8.s new file mode 100644 index 0000000000..aae2c4d786 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80242AE8_EA33E8.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242AE8_EA33E8 +/* EA33E8 80242AE8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA33EC 80242AEC AFB10014 */ sw $s1, 0x14($sp) +/* EA33F0 80242AF0 0080882D */ daddu $s1, $a0, $zero +/* EA33F4 80242AF4 AFBF0018 */ sw $ra, 0x18($sp) +/* EA33F8 80242AF8 AFB00010 */ sw $s0, 0x10($sp) +/* EA33FC 80242AFC 8E30000C */ lw $s0, 0xc($s1) +/* EA3400 80242B00 8E050000 */ lw $a1, ($s0) +/* EA3404 80242B04 0C0B53A3 */ jal func_802D4E8C +/* EA3408 80242B08 26100004 */ addiu $s0, $s0, 4 +/* EA340C 80242B0C AE22008C */ sw $v0, 0x8c($s1) +/* EA3410 80242B10 8E050000 */ lw $a1, ($s0) +/* EA3414 80242B14 26100004 */ addiu $s0, $s0, 4 +/* EA3418 80242B18 0C0B53A3 */ jal func_802D4E8C +/* EA341C 80242B1C 0220202D */ daddu $a0, $s1, $zero +/* EA3420 80242B20 AE220090 */ sw $v0, 0x90($s1) +/* EA3424 80242B24 8E050000 */ lw $a1, ($s0) +/* EA3428 80242B28 26100004 */ addiu $s0, $s0, 4 +/* EA342C 80242B2C 0C0B53A3 */ jal func_802D4E8C +/* EA3430 80242B30 0220202D */ daddu $a0, $s1, $zero +/* EA3434 80242B34 AE220094 */ sw $v0, 0x94($s1) +/* EA3438 80242B38 8E050000 */ lw $a1, ($s0) +/* EA343C 80242B3C 26100004 */ addiu $s0, $s0, 4 +/* EA3440 80242B40 0C0B53A3 */ jal func_802D4E8C +/* EA3444 80242B44 0220202D */ daddu $a0, $s1, $zero +/* EA3448 80242B48 AE220098 */ sw $v0, 0x98($s1) +/* EA344C 80242B4C 8E050000 */ lw $a1, ($s0) +/* EA3450 80242B50 26100004 */ addiu $s0, $s0, 4 +/* EA3454 80242B54 0C0B53A3 */ jal func_802D4E8C +/* EA3458 80242B58 0220202D */ daddu $a0, $s1, $zero +/* EA345C 80242B5C AE22009C */ sw $v0, 0x9c($s1) +/* EA3460 80242B60 8E050000 */ lw $a1, ($s0) +/* EA3464 80242B64 26100004 */ addiu $s0, $s0, 4 +/* EA3468 80242B68 0C0B53A3 */ jal func_802D4E8C +/* EA346C 80242B6C 0220202D */ daddu $a0, $s1, $zero +/* EA3470 80242B70 AE2200A0 */ sw $v0, 0xa0($s1) +/* EA3474 80242B74 8E050000 */ lw $a1, ($s0) +/* EA3478 80242B78 26100004 */ addiu $s0, $s0, 4 +/* EA347C 80242B7C 0C0B53A3 */ jal func_802D4E8C +/* EA3480 80242B80 0220202D */ daddu $a0, $s1, $zero +/* EA3484 80242B84 AE2200A4 */ sw $v0, 0xa4($s1) +/* EA3488 80242B88 8E050000 */ lw $a1, ($s0) +/* EA348C 80242B8C 26100004 */ addiu $s0, $s0, 4 +/* EA3490 80242B90 0C0B53A3 */ jal func_802D4E8C +/* EA3494 80242B94 0220202D */ daddu $a0, $s1, $zero +/* EA3498 80242B98 AE2200A8 */ sw $v0, 0xa8($s1) +/* EA349C 80242B9C 8E050000 */ lw $a1, ($s0) +/* EA34A0 80242BA0 26100004 */ addiu $s0, $s0, 4 +/* EA34A4 80242BA4 0C0B53A3 */ jal func_802D4E8C +/* EA34A8 80242BA8 0220202D */ daddu $a0, $s1, $zero +/* EA34AC 80242BAC AE2200AC */ sw $v0, 0xac($s1) +/* EA34B0 80242BB0 8E050000 */ lw $a1, ($s0) +/* EA34B4 80242BB4 0C0B53A3 */ jal func_802D4E8C +/* EA34B8 80242BB8 0220202D */ daddu $a0, $s1, $zero +/* EA34BC 80242BBC AE2200B0 */ sw $v0, 0xb0($s1) +/* EA34C0 80242BC0 8FBF0018 */ lw $ra, 0x18($sp) +/* EA34C4 80242BC4 8FB10014 */ lw $s1, 0x14($sp) +/* EA34C8 80242BC8 8FB00010 */ lw $s0, 0x10($sp) +/* EA34CC 80242BCC 24020002 */ addiu $v0, $zero, 2 +/* EA34D0 80242BD0 03E00008 */ jr $ra +/* EA34D4 80242BD4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA0C10/func_80242BD8_EA34D8.s b/asm/nonmatchings/code_EA0C10/func_80242BD8_EA34D8.s new file mode 100644 index 0000000000..b5eaaba8c6 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80242BD8_EA34D8.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242BD8_EA34D8 +/* EA34D8 80242BD8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EA34DC 80242BDC AFB1001C */ sw $s1, 0x1c($sp) +/* EA34E0 80242BE0 0080882D */ daddu $s1, $a0, $zero +/* EA34E4 80242BE4 AFBF0034 */ sw $ra, 0x34($sp) +/* EA34E8 80242BE8 AFB60030 */ sw $s6, 0x30($sp) +/* EA34EC 80242BEC AFB5002C */ sw $s5, 0x2c($sp) +/* EA34F0 80242BF0 AFB40028 */ sw $s4, 0x28($sp) +/* EA34F4 80242BF4 AFB30024 */ sw $s3, 0x24($sp) +/* EA34F8 80242BF8 AFB20020 */ sw $s2, 0x20($sp) +/* EA34FC 80242BFC AFB00018 */ sw $s0, 0x18($sp) +/* EA3500 80242C00 F7B60040 */ sdc1 $f22, 0x40($sp) +/* EA3504 80242C04 F7B40038 */ sdc1 $f20, 0x38($sp) +/* EA3508 80242C08 8E30000C */ lw $s0, 0xc($s1) +/* EA350C 80242C0C 8E160000 */ lw $s6, ($s0) +/* EA3510 80242C10 26100004 */ addiu $s0, $s0, 4 +/* EA3514 80242C14 0C0B53A3 */ jal func_802D4E8C +/* EA3518 80242C18 02C0282D */ daddu $a1, $s6, $zero +/* EA351C 80242C1C 44820000 */ mtc1 $v0, $f0 +/* EA3520 80242C20 00000000 */ nop +/* EA3524 80242C24 46800020 */ cvt.s.w $f0, $f0 +/* EA3528 80242C28 E7A00010 */ swc1 $f0, 0x10($sp) +/* EA352C 80242C2C 8E140000 */ lw $s4, ($s0) +/* EA3530 80242C30 26100004 */ addiu $s0, $s0, 4 +/* EA3534 80242C34 0220202D */ daddu $a0, $s1, $zero +/* EA3538 80242C38 0C0B53A3 */ jal func_802D4E8C +/* EA353C 80242C3C 0280282D */ daddu $a1, $s4, $zero +/* EA3540 80242C40 0220202D */ daddu $a0, $s1, $zero +/* EA3544 80242C44 8E150000 */ lw $s5, ($s0) +/* EA3548 80242C48 4482B000 */ mtc1 $v0, $f22 +/* EA354C 80242C4C 00000000 */ nop +/* EA3550 80242C50 4680B5A0 */ cvt.s.w $f22, $f22 +/* EA3554 80242C54 0C0B53A3 */ jal func_802D4E8C +/* EA3558 80242C58 02A0282D */ daddu $a1, $s5, $zero +/* EA355C 80242C5C 2404FFFC */ addiu $a0, $zero, -4 +/* EA3560 80242C60 44820000 */ mtc1 $v0, $f0 +/* EA3564 80242C64 00000000 */ nop +/* EA3568 80242C68 46800020 */ cvt.s.w $f0, $f0 +/* EA356C 80242C6C 0C00F92F */ jal func_8003E4BC +/* EA3570 80242C70 E7A00014 */ swc1 $f0, 0x14($sp) +/* EA3574 80242C74 3C048008 */ lui $a0, %hi(D_8007C760) +/* EA3578 80242C78 8C84C760 */ lw $a0, %lo(D_8007C760)($a0) +/* EA357C 80242C7C 3C014334 */ lui $at, 0x4334 +/* EA3580 80242C80 44816000 */ mtc1 $at, $f12 +/* EA3584 80242C84 00041880 */ sll $v1, $a0, 2 +/* EA3588 80242C88 00641821 */ addu $v1, $v1, $a0 +/* EA358C 80242C8C 00031880 */ sll $v1, $v1, 2 +/* EA3590 80242C90 00641823 */ subu $v1, $v1, $a0 +/* EA3594 80242C94 000320C0 */ sll $a0, $v1, 3 +/* EA3598 80242C98 00641821 */ addu $v1, $v1, $a0 +/* EA359C 80242C9C 000318C0 */ sll $v1, $v1, 3 +/* EA35A0 80242CA0 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EA35A4 80242CA4 00230821 */ addu $at, $at, $v1 +/* EA35A8 80242CA8 C4208DEC */ lwc1 $f0, %lo(D_800B8DEC)($at) +/* EA35AC 80242CAC 460C0300 */ add.s $f12, $f0, $f12 +/* EA35B0 80242CB0 0C00AB85 */ jal func_8002AE14 +/* EA35B4 80242CB4 0040982D */ daddu $s3, $v0, $zero +/* EA35B8 80242CB8 27B00010 */ addiu $s0, $sp, 0x10 +/* EA35BC 80242CBC 0200202D */ daddu $a0, $s0, $zero +/* EA35C0 80242CC0 27B20014 */ addiu $s2, $sp, 0x14 +/* EA35C4 80242CC4 0240282D */ daddu $a1, $s2, $zero +/* EA35C8 80242CC8 3C064170 */ lui $a2, 0x4170 +/* EA35CC 80242CCC 8E67000C */ lw $a3, 0xc($s3) +/* EA35D0 80242CD0 0C00ACA3 */ jal func_8002B28C +/* EA35D4 80242CD4 46000506 */ mov.s $f20, $f0 +/* EA35D8 80242CD8 0200202D */ daddu $a0, $s0, $zero +/* EA35DC 80242CDC 3C064120 */ lui $a2, 0x4120 +/* EA35E0 80242CE0 4407A000 */ mfc1 $a3, $f20 +/* EA35E4 80242CE4 0C00ACA3 */ jal func_8002B28C +/* EA35E8 80242CE8 0240282D */ daddu $a1, $s2, $zero +/* EA35EC 80242CEC 0220202D */ daddu $a0, $s1, $zero +/* EA35F0 80242CF0 C7A00010 */ lwc1 $f0, 0x10($sp) +/* EA35F4 80242CF4 4600008D */ trunc.w.s $f2, $f0 +/* EA35F8 80242CF8 44061000 */ mfc1 $a2, $f2 +/* EA35FC 80242CFC 0C0B551A */ jal func_802D5468 +/* EA3600 80242D00 02C0282D */ daddu $a1, $s6, $zero +/* EA3604 80242D04 0220202D */ daddu $a0, $s1, $zero +/* EA3608 80242D08 4600B08D */ trunc.w.s $f2, $f22 +/* EA360C 80242D0C 44061000 */ mfc1 $a2, $f2 +/* EA3610 80242D10 0C0B551A */ jal func_802D5468 +/* EA3614 80242D14 0280282D */ daddu $a1, $s4, $zero +/* EA3618 80242D18 0220202D */ daddu $a0, $s1, $zero +/* EA361C 80242D1C C7A00014 */ lwc1 $f0, 0x14($sp) +/* EA3620 80242D20 4600008D */ trunc.w.s $f2, $f0 +/* EA3624 80242D24 44061000 */ mfc1 $a2, $f2 +/* EA3628 80242D28 0C0B551A */ jal func_802D5468 +/* EA362C 80242D2C 02A0282D */ daddu $a1, $s5, $zero +/* EA3630 80242D30 8FBF0034 */ lw $ra, 0x34($sp) +/* EA3634 80242D34 8FB60030 */ lw $s6, 0x30($sp) +/* EA3638 80242D38 8FB5002C */ lw $s5, 0x2c($sp) +/* EA363C 80242D3C 8FB40028 */ lw $s4, 0x28($sp) +/* EA3640 80242D40 8FB30024 */ lw $s3, 0x24($sp) +/* EA3644 80242D44 8FB20020 */ lw $s2, 0x20($sp) +/* EA3648 80242D48 8FB1001C */ lw $s1, 0x1c($sp) +/* EA364C 80242D4C 8FB00018 */ lw $s0, 0x18($sp) +/* EA3650 80242D50 D7B60040 */ ldc1 $f22, 0x40($sp) +/* EA3654 80242D54 D7B40038 */ ldc1 $f20, 0x38($sp) +/* EA3658 80242D58 24020002 */ addiu $v0, $zero, 2 +/* EA365C 80242D5C 03E00008 */ jr $ra +/* EA3660 80242D60 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EA0C10/func_80242D64_EA3664.s b/asm/nonmatchings/code_EA0C10/func_80242D64_EA3664.s new file mode 100644 index 0000000000..49c4ca9592 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80242D64_EA3664.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D64_EA3664 +/* EA3664 80242D64 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA3668 80242D68 AFB00010 */ sw $s0, 0x10($sp) +/* EA366C 80242D6C 0080802D */ daddu $s0, $a0, $zero +/* EA3670 80242D70 AFBF0014 */ sw $ra, 0x14($sp) +/* EA3674 80242D74 0C00F92F */ jal func_8003E4BC +/* EA3678 80242D78 8E04008C */ lw $a0, 0x8c($s0) +/* EA367C 80242D7C 0040282D */ daddu $a1, $v0, $zero +/* EA3680 80242D80 8E040094 */ lw $a0, 0x94($s0) +/* EA3684 80242D84 8CA30028 */ lw $v1, 0x28($a1) +/* EA3688 80242D88 ACA40028 */ sw $a0, 0x28($a1) +/* EA368C 80242D8C 8FBF0014 */ lw $ra, 0x14($sp) +/* EA3690 80242D90 8FB00010 */ lw $s0, 0x10($sp) +/* EA3694 80242D94 24020002 */ addiu $v0, $zero, 2 +/* EA3698 80242D98 3C018024 */ lui $at, %hi(D_80246894) +/* EA369C 80242D9C AC236894 */ sw $v1, %lo(D_80246894)($at) +/* EA36A0 80242DA0 03E00008 */ jr $ra +/* EA36A4 80242DA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA0C10/func_80242DA8_EA36A8.s b/asm/nonmatchings/code_EA0C10/func_80242DA8_EA36A8.s new file mode 100644 index 0000000000..ca33f84d79 --- /dev/null +++ b/asm/nonmatchings/code_EA0C10/func_80242DA8_EA36A8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242DA8_EA36A8 +/* EA36A8 80242DA8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA36AC 80242DAC AFBF0010 */ sw $ra, 0x10($sp) +/* EA36B0 80242DB0 0C00F92F */ jal func_8003E4BC +/* EA36B4 80242DB4 8C84008C */ lw $a0, 0x8c($a0) +/* EA36B8 80242DB8 3C038024 */ lui $v1, %hi(D_80246894) +/* EA36BC 80242DBC 8C636894 */ lw $v1, %lo(D_80246894)($v1) +/* EA36C0 80242DC0 AC430028 */ sw $v1, 0x28($v0) +/* EA36C4 80242DC4 8FBF0010 */ lw $ra, 0x10($sp) +/* EA36C8 80242DC8 24020002 */ addiu $v0, $zero, 2 +/* EA36CC 80242DCC 03E00008 */ jr $ra +/* EA36D0 80242DD0 27BD0018 */ addiu $sp, $sp, 0x18 +/* EA36D4 80242DD4 00000000 */ nop +/* EA36D8 80242DD8 00000000 */ nop +/* EA36DC 80242DDC 00000000 */ nop diff --git a/asm/nonmatchings/code_EA36E0/func_80242DE0_EA36E0.s b/asm/nonmatchings/code_EA36E0/func_80242DE0_EA36E0.s new file mode 100644 index 0000000000..1d85d1d3d4 --- /dev/null +++ b/asm/nonmatchings/code_EA36E0/func_80242DE0_EA36E0.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242DE0_EA36E0 +/* EA36E0 80242DE0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA36E4 80242DE4 AFBF0010 */ sw $ra, 0x10($sp) +/* EA36E8 80242DE8 0C03C7BE */ jal func_800F1EF8 +/* EA36EC 80242DEC 24040001 */ addiu $a0, $zero, 1 +/* EA36F0 80242DF0 8FBF0010 */ lw $ra, 0x10($sp) +/* EA36F4 80242DF4 24020002 */ addiu $v0, $zero, 2 +/* EA36F8 80242DF8 03E00008 */ jr $ra +/* EA36FC 80242DFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA36E0/func_80242E00_EA3700.s b/asm/nonmatchings/code_EA36E0/func_80242E00_EA3700.s new file mode 100644 index 0000000000..bc4d39c466 --- /dev/null +++ b/asm/nonmatchings/code_EA36E0/func_80242E00_EA3700.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E00_EA3700 +/* EA3700 80242E00 3C038011 */ lui $v1, %hi(D_80117160) +/* EA3704 80242E04 24637160 */ addiu $v1, $v1, %lo(D_80117160) +/* EA3708 80242E08 80620000 */ lb $v0, ($v1) +/* EA370C 80242E0C 10400004 */ beqz $v0, .L80242E20 +/* EA3710 80242E10 2402FFFF */ addiu $v0, $zero, -1 +/* EA3714 80242E14 80620003 */ lb $v0, 3($v1) +/* EA3718 80242E18 08090B89 */ j .L80242E24 +/* EA371C 80242E1C AC820084 */ sw $v0, 0x84($a0) +.L80242E20: +/* EA3720 80242E20 AC820084 */ sw $v0, 0x84($a0) +.L80242E24: +/* EA3724 80242E24 03E00008 */ jr $ra +/* EA3728 80242E28 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EA36E0/func_80242E2C_EA372C.s b/asm/nonmatchings/code_EA36E0/func_80242E2C_EA372C.s new file mode 100644 index 0000000000..38689fd1ed --- /dev/null +++ b/asm/nonmatchings/code_EA36E0/func_80242E2C_EA372C.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E2C_EA372C +/* EA372C 80242E2C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EA3730 80242E30 AFB00028 */ sw $s0, 0x28($sp) +/* EA3734 80242E34 0080802D */ daddu $s0, $a0, $zero +/* EA3738 80242E38 AFBF002C */ sw $ra, 0x2c($sp) +/* EA373C 80242E3C C6000084 */ lwc1 $f0, 0x84($s0) +/* EA3740 80242E40 46800020 */ cvt.s.w $f0, $f0 +/* EA3744 80242E44 E7A00018 */ swc1 $f0, 0x18($sp) +/* EA3748 80242E48 C600008C */ lwc1 $f0, 0x8c($s0) +/* EA374C 80242E4C 46800020 */ cvt.s.w $f0, $f0 +/* EA3750 80242E50 27A20024 */ addiu $v0, $sp, 0x24 +/* EA3754 80242E54 3C040001 */ lui $a0, 1 +/* EA3758 80242E58 27A50018 */ addiu $a1, $sp, 0x18 +/* EA375C 80242E5C 27A6001C */ addiu $a2, $sp, 0x1c +/* EA3760 80242E60 3C0144FA */ lui $at, 0x44fa +/* EA3764 80242E64 44811000 */ mtc1 $at, $f2 +/* EA3768 80242E68 27A70020 */ addiu $a3, $sp, 0x20 +/* EA376C 80242E6C E7A0001C */ swc1 $f0, 0x1c($sp) +/* EA3770 80242E70 AFA00020 */ sw $zero, 0x20($sp) +/* EA3774 80242E74 E7A20024 */ swc1 $f2, 0x24($sp) +/* EA3778 80242E78 0C03908F */ jal func_800E423C +/* EA377C 80242E7C AFA20010 */ sw $v0, 0x10($sp) +/* EA3780 80242E80 1040000B */ beqz $v0, .L80242EB0 +/* EA3784 80242E84 00000000 */ nop +/* EA3788 80242E88 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* EA378C 80242E8C 3C01425C */ lui $at, 0x425c +/* EA3790 80242E90 44810000 */ mtc1 $at, $f0 +/* EA3794 80242E94 00000000 */ nop +/* EA3798 80242E98 46001080 */ add.s $f2, $f2, $f0 +/* EA379C 80242E9C C7A00018 */ lwc1 $f0, 0x18($sp) +/* EA37A0 80242EA0 4600010D */ trunc.w.s $f4, $f0 +/* EA37A4 80242EA4 E6040084 */ swc1 $f4, 0x84($s0) +/* EA37A8 80242EA8 4600110D */ trunc.w.s $f4, $f2 +/* EA37AC 80242EAC E604008C */ swc1 $f4, 0x8c($s0) +.L80242EB0: +/* EA37B0 80242EB0 8FBF002C */ lw $ra, 0x2c($sp) +/* EA37B4 80242EB4 8FB00028 */ lw $s0, 0x28($sp) +/* EA37B8 80242EB8 24020002 */ addiu $v0, $zero, 2 +/* EA37BC 80242EBC 03E00008 */ jr $ra +/* EA37C0 80242EC0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EA36E0/func_80242EC4_EA37C4.s b/asm/nonmatchings/code_EA36E0/func_80242EC4_EA37C4.s new file mode 100644 index 0000000000..dd9de03225 --- /dev/null +++ b/asm/nonmatchings/code_EA36E0/func_80242EC4_EA37C4.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242EC4_EA37C4 +/* EA37C4 80242EC4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA37C8 80242EC8 AFB00010 */ sw $s0, 0x10($sp) +/* EA37CC 80242ECC 0080802D */ daddu $s0, $a0, $zero +/* EA37D0 80242ED0 3C028011 */ lui $v0, %hi(D_80117578) +/* EA37D4 80242ED4 24427578 */ addiu $v0, $v0, %lo(D_80117578) +/* EA37D8 80242ED8 AFBF0014 */ sw $ra, 0x14($sp) +/* EA37DC 80242EDC C4400028 */ lwc1 $f0, 0x28($v0) +/* EA37E0 80242EE0 C6020084 */ lwc1 $f2, 0x84($s0) +/* EA37E4 80242EE4 468010A0 */ cvt.s.w $f2, $f2 +/* EA37E8 80242EE8 46001081 */ sub.s $f2, $f2, $f0 +/* EA37EC 80242EEC 46021082 */ mul.s $f2, $f2, $f2 +/* EA37F0 80242EF0 00000000 */ nop +/* EA37F4 80242EF4 C440002C */ lwc1 $f0, 0x2c($v0) +/* EA37F8 80242EF8 C604008C */ lwc1 $f4, 0x8c($s0) +/* EA37FC 80242EFC 46802120 */ cvt.s.w $f4, $f4 +/* EA3800 80242F00 46002101 */ sub.s $f4, $f4, $f0 +/* EA3804 80242F04 46042102 */ mul.s $f4, $f4, $f4 +/* EA3808 80242F08 00000000 */ nop +/* EA380C 80242F0C C4460030 */ lwc1 $f6, 0x30($v0) +/* EA3810 80242F10 44800000 */ mtc1 $zero, $f0 +/* EA3814 80242F14 00000000 */ nop +/* EA3818 80242F18 46060001 */ sub.s $f0, $f0, $f6 +/* EA381C 80242F1C 46000002 */ mul.s $f0, $f0, $f0 +/* EA3820 80242F20 00000000 */ nop +/* EA3824 80242F24 46041080 */ add.s $f2, $f2, $f4 +/* EA3828 80242F28 46001300 */ add.s $f12, $f2, $f0 +/* EA382C 80242F2C 46006004 */ sqrt.s $f0, $f12 +/* EA3830 80242F30 46000032 */ c.eq.s $f0, $f0 +/* EA3834 80242F34 00000000 */ nop +/* EA3838 80242F38 45010003 */ bc1t .L80242F48 +/* EA383C 80242F3C 00000000 */ nop +/* EA3840 80242F40 0C019C10 */ jal func_80067040 +/* EA3844 80242F44 00000000 */ nop +.L80242F48: +/* EA3848 80242F48 4600020D */ trunc.w.s $f8, $f0 +/* EA384C 80242F4C E6080094 */ swc1 $f8, 0x94($s0) +/* EA3850 80242F50 8FBF0014 */ lw $ra, 0x14($sp) +/* EA3854 80242F54 8FB00010 */ lw $s0, 0x10($sp) +/* EA3858 80242F58 24020002 */ addiu $v0, $zero, 2 +/* EA385C 80242F5C 03E00008 */ jr $ra +/* EA3860 80242F60 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA36E0/func_80242F64_EA3864.s b/asm/nonmatchings/code_EA36E0/func_80242F64_EA3864.s new file mode 100644 index 0000000000..8ea66e07ad --- /dev/null +++ b/asm/nonmatchings/code_EA36E0/func_80242F64_EA3864.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F64_EA3864 +/* EA3864 80242F64 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA3868 80242F68 AFBF0010 */ sw $ra, 0x10($sp) +/* EA386C 80242F6C 8C82000C */ lw $v0, 0xc($a0) +/* EA3870 80242F70 0C0B53A3 */ jal func_802D4E8C +/* EA3874 80242F74 8C450000 */ lw $a1, ($v0) +/* EA3878 80242F78 44820000 */ mtc1 $v0, $f0 +/* EA387C 80242F7C 00000000 */ nop +/* EA3880 80242F80 46800020 */ cvt.s.w $f0, $f0 +/* EA3884 80242F84 8FBF0010 */ lw $ra, 0x10($sp) +/* EA3888 80242F88 24020002 */ addiu $v0, $zero, 2 +/* EA388C 80242F8C 3C018011 */ lui $at, %hi(D_80117604) +/* EA3890 80242F90 E4207604 */ swc1 $f0, %lo(D_80117604)($at) +/* EA3894 80242F94 03E00008 */ jr $ra +/* EA3898 80242F98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA36E0/func_80242F9C_EA389C.s b/asm/nonmatchings/code_EA36E0/func_80242F9C_EA389C.s new file mode 100644 index 0000000000..38cc553c6a --- /dev/null +++ b/asm/nonmatchings/code_EA36E0/func_80242F9C_EA389C.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F9C_EA389C +/* EA389C 80242F9C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA38A0 80242FA0 AFB00010 */ sw $s0, 0x10($sp) +/* EA38A4 80242FA4 0080802D */ daddu $s0, $a0, $zero +/* EA38A8 80242FA8 AFBF0014 */ sw $ra, 0x14($sp) +/* EA38AC 80242FAC F7B40018 */ sdc1 $f20, 0x18($sp) +/* EA38B0 80242FB0 C60C0090 */ lwc1 $f12, 0x90($s0) +/* EA38B4 80242FB4 46806320 */ cvt.s.w $f12, $f12 +/* EA38B8 80242FB8 3C018024 */ lui $at, %hi(D_802466B0) +/* EA38BC 80242FBC D43466B0 */ ldc1 $f20, %lo(D_802466B0)($at) +/* EA38C0 80242FC0 46006307 */ neg.s $f12, $f12 +/* EA38C4 80242FC4 46006321 */ cvt.d.s $f12, $f12 +/* EA38C8 80242FC8 46346301 */ sub.d $f12, $f12, $f20 +/* EA38CC 80242FCC 0C00AD90 */ jal func_8002B640 +/* EA38D0 80242FD0 46206320 */ cvt.s.d $f12, $f12 +/* EA38D4 80242FD4 3C014008 */ lui $at, 0x4008 +/* EA38D8 80242FD8 44811800 */ mtc1 $at, $f3 +/* EA38DC 80242FDC 44801000 */ mtc1 $zero, $f2 +/* EA38E0 80242FE0 46000021 */ cvt.d.s $f0, $f0 +/* EA38E4 80242FE4 46220002 */ mul.d $f0, $f0, $f2 +/* EA38E8 80242FE8 00000000 */ nop +/* EA38EC 80242FEC C60C0090 */ lwc1 $f12, 0x90($s0) +/* EA38F0 80242FF0 46806320 */ cvt.s.w $f12, $f12 +/* EA38F4 80242FF4 46006307 */ neg.s $f12, $f12 +/* EA38F8 80242FF8 46006321 */ cvt.d.s $f12, $f12 +/* EA38FC 80242FFC 46346301 */ sub.d $f12, $f12, $f20 +/* EA3900 80243000 3C018024 */ lui $at, %hi(D_802466B8) +/* EA3904 80243004 D42266B8 */ ldc1 $f2, %lo(D_802466B8)($at) +/* EA3908 80243008 46220001 */ sub.d $f0, $f0, $f2 +/* EA390C 8024300C 4620010D */ trunc.w.d $f4, $f0 +/* EA3910 80243010 E6040098 */ swc1 $f4, 0x98($s0) +/* EA3914 80243014 0C00AD77 */ jal func_8002B5DC +/* EA3918 80243018 46206320 */ cvt.s.d $f12, $f12 +/* EA391C 8024301C 3C014014 */ lui $at, 0x4014 +/* EA3920 80243020 44811800 */ mtc1 $at, $f3 +/* EA3924 80243024 44801000 */ mtc1 $zero, $f2 +/* EA3928 80243028 46000021 */ cvt.d.s $f0, $f0 +/* EA392C 8024302C 46220002 */ mul.d $f0, $f0, $f2 +/* EA3930 80243030 00000000 */ nop +/* EA3934 80243034 4620010D */ trunc.w.d $f4, $f0 +/* EA3938 80243038 E604009C */ swc1 $f4, 0x9c($s0) +/* EA393C 8024303C 8FBF0014 */ lw $ra, 0x14($sp) +/* EA3940 80243040 8FB00010 */ lw $s0, 0x10($sp) +/* EA3944 80243044 D7B40018 */ ldc1 $f20, 0x18($sp) +/* EA3948 80243048 24020002 */ addiu $v0, $zero, 2 +/* EA394C 8024304C 03E00008 */ jr $ra +/* EA3950 80243050 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA36E0/func_80243054_EA3954.s b/asm/nonmatchings/code_EA36E0/func_80243054_EA3954.s new file mode 100644 index 0000000000..d2141ff614 --- /dev/null +++ b/asm/nonmatchings/code_EA36E0/func_80243054_EA3954.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243054_EA3954 +/* EA3954 80243054 3C018024 */ lui $at, %hi(D_802466C0) +/* EA3958 80243058 D42266C0 */ ldc1 $f2, %lo(D_802466C0)($at) +/* EA395C 8024305C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA3960 80243060 AFB00010 */ sw $s0, 0x10($sp) +/* EA3964 80243064 0080802D */ daddu $s0, $a0, $zero +/* EA3968 80243068 AFBF0014 */ sw $ra, 0x14($sp) +/* EA396C 8024306C C6000084 */ lwc1 $f0, 0x84($s0) +/* EA3970 80243070 46800021 */ cvt.d.w $f0, $f0 +/* EA3974 80243074 46201081 */ sub.d $f2, $f2, $f0 +/* EA3978 80243078 462010A0 */ cvt.s.d $f2, $f2 +/* EA397C 8024307C 46021082 */ mul.s $f2, $f2, $f2 +/* EA3980 80243080 00000000 */ nop +/* EA3984 80243084 3C018024 */ lui $at, %hi(D_802466C8) +/* EA3988 80243088 D42066C8 */ ldc1 $f0, %lo(D_802466C8)($at) +/* EA398C 8024308C C604008C */ lwc1 $f4, 0x8c($s0) +/* EA3990 80243090 46802121 */ cvt.d.w $f4, $f4 +/* EA3994 80243094 46240001 */ sub.d $f0, $f0, $f4 +/* EA3998 80243098 46200020 */ cvt.s.d $f0, $f0 +/* EA399C 8024309C 46000002 */ mul.s $f0, $f0, $f0 +/* EA39A0 802430A0 00000000 */ nop +/* EA39A4 802430A4 46001300 */ add.s $f12, $f2, $f0 +/* EA39A8 802430A8 46006004 */ sqrt.s $f0, $f12 +/* EA39AC 802430AC 46000032 */ c.eq.s $f0, $f0 +/* EA39B0 802430B0 00000000 */ nop +/* EA39B4 802430B4 45030004 */ bc1tl .L802430C8 +/* EA39B8 802430B8 46000007 */ neg.s $f0, $f0 +/* EA39BC 802430BC 0C019C10 */ jal func_80067040 +/* EA39C0 802430C0 00000000 */ nop +/* EA39C4 802430C4 46000007 */ neg.s $f0, $f0 +.L802430C8: +/* EA39C8 802430C8 4600018D */ trunc.w.s $f6, $f0 +/* EA39CC 802430CC E6060090 */ swc1 $f6, 0x90($s0) +/* EA39D0 802430D0 8FBF0014 */ lw $ra, 0x14($sp) +/* EA39D4 802430D4 8FB00010 */ lw $s0, 0x10($sp) +/* EA39D8 802430D8 24020002 */ addiu $v0, $zero, 2 +/* EA39DC 802430DC 03E00008 */ jr $ra +/* EA39E0 802430E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA36E0/func_802430E4_EA39E4.s b/asm/nonmatchings/code_EA36E0/func_802430E4_EA39E4.s new file mode 100644 index 0000000000..4f2898a77f --- /dev/null +++ b/asm/nonmatchings/code_EA36E0/func_802430E4_EA39E4.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802430E4_EA39E4 +/* EA39E4 802430E4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EA39E8 802430E8 AFB1001C */ sw $s1, 0x1c($sp) +/* EA39EC 802430EC 0080882D */ daddu $s1, $a0, $zero +/* EA39F0 802430F0 AFBF0020 */ sw $ra, 0x20($sp) +/* EA39F4 802430F4 AFB00018 */ sw $s0, 0x18($sp) +/* EA39F8 802430F8 8E30000C */ lw $s0, 0xc($s1) +/* EA39FC 802430FC 8E050000 */ lw $a1, ($s0) +/* EA3A00 80243100 0C0B53A3 */ jal func_802D4E8C +/* EA3A04 80243104 26100004 */ addiu $s0, $s0, 4 +/* EA3A08 80243108 AE220070 */ sw $v0, 0x70($s1) +/* EA3A0C 8024310C 8E050000 */ lw $a1, ($s0) +/* EA3A10 80243110 26100004 */ addiu $s0, $s0, 4 +/* EA3A14 80243114 0C0B53A3 */ jal func_802D4E8C +/* EA3A18 80243118 0220202D */ daddu $a0, $s1, $zero +/* EA3A1C 8024311C AE220074 */ sw $v0, 0x74($s1) +/* EA3A20 80243120 8E050000 */ lw $a1, ($s0) +/* EA3A24 80243124 0C0B53A3 */ jal func_802D4E8C +/* EA3A28 80243128 0220202D */ daddu $a0, $s1, $zero +/* EA3A2C 8024312C 24040052 */ addiu $a0, $zero, 0x52 +/* EA3A30 80243130 0000282D */ daddu $a1, $zero, $zero +/* EA3A34 80243134 C6200070 */ lwc1 $f0, 0x70($s1) +/* EA3A38 80243138 46800020 */ cvt.s.w $f0, $f0 +/* EA3A3C 8024313C C6220074 */ lwc1 $f2, 0x74($s1) +/* EA3A40 80243140 468010A0 */ cvt.s.w $f2, $f2 +/* EA3A44 80243144 44060000 */ mfc1 $a2, $f0 +/* EA3A48 80243148 44071000 */ mfc1 $a3, $f2 +/* EA3A4C 8024314C 44820000 */ mtc1 $v0, $f0 +/* EA3A50 80243150 00000000 */ nop +/* EA3A54 80243154 46800020 */ cvt.s.w $f0, $f0 +/* EA3A58 80243158 AE220078 */ sw $v0, 0x78($s1) +/* EA3A5C 8024315C 0C055C13 */ jal func_8015704C +/* EA3A60 80243160 E7A00010 */ swc1 $f0, 0x10($sp) +/* EA3A64 80243164 8FBF0020 */ lw $ra, 0x20($sp) +/* EA3A68 80243168 8FB1001C */ lw $s1, 0x1c($sp) +/* EA3A6C 8024316C 8FB00018 */ lw $s0, 0x18($sp) +/* EA3A70 80243170 24020002 */ addiu $v0, $zero, 2 +/* EA3A74 80243174 03E00008 */ jr $ra +/* EA3A78 80243178 27BD0028 */ addiu $sp, $sp, 0x28 +/* EA3A7C 8024317C 00000000 */ nop diff --git a/asm/nonmatchings/code_EA6FD0/func_80240000_EA6FD0.s b/asm/nonmatchings/code_EA6FD0/func_80240000_EA6FD0.s new file mode 100644 index 0000000000..b59f1dfa7e --- /dev/null +++ b/asm/nonmatchings/code_EA6FD0/func_80240000_EA6FD0.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EA6FD0 +/* EA6FD0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA6FD4 80240004 AFBF0010 */ sw $ra, 0x10($sp) +/* EA6FD8 80240008 3C05F5DE */ lui $a1, 0xf5de +/* EA6FDC 8024000C 34A50180 */ ori $a1, $a1, 0x180 +/* EA6FE0 80240010 0C0B53A3 */ jal func_802D4E8C +/* EA6FE4 80240014 0000202D */ daddu $a0, $zero, $zero +/* EA6FE8 80240018 28430027 */ slti $v1, $v0, 0x27 +/* EA6FEC 8024001C 3C020019 */ lui $v0, 0x19 +/* EA6FF0 80240020 14600003 */ bnez $v1, .L80240030 +/* EA6FF4 80240024 3442010F */ ori $v0, $v0, 0x10f +/* EA6FF8 80240028 3C020019 */ lui $v0, 0x19 +/* EA6FFC 8024002C 34420110 */ ori $v0, $v0, 0x110 +.L80240030: +/* EA7000 80240030 8FBF0010 */ lw $ra, 0x10($sp) +/* EA7004 80240034 03E00008 */ jr $ra +/* EA7008 80240038 27BD0018 */ addiu $sp, $sp, 0x18 +/* EA700C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EA7010/func_80240040_EA7010.s b/asm/nonmatchings/code_EA7010/func_80240040_EA7010.s new file mode 100644 index 0000000000..55b8ad19d6 --- /dev/null +++ b/asm/nonmatchings/code_EA7010/func_80240040_EA7010.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240040_EA7010 +/* EA7010 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA7014 80240044 AFB00010 */ sw $s0, 0x10($sp) +/* EA7018 80240048 0080802D */ daddu $s0, $a0, $zero +/* EA701C 8024004C AFBF0014 */ sw $ra, 0x14($sp) +/* EA7020 80240050 8E0300A8 */ lw $v1, 0xa8($s0) +/* EA7024 80240054 8E020088 */ lw $v0, 0x88($s0) +/* EA7028 80240058 00621821 */ addu $v1, $v1, $v0 +/* EA702C 8024005C 04610004 */ bgez $v1, .L80240070 +/* EA7030 80240060 AE0300A8 */ sw $v1, 0xa8($s0) +/* EA7034 80240064 3C020002 */ lui $v0, 2 +/* EA7038 80240068 08090020 */ j .L80240080 +/* EA703C 8024006C 00621021 */ addu $v0, $v1, $v0 +.L80240070: +/* EA7040 80240070 3C040002 */ lui $a0, 2 +/* EA7044 80240074 0083102A */ slt $v0, $a0, $v1 +/* EA7048 80240078 10400002 */ beqz $v0, .L80240084 +/* EA704C 8024007C 00641023 */ subu $v0, $v1, $a0 +.L80240080: +/* EA7050 80240080 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240084: +/* EA7054 80240084 8E0300AC */ lw $v1, 0xac($s0) +/* EA7058 80240088 8E02008C */ lw $v0, 0x8c($s0) +/* EA705C 8024008C 00621821 */ addu $v1, $v1, $v0 +/* EA7060 80240090 04610004 */ bgez $v1, .L802400A4 +/* EA7064 80240094 AE0300AC */ sw $v1, 0xac($s0) +/* EA7068 80240098 3C020002 */ lui $v0, 2 +/* EA706C 8024009C 0809002D */ j .L802400B4 +/* EA7070 802400A0 00621021 */ addu $v0, $v1, $v0 +.L802400A4: +/* EA7074 802400A4 3C040002 */ lui $a0, 2 +/* EA7078 802400A8 0083102A */ slt $v0, $a0, $v1 +/* EA707C 802400AC 10400002 */ beqz $v0, .L802400B8 +/* EA7080 802400B0 00641023 */ subu $v0, $v1, $a0 +.L802400B4: +/* EA7084 802400B4 AE0200AC */ sw $v0, 0xac($s0) +.L802400B8: +/* EA7088 802400B8 8E0300B0 */ lw $v1, 0xb0($s0) +/* EA708C 802400BC 8E020090 */ lw $v0, 0x90($s0) +/* EA7090 802400C0 00621821 */ addu $v1, $v1, $v0 +/* EA7094 802400C4 04610004 */ bgez $v1, .L802400D8 +/* EA7098 802400C8 AE0300B0 */ sw $v1, 0xb0($s0) +/* EA709C 802400CC 3C020002 */ lui $v0, 2 +/* EA70A0 802400D0 0809003A */ j .L802400E8 +/* EA70A4 802400D4 00621021 */ addu $v0, $v1, $v0 +.L802400D8: +/* EA70A8 802400D8 3C040002 */ lui $a0, 2 +/* EA70AC 802400DC 0083102A */ slt $v0, $a0, $v1 +/* EA70B0 802400E0 10400002 */ beqz $v0, .L802400EC +/* EA70B4 802400E4 00641023 */ subu $v0, $v1, $a0 +.L802400E8: +/* EA70B8 802400E8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802400EC: +/* EA70BC 802400EC 8E0300B4 */ lw $v1, 0xb4($s0) +/* EA70C0 802400F0 8E020094 */ lw $v0, 0x94($s0) +/* EA70C4 802400F4 00621821 */ addu $v1, $v1, $v0 +/* EA70C8 802400F8 04610004 */ bgez $v1, .L8024010C +/* EA70CC 802400FC AE0300B4 */ sw $v1, 0xb4($s0) +/* EA70D0 80240100 3C020002 */ lui $v0, 2 +/* EA70D4 80240104 08090047 */ j .L8024011C +/* EA70D8 80240108 00621021 */ addu $v0, $v1, $v0 +.L8024010C: +/* EA70DC 8024010C 3C040002 */ lui $a0, 2 +/* EA70E0 80240110 0083102A */ slt $v0, $a0, $v1 +/* EA70E4 80240114 10400002 */ beqz $v0, .L80240120 +/* EA70E8 80240118 00641023 */ subu $v0, $v1, $a0 +.L8024011C: +/* EA70EC 8024011C AE0200B4 */ sw $v0, 0xb4($s0) +.L80240120: +/* EA70F0 80240120 8E040084 */ lw $a0, 0x84($s0) +/* EA70F4 80240124 0C049819 */ jal func_80126064 +/* EA70F8 80240128 8E0500A8 */ lw $a1, 0xa8($s0) +/* EA70FC 8024012C 8E040084 */ lw $a0, 0x84($s0) +/* EA7100 80240130 0C04981F */ jal func_8012607C +/* EA7104 80240134 8E0500AC */ lw $a1, 0xac($s0) +/* EA7108 80240138 8E040084 */ lw $a0, 0x84($s0) +/* EA710C 8024013C 0C049825 */ jal func_80126094 +/* EA7110 80240140 8E0500B0 */ lw $a1, 0xb0($s0) +/* EA7114 80240144 8E040084 */ lw $a0, 0x84($s0) +/* EA7118 80240148 0C04982B */ jal func_801260AC +/* EA711C 8024014C 8E0500B4 */ lw $a1, 0xb4($s0) +/* EA7120 80240150 8FBF0014 */ lw $ra, 0x14($sp) +/* EA7124 80240154 8FB00010 */ lw $s0, 0x10($sp) +/* EA7128 80240158 0000102D */ daddu $v0, $zero, $zero +/* EA712C 8024015C 03E00008 */ jr $ra +/* EA7130 80240160 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA7010/func_80240164_EA7134.s b/asm/nonmatchings/code_EA7010/func_80240164_EA7134.s new file mode 100644 index 0000000000..87b9a770e7 --- /dev/null +++ b/asm/nonmatchings/code_EA7010/func_80240164_EA7134.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240164_EA7134 +/* EA7134 80240164 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA7138 80240168 AFB00010 */ sw $s0, 0x10($sp) +/* EA713C 8024016C 0080802D */ daddu $s0, $a0, $zero +/* EA7140 80240170 10A00005 */ beqz $a1, .L80240188 +/* EA7144 80240174 AFBF0014 */ sw $ra, 0x14($sp) +/* EA7148 80240178 AE000070 */ sw $zero, 0x70($s0) +/* EA714C 8024017C AE000074 */ sw $zero, 0x74($s0) +/* EA7150 80240180 AE000078 */ sw $zero, 0x78($s0) +/* EA7154 80240184 AE00007C */ sw $zero, 0x7c($s0) +.L80240188: +/* EA7158 80240188 8E020070 */ lw $v0, 0x70($s0) +/* EA715C 8024018C 1440000E */ bnez $v0, .L802401C8 +/* EA7160 80240190 00000000 */ nop +/* EA7164 80240194 8E0300A8 */ lw $v1, 0xa8($s0) +/* EA7168 80240198 8E020088 */ lw $v0, 0x88($s0) +/* EA716C 8024019C 00621821 */ addu $v1, $v1, $v0 +/* EA7170 802401A0 04610004 */ bgez $v1, .L802401B4 +/* EA7174 802401A4 AE0300A8 */ sw $v1, 0xa8($s0) +/* EA7178 802401A8 3C020002 */ lui $v0, 2 +/* EA717C 802401AC 08090071 */ j .L802401C4 +/* EA7180 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* EA7184 802401B4 3C040002 */ lui $a0, 2 +/* EA7188 802401B8 0083102A */ slt $v0, $a0, $v1 +/* EA718C 802401BC 10400002 */ beqz $v0, .L802401C8 +/* EA7190 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* EA7194 802401C4 AE0200A8 */ sw $v0, 0xa8($s0) +.L802401C8: +/* EA7198 802401C8 8E020074 */ lw $v0, 0x74($s0) +/* EA719C 802401CC 1440000E */ bnez $v0, .L80240208 +/* EA71A0 802401D0 00000000 */ nop +/* EA71A4 802401D4 8E0300AC */ lw $v1, 0xac($s0) +/* EA71A8 802401D8 8E02008C */ lw $v0, 0x8c($s0) +/* EA71AC 802401DC 00621821 */ addu $v1, $v1, $v0 +/* EA71B0 802401E0 04610004 */ bgez $v1, .L802401F4 +/* EA71B4 802401E4 AE0300AC */ sw $v1, 0xac($s0) +/* EA71B8 802401E8 3C020002 */ lui $v0, 2 +/* EA71BC 802401EC 08090081 */ j .L80240204 +/* EA71C0 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* EA71C4 802401F4 3C040002 */ lui $a0, 2 +/* EA71C8 802401F8 0083102A */ slt $v0, $a0, $v1 +/* EA71CC 802401FC 10400002 */ beqz $v0, .L80240208 +/* EA71D0 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* EA71D4 80240204 AE0200AC */ sw $v0, 0xac($s0) +.L80240208: +/* EA71D8 80240208 8E020078 */ lw $v0, 0x78($s0) +/* EA71DC 8024020C 1440000E */ bnez $v0, .L80240248 +/* EA71E0 80240210 00000000 */ nop +/* EA71E4 80240214 8E0300B0 */ lw $v1, 0xb0($s0) +/* EA71E8 80240218 8E020090 */ lw $v0, 0x90($s0) +/* EA71EC 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EA71F0 80240220 04610004 */ bgez $v1, .L80240234 +/* EA71F4 80240224 AE0300B0 */ sw $v1, 0xb0($s0) +/* EA71F8 80240228 3C020002 */ lui $v0, 2 +/* EA71FC 8024022C 08090091 */ j .L80240244 +/* EA7200 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* EA7204 80240234 3C040002 */ lui $a0, 2 +/* EA7208 80240238 0083102A */ slt $v0, $a0, $v1 +/* EA720C 8024023C 10400002 */ beqz $v0, .L80240248 +/* EA7210 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* EA7214 80240244 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240248: +/* EA7218 80240248 8E02007C */ lw $v0, 0x7c($s0) +/* EA721C 8024024C 1440000E */ bnez $v0, .L80240288 +/* EA7220 80240250 00000000 */ nop +/* EA7224 80240254 8E0300B4 */ lw $v1, 0xb4($s0) +/* EA7228 80240258 8E020094 */ lw $v0, 0x94($s0) +/* EA722C 8024025C 00621821 */ addu $v1, $v1, $v0 +/* EA7230 80240260 04610004 */ bgez $v1, .L80240274 +/* EA7234 80240264 AE0300B4 */ sw $v1, 0xb4($s0) +/* EA7238 80240268 3C020002 */ lui $v0, 2 +/* EA723C 8024026C 080900A1 */ j .L80240284 +/* EA7240 80240270 00621021 */ addu $v0, $v1, $v0 +.L80240274: +/* EA7244 80240274 3C040002 */ lui $a0, 2 +/* EA7248 80240278 0083102A */ slt $v0, $a0, $v1 +/* EA724C 8024027C 10400002 */ beqz $v0, .L80240288 +/* EA7250 80240280 00641023 */ subu $v0, $v1, $a0 +.L80240284: +/* EA7254 80240284 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240288: +/* EA7258 80240288 8E040084 */ lw $a0, 0x84($s0) +/* EA725C 8024028C 0C049819 */ jal func_80126064 +/* EA7260 80240290 8E0500A8 */ lw $a1, 0xa8($s0) +/* EA7264 80240294 8E040084 */ lw $a0, 0x84($s0) +/* EA7268 80240298 0C04981F */ jal func_8012607C +/* EA726C 8024029C 8E0500AC */ lw $a1, 0xac($s0) +/* EA7270 802402A0 8E040084 */ lw $a0, 0x84($s0) +/* EA7274 802402A4 0C049825 */ jal func_80126094 +/* EA7278 802402A8 8E0500B0 */ lw $a1, 0xb0($s0) +/* EA727C 802402AC 8E040084 */ lw $a0, 0x84($s0) +/* EA7280 802402B0 0C04982B */ jal func_801260AC +/* EA7284 802402B4 8E0500B4 */ lw $a1, 0xb4($s0) +/* EA7288 802402B8 8E020070 */ lw $v0, 0x70($s0) +/* EA728C 802402BC 8E030078 */ lw $v1, 0x78($s0) +/* EA7290 802402C0 8E040098 */ lw $a0, 0x98($s0) +/* EA7294 802402C4 24420001 */ addiu $v0, $v0, 1 +/* EA7298 802402C8 AE020070 */ sw $v0, 0x70($s0) +/* EA729C 802402CC 8E020074 */ lw $v0, 0x74($s0) +/* EA72A0 802402D0 24630001 */ addiu $v1, $v1, 1 +/* EA72A4 802402D4 AE030078 */ sw $v1, 0x78($s0) +/* EA72A8 802402D8 8E030070 */ lw $v1, 0x70($s0) +/* EA72AC 802402DC 24420001 */ addiu $v0, $v0, 1 +/* EA72B0 802402E0 AE020074 */ sw $v0, 0x74($s0) +/* EA72B4 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* EA72B8 802402E8 0064182A */ slt $v1, $v1, $a0 +/* EA72BC 802402EC 24420001 */ addiu $v0, $v0, 1 +/* EA72C0 802402F0 14600002 */ bnez $v1, .L802402FC +/* EA72C4 802402F4 AE02007C */ sw $v0, 0x7c($s0) +/* EA72C8 802402F8 AE000070 */ sw $zero, 0x70($s0) +.L802402FC: +/* EA72CC 802402FC 8E020074 */ lw $v0, 0x74($s0) +/* EA72D0 80240300 8E03009C */ lw $v1, 0x9c($s0) +/* EA72D4 80240304 0043102A */ slt $v0, $v0, $v1 +/* EA72D8 80240308 50400001 */ beql $v0, $zero, .L80240310 +/* EA72DC 8024030C AE000074 */ sw $zero, 0x74($s0) +.L80240310: +/* EA72E0 80240310 8E020078 */ lw $v0, 0x78($s0) +/* EA72E4 80240314 8E0300A0 */ lw $v1, 0xa0($s0) +/* EA72E8 80240318 0043102A */ slt $v0, $v0, $v1 +/* EA72EC 8024031C 50400001 */ beql $v0, $zero, .L80240324 +/* EA72F0 80240320 AE000078 */ sw $zero, 0x78($s0) +.L80240324: +/* EA72F4 80240324 8E02007C */ lw $v0, 0x7c($s0) +/* EA72F8 80240328 8E0300A4 */ lw $v1, 0xa4($s0) +/* EA72FC 8024032C 0043102A */ slt $v0, $v0, $v1 +/* EA7300 80240330 50400001 */ beql $v0, $zero, .L80240338 +/* EA7304 80240334 AE00007C */ sw $zero, 0x7c($s0) +.L80240338: +/* EA7308 80240338 8FBF0014 */ lw $ra, 0x14($sp) +/* EA730C 8024033C 8FB00010 */ lw $s0, 0x10($sp) +/* EA7310 80240340 0000102D */ daddu $v0, $zero, $zero +/* EA7314 80240344 03E00008 */ jr $ra +/* EA7318 80240348 27BD0018 */ addiu $sp, $sp, 0x18 +/* EA731C 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/code_EA7320/func_80240350_EA7320.s b/asm/nonmatchings/code_EA7320/func_80240350_EA7320.s new file mode 100644 index 0000000000..966255235c --- /dev/null +++ b/asm/nonmatchings/code_EA7320/func_80240350_EA7320.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240350_EA7320 +/* EA7320 80240350 3C03800C */ lui $v1, %hi(D_800B8D80) +/* EA7324 80240354 24638D80 */ addiu $v1, $v1, %lo(D_800B8D80) +/* EA7328 80240358 94620000 */ lhu $v0, ($v1) +/* EA732C 8024035C 34421000 */ ori $v0, $v0, 0x1000 +/* EA7330 80240360 A4620000 */ sh $v0, ($v1) +/* EA7334 80240364 03E00008 */ jr $ra +/* EA7338 80240368 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EA7320/func_8024036C_EA733C.s b/asm/nonmatchings/code_EA7320/func_8024036C_EA733C.s new file mode 100644 index 0000000000..0aef17f78e --- /dev/null +++ b/asm/nonmatchings/code_EA7320/func_8024036C_EA733C.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024036C_EA733C +/* EA733C 8024036C 3C03800C */ lui $v1, %hi(D_800B8D80) +/* EA7340 80240370 24638D80 */ addiu $v1, $v1, %lo(D_800B8D80) +/* EA7344 80240374 94620000 */ lhu $v0, ($v1) +/* EA7348 80240378 3042EFFF */ andi $v0, $v0, 0xefff +/* EA734C 8024037C A4620000 */ sh $v0, ($v1) +/* EA7350 80240380 03E00008 */ jr $ra +/* EA7354 80240384 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EA7320/func_80240388_EA7358.s b/asm/nonmatchings/code_EA7320/func_80240388_EA7358.s new file mode 100644 index 0000000000..801dddddbb --- /dev/null +++ b/asm/nonmatchings/code_EA7320/func_80240388_EA7358.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240388_EA7358 +/* EA7358 80240388 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA735C 8024038C AFBF0010 */ sw $ra, 0x10($sp) +/* EA7360 80240390 8C82000C */ lw $v0, 0xc($a0) +/* EA7364 80240394 3C068017 */ lui $a2, %hi(D_80169B12) +/* EA7368 80240398 84C69B12 */ lh $a2, %lo(D_80169B12)($a2) +/* EA736C 8024039C 0C0B551A */ jal func_802D5468 +/* EA7370 802403A0 8C450000 */ lw $a1, ($v0) +/* EA7374 802403A4 8FBF0010 */ lw $ra, 0x10($sp) +/* EA7378 802403A8 24020002 */ addiu $v0, $zero, 2 +/* EA737C 802403AC 03E00008 */ jr $ra +/* EA7380 802403B0 27BD0018 */ addiu $sp, $sp, 0x18 +/* EA7384 802403B4 00000000 */ nop +/* EA7388 802403B8 00000000 */ nop +/* EA738C 802403BC 00000000 */ nop diff --git a/asm/nonmatchings/code_EA8AE0/func_80240000_EA8AE0.s b/asm/nonmatchings/code_EA8AE0/func_80240000_EA8AE0.s new file mode 100644 index 0000000000..3b400880fe --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80240000_EA8AE0.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EA8AE0 +/* EA8AE0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA8AE4 80240004 AFB00010 */ sw $s0, 0x10($sp) +/* EA8AE8 80240008 0080802D */ daddu $s0, $a0, $zero +/* EA8AEC 8024000C AFBF0014 */ sw $ra, 0x14($sp) +/* EA8AF0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) +/* EA8AF4 80240014 8E020088 */ lw $v0, 0x88($s0) +/* EA8AF8 80240018 00621821 */ addu $v1, $v1, $v0 +/* EA8AFC 8024001C 04610004 */ bgez $v1, .L80240030 +/* EA8B00 80240020 AE0300A8 */ sw $v1, 0xa8($s0) +/* EA8B04 80240024 3C020002 */ lui $v0, 2 +/* EA8B08 80240028 08090010 */ j .L80240040 +/* EA8B0C 8024002C 00621021 */ addu $v0, $v1, $v0 +.L80240030: +/* EA8B10 80240030 3C040002 */ lui $a0, 2 +/* EA8B14 80240034 0083102A */ slt $v0, $a0, $v1 +/* EA8B18 80240038 10400002 */ beqz $v0, .L80240044 +/* EA8B1C 8024003C 00641023 */ subu $v0, $v1, $a0 +.L80240040: +/* EA8B20 80240040 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240044: +/* EA8B24 80240044 8E0300AC */ lw $v1, 0xac($s0) +/* EA8B28 80240048 8E02008C */ lw $v0, 0x8c($s0) +/* EA8B2C 8024004C 00621821 */ addu $v1, $v1, $v0 +/* EA8B30 80240050 04610004 */ bgez $v1, .L80240064 +/* EA8B34 80240054 AE0300AC */ sw $v1, 0xac($s0) +/* EA8B38 80240058 3C020002 */ lui $v0, 2 +/* EA8B3C 8024005C 0809001D */ j .L80240074 +/* EA8B40 80240060 00621021 */ addu $v0, $v1, $v0 +.L80240064: +/* EA8B44 80240064 3C040002 */ lui $a0, 2 +/* EA8B48 80240068 0083102A */ slt $v0, $a0, $v1 +/* EA8B4C 8024006C 10400002 */ beqz $v0, .L80240078 +/* EA8B50 80240070 00641023 */ subu $v0, $v1, $a0 +.L80240074: +/* EA8B54 80240074 AE0200AC */ sw $v0, 0xac($s0) +.L80240078: +/* EA8B58 80240078 8E0300B0 */ lw $v1, 0xb0($s0) +/* EA8B5C 8024007C 8E020090 */ lw $v0, 0x90($s0) +/* EA8B60 80240080 00621821 */ addu $v1, $v1, $v0 +/* EA8B64 80240084 04610004 */ bgez $v1, .L80240098 +/* EA8B68 80240088 AE0300B0 */ sw $v1, 0xb0($s0) +/* EA8B6C 8024008C 3C020002 */ lui $v0, 2 +/* EA8B70 80240090 0809002A */ j .L802400A8 +/* EA8B74 80240094 00621021 */ addu $v0, $v1, $v0 +.L80240098: +/* EA8B78 80240098 3C040002 */ lui $a0, 2 +/* EA8B7C 8024009C 0083102A */ slt $v0, $a0, $v1 +/* EA8B80 802400A0 10400002 */ beqz $v0, .L802400AC +/* EA8B84 802400A4 00641023 */ subu $v0, $v1, $a0 +.L802400A8: +/* EA8B88 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802400AC: +/* EA8B8C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) +/* EA8B90 802400B0 8E020094 */ lw $v0, 0x94($s0) +/* EA8B94 802400B4 00621821 */ addu $v1, $v1, $v0 +/* EA8B98 802400B8 04610004 */ bgez $v1, .L802400CC +/* EA8B9C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) +/* EA8BA0 802400C0 3C020002 */ lui $v0, 2 +/* EA8BA4 802400C4 08090037 */ j .L802400DC +/* EA8BA8 802400C8 00621021 */ addu $v0, $v1, $v0 +.L802400CC: +/* EA8BAC 802400CC 3C040002 */ lui $a0, 2 +/* EA8BB0 802400D0 0083102A */ slt $v0, $a0, $v1 +/* EA8BB4 802400D4 10400002 */ beqz $v0, .L802400E0 +/* EA8BB8 802400D8 00641023 */ subu $v0, $v1, $a0 +.L802400DC: +/* EA8BBC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) +.L802400E0: +/* EA8BC0 802400E0 8E040084 */ lw $a0, 0x84($s0) +/* EA8BC4 802400E4 0C049819 */ jal func_80126064 +/* EA8BC8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) +/* EA8BCC 802400EC 8E040084 */ lw $a0, 0x84($s0) +/* EA8BD0 802400F0 0C04981F */ jal func_8012607C +/* EA8BD4 802400F4 8E0500AC */ lw $a1, 0xac($s0) +/* EA8BD8 802400F8 8E040084 */ lw $a0, 0x84($s0) +/* EA8BDC 802400FC 0C049825 */ jal func_80126094 +/* EA8BE0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) +/* EA8BE4 80240104 8E040084 */ lw $a0, 0x84($s0) +/* EA8BE8 80240108 0C04982B */ jal func_801260AC +/* EA8BEC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) +/* EA8BF0 80240110 8FBF0014 */ lw $ra, 0x14($sp) +/* EA8BF4 80240114 8FB00010 */ lw $s0, 0x10($sp) +/* EA8BF8 80240118 0000102D */ daddu $v0, $zero, $zero +/* EA8BFC 8024011C 03E00008 */ jr $ra +/* EA8C00 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA8AE0/func_80240124_EA8C04.s b/asm/nonmatchings/code_EA8AE0/func_80240124_EA8C04.s new file mode 100644 index 0000000000..53bcd20291 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80240124_EA8C04.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240124_EA8C04 +/* EA8C04 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA8C08 80240128 AFB00010 */ sw $s0, 0x10($sp) +/* EA8C0C 8024012C 0080802D */ daddu $s0, $a0, $zero +/* EA8C10 80240130 10A00005 */ beqz $a1, .L80240148 +/* EA8C14 80240134 AFBF0014 */ sw $ra, 0x14($sp) +/* EA8C18 80240138 AE000070 */ sw $zero, 0x70($s0) +/* EA8C1C 8024013C AE000074 */ sw $zero, 0x74($s0) +/* EA8C20 80240140 AE000078 */ sw $zero, 0x78($s0) +/* EA8C24 80240144 AE00007C */ sw $zero, 0x7c($s0) +.L80240148: +/* EA8C28 80240148 8E020070 */ lw $v0, 0x70($s0) +/* EA8C2C 8024014C 1440000E */ bnez $v0, .L80240188 +/* EA8C30 80240150 00000000 */ nop +/* EA8C34 80240154 8E0300A8 */ lw $v1, 0xa8($s0) +/* EA8C38 80240158 8E020088 */ lw $v0, 0x88($s0) +/* EA8C3C 8024015C 00621821 */ addu $v1, $v1, $v0 +/* EA8C40 80240160 04610004 */ bgez $v1, .L80240174 +/* EA8C44 80240164 AE0300A8 */ sw $v1, 0xa8($s0) +/* EA8C48 80240168 3C020002 */ lui $v0, 2 +/* EA8C4C 8024016C 08090061 */ j .L80240184 +/* EA8C50 80240170 00621021 */ addu $v0, $v1, $v0 +.L80240174: +/* EA8C54 80240174 3C040002 */ lui $a0, 2 +/* EA8C58 80240178 0083102A */ slt $v0, $a0, $v1 +/* EA8C5C 8024017C 10400002 */ beqz $v0, .L80240188 +/* EA8C60 80240180 00641023 */ subu $v0, $v1, $a0 +.L80240184: +/* EA8C64 80240184 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240188: +/* EA8C68 80240188 8E020074 */ lw $v0, 0x74($s0) +/* EA8C6C 8024018C 1440000E */ bnez $v0, .L802401C8 +/* EA8C70 80240190 00000000 */ nop +/* EA8C74 80240194 8E0300AC */ lw $v1, 0xac($s0) +/* EA8C78 80240198 8E02008C */ lw $v0, 0x8c($s0) +/* EA8C7C 8024019C 00621821 */ addu $v1, $v1, $v0 +/* EA8C80 802401A0 04610004 */ bgez $v1, .L802401B4 +/* EA8C84 802401A4 AE0300AC */ sw $v1, 0xac($s0) +/* EA8C88 802401A8 3C020002 */ lui $v0, 2 +/* EA8C8C 802401AC 08090071 */ j .L802401C4 +/* EA8C90 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* EA8C94 802401B4 3C040002 */ lui $a0, 2 +/* EA8C98 802401B8 0083102A */ slt $v0, $a0, $v1 +/* EA8C9C 802401BC 10400002 */ beqz $v0, .L802401C8 +/* EA8CA0 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* EA8CA4 802401C4 AE0200AC */ sw $v0, 0xac($s0) +.L802401C8: +/* EA8CA8 802401C8 8E020078 */ lw $v0, 0x78($s0) +/* EA8CAC 802401CC 1440000E */ bnez $v0, .L80240208 +/* EA8CB0 802401D0 00000000 */ nop +/* EA8CB4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) +/* EA8CB8 802401D8 8E020090 */ lw $v0, 0x90($s0) +/* EA8CBC 802401DC 00621821 */ addu $v1, $v1, $v0 +/* EA8CC0 802401E0 04610004 */ bgez $v1, .L802401F4 +/* EA8CC4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) +/* EA8CC8 802401E8 3C020002 */ lui $v0, 2 +/* EA8CCC 802401EC 08090081 */ j .L80240204 +/* EA8CD0 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* EA8CD4 802401F4 3C040002 */ lui $a0, 2 +/* EA8CD8 802401F8 0083102A */ slt $v0, $a0, $v1 +/* EA8CDC 802401FC 10400002 */ beqz $v0, .L80240208 +/* EA8CE0 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* EA8CE4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240208: +/* EA8CE8 80240208 8E02007C */ lw $v0, 0x7c($s0) +/* EA8CEC 8024020C 1440000E */ bnez $v0, .L80240248 +/* EA8CF0 80240210 00000000 */ nop +/* EA8CF4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) +/* EA8CF8 80240218 8E020094 */ lw $v0, 0x94($s0) +/* EA8CFC 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EA8D00 80240220 04610004 */ bgez $v1, .L80240234 +/* EA8D04 80240224 AE0300B4 */ sw $v1, 0xb4($s0) +/* EA8D08 80240228 3C020002 */ lui $v0, 2 +/* EA8D0C 8024022C 08090091 */ j .L80240244 +/* EA8D10 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* EA8D14 80240234 3C040002 */ lui $a0, 2 +/* EA8D18 80240238 0083102A */ slt $v0, $a0, $v1 +/* EA8D1C 8024023C 10400002 */ beqz $v0, .L80240248 +/* EA8D20 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* EA8D24 80240244 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240248: +/* EA8D28 80240248 8E040084 */ lw $a0, 0x84($s0) +/* EA8D2C 8024024C 0C049819 */ jal func_80126064 +/* EA8D30 80240250 8E0500A8 */ lw $a1, 0xa8($s0) +/* EA8D34 80240254 8E040084 */ lw $a0, 0x84($s0) +/* EA8D38 80240258 0C04981F */ jal func_8012607C +/* EA8D3C 8024025C 8E0500AC */ lw $a1, 0xac($s0) +/* EA8D40 80240260 8E040084 */ lw $a0, 0x84($s0) +/* EA8D44 80240264 0C049825 */ jal func_80126094 +/* EA8D48 80240268 8E0500B0 */ lw $a1, 0xb0($s0) +/* EA8D4C 8024026C 8E040084 */ lw $a0, 0x84($s0) +/* EA8D50 80240270 0C04982B */ jal func_801260AC +/* EA8D54 80240274 8E0500B4 */ lw $a1, 0xb4($s0) +/* EA8D58 80240278 8E020070 */ lw $v0, 0x70($s0) +/* EA8D5C 8024027C 8E030078 */ lw $v1, 0x78($s0) +/* EA8D60 80240280 8E040098 */ lw $a0, 0x98($s0) +/* EA8D64 80240284 24420001 */ addiu $v0, $v0, 1 +/* EA8D68 80240288 AE020070 */ sw $v0, 0x70($s0) +/* EA8D6C 8024028C 8E020074 */ lw $v0, 0x74($s0) +/* EA8D70 80240290 24630001 */ addiu $v1, $v1, 1 +/* EA8D74 80240294 AE030078 */ sw $v1, 0x78($s0) +/* EA8D78 80240298 8E030070 */ lw $v1, 0x70($s0) +/* EA8D7C 8024029C 24420001 */ addiu $v0, $v0, 1 +/* EA8D80 802402A0 AE020074 */ sw $v0, 0x74($s0) +/* EA8D84 802402A4 8E02007C */ lw $v0, 0x7c($s0) +/* EA8D88 802402A8 0064182A */ slt $v1, $v1, $a0 +/* EA8D8C 802402AC 24420001 */ addiu $v0, $v0, 1 +/* EA8D90 802402B0 14600002 */ bnez $v1, .L802402BC +/* EA8D94 802402B4 AE02007C */ sw $v0, 0x7c($s0) +/* EA8D98 802402B8 AE000070 */ sw $zero, 0x70($s0) +.L802402BC: +/* EA8D9C 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* EA8DA0 802402C0 8E03009C */ lw $v1, 0x9c($s0) +/* EA8DA4 802402C4 0043102A */ slt $v0, $v0, $v1 +/* EA8DA8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 +/* EA8DAC 802402CC AE000074 */ sw $zero, 0x74($s0) +.L802402D0: +/* EA8DB0 802402D0 8E020078 */ lw $v0, 0x78($s0) +/* EA8DB4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) +/* EA8DB8 802402D8 0043102A */ slt $v0, $v0, $v1 +/* EA8DBC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* EA8DC0 802402E0 AE000078 */ sw $zero, 0x78($s0) +.L802402E4: +/* EA8DC4 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* EA8DC8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) +/* EA8DCC 802402EC 0043102A */ slt $v0, $v0, $v1 +/* EA8DD0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 +/* EA8DD4 802402F4 AE00007C */ sw $zero, 0x7c($s0) +.L802402F8: +/* EA8DD8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) +/* EA8DDC 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* EA8DE0 80240300 0000102D */ daddu $v0, $zero, $zero +/* EA8DE4 80240304 03E00008 */ jr $ra +/* EA8DE8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA8AE0/func_8024030C_EA8DEC.s b/asm/nonmatchings/code_EA8AE0/func_8024030C_EA8DEC.s new file mode 100644 index 0000000000..349246c06a --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_8024030C_EA8DEC.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024030C_EA8DEC +/* EA8DEC 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA8DF0 80240310 AFBF001C */ sw $ra, 0x1c($sp) +/* EA8DF4 80240314 AFB00018 */ sw $s0, 0x18($sp) +/* EA8DF8 80240318 8C900084 */ lw $s0, 0x84($a0) +/* EA8DFC 8024031C C6000008 */ lwc1 $f0, 8($s0) +/* EA8E00 80240320 240400A2 */ addiu $a0, $zero, 0xa2 +/* EA8E04 80240324 E7A00010 */ swc1 $f0, 0x10($sp) +/* EA8E08 80240328 8E060000 */ lw $a2, ($s0) +/* EA8E0C 8024032C 8E070004 */ lw $a3, 4($s0) +/* EA8E10 80240330 0C055C13 */ jal func_8015704C +/* EA8E14 80240334 0000282D */ daddu $a1, $zero, $zero +/* EA8E18 80240338 86020044 */ lh $v0, 0x44($s0) +/* EA8E1C 8024033C 8FBF001C */ lw $ra, 0x1c($sp) +/* EA8E20 80240340 8FB00018 */ lw $s0, 0x18($sp) +/* EA8E24 80240344 28420002 */ slti $v0, $v0, 2 +/* EA8E28 80240348 38420001 */ xori $v0, $v0, 1 +/* EA8E2C 8024034C 00021040 */ sll $v0, $v0, 1 +/* EA8E30 80240350 03E00008 */ jr $ra +/* EA8E34 80240354 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA8AE0/func_80240358_EA8E38.s b/asm/nonmatchings/code_EA8AE0/func_80240358_EA8E38.s new file mode 100644 index 0000000000..d49950d5bc --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80240358_EA8E38.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240358_EA8E38 +/* EA8E38 80240358 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EA8E3C 8024035C AFB20020 */ sw $s2, 0x20($sp) +/* EA8E40 80240360 0080902D */ daddu $s2, $a0, $zero +/* EA8E44 80240364 AFBF0024 */ sw $ra, 0x24($sp) +/* EA8E48 80240368 AFB1001C */ sw $s1, 0x1c($sp) +/* EA8E4C 8024036C AFB00018 */ sw $s0, 0x18($sp) +/* EA8E50 80240370 10A0004A */ beqz $a1, .L8024049C +/* EA8E54 80240374 8E51000C */ lw $s1, 0xc($s2) +/* EA8E58 80240378 0C00AFF5 */ jal func_8002BFD4 +/* EA8E5C 8024037C 24040058 */ addiu $a0, $zero, 0x58 +/* EA8E60 80240380 0000202D */ daddu $a0, $zero, $zero +/* EA8E64 80240384 3C05FD05 */ lui $a1, 0xfd05 +/* EA8E68 80240388 34A50F81 */ ori $a1, $a1, 0xf81 +/* EA8E6C 8024038C 0040802D */ daddu $s0, $v0, $zero +/* EA8E70 80240390 0200302D */ daddu $a2, $s0, $zero +/* EA8E74 80240394 0C0B551A */ jal func_802D5468 +/* EA8E78 80240398 AE500084 */ sw $s0, 0x84($s2) +/* EA8E7C 8024039C 8E250000 */ lw $a1, ($s1) +/* EA8E80 802403A0 26310004 */ addiu $s1, $s1, 4 +/* EA8E84 802403A4 0C0B53A3 */ jal func_802D4E8C +/* EA8E88 802403A8 0240202D */ daddu $a0, $s2, $zero +/* EA8E8C 802403AC AE020038 */ sw $v0, 0x38($s0) +/* EA8E90 802403B0 8E250000 */ lw $a1, ($s1) +/* EA8E94 802403B4 26310004 */ addiu $s1, $s1, 4 +/* EA8E98 802403B8 0C0B53A3 */ jal func_802D4E8C +/* EA8E9C 802403BC 0240202D */ daddu $a0, $s2, $zero +/* EA8EA0 802403C0 AE02003C */ sw $v0, 0x3c($s0) +/* EA8EA4 802403C4 8E250000 */ lw $a1, ($s1) +/* EA8EA8 802403C8 26310004 */ addiu $s1, $s1, 4 +/* EA8EAC 802403CC 0C0B55FF */ jal func_802D57FC +/* EA8EB0 802403D0 0240202D */ daddu $a0, $s2, $zero +/* EA8EB4 802403D4 E600000C */ swc1 $f0, 0xc($s0) +/* EA8EB8 802403D8 8E250000 */ lw $a1, ($s1) +/* EA8EBC 802403DC 26310004 */ addiu $s1, $s1, 4 +/* EA8EC0 802403E0 0C0B55FF */ jal func_802D57FC +/* EA8EC4 802403E4 0240202D */ daddu $a0, $s2, $zero +/* EA8EC8 802403E8 E6000010 */ swc1 $f0, 0x10($s0) +/* EA8ECC 802403EC 8E250000 */ lw $a1, ($s1) +/* EA8ED0 802403F0 26310004 */ addiu $s1, $s1, 4 +/* EA8ED4 802403F4 0C0B55FF */ jal func_802D57FC +/* EA8ED8 802403F8 0240202D */ daddu $a0, $s2, $zero +/* EA8EDC 802403FC E6000014 */ swc1 $f0, 0x14($s0) +/* EA8EE0 80240400 8E250000 */ lw $a1, ($s1) +/* EA8EE4 80240404 26310004 */ addiu $s1, $s1, 4 +/* EA8EE8 80240408 0C0B55FF */ jal func_802D57FC +/* EA8EEC 8024040C 0240202D */ daddu $a0, $s2, $zero +/* EA8EF0 80240410 E6000018 */ swc1 $f0, 0x18($s0) +/* EA8EF4 80240414 8E250000 */ lw $a1, ($s1) +/* EA8EF8 80240418 26310004 */ addiu $s1, $s1, 4 +/* EA8EFC 8024041C 0C0B55FF */ jal func_802D57FC +/* EA8F00 80240420 0240202D */ daddu $a0, $s2, $zero +/* EA8F04 80240424 E600001C */ swc1 $f0, 0x1c($s0) +/* EA8F08 80240428 8E250000 */ lw $a1, ($s1) +/* EA8F0C 8024042C 26310004 */ addiu $s1, $s1, 4 +/* EA8F10 80240430 0C0B55FF */ jal func_802D57FC +/* EA8F14 80240434 0240202D */ daddu $a0, $s2, $zero +/* EA8F18 80240438 E6000020 */ swc1 $f0, 0x20($s0) +/* EA8F1C 8024043C 8E250000 */ lw $a1, ($s1) +/* EA8F20 80240440 26310004 */ addiu $s1, $s1, 4 +/* EA8F24 80240444 0C0B55FF */ jal func_802D57FC +/* EA8F28 80240448 0240202D */ daddu $a0, $s2, $zero +/* EA8F2C 8024044C E6000024 */ swc1 $f0, 0x24($s0) +/* EA8F30 80240450 8E250000 */ lw $a1, ($s1) +/* EA8F34 80240454 0C0B55FF */ jal func_802D57FC +/* EA8F38 80240458 0240202D */ daddu $a0, $s2, $zero +/* EA8F3C 8024045C 3C013F80 */ lui $at, 0x3f80 +/* EA8F40 80240460 44811000 */ mtc1 $at, $f2 +/* EA8F44 80240464 E6000028 */ swc1 $f0, 0x28($s0) +/* EA8F48 80240468 AFA00014 */ sw $zero, 0x14($sp) +/* EA8F4C 8024046C E7A20010 */ swc1 $f2, 0x10($sp) +/* EA8F50 80240470 8E05000C */ lw $a1, 0xc($s0) +/* EA8F54 80240474 8E060010 */ lw $a2, 0x10($s0) +/* EA8F58 80240478 8E070014 */ lw $a3, 0x14($s0) +/* EA8F5C 8024047C 0C01DF0C */ jal func_80077C30 +/* EA8F60 80240480 24040002 */ addiu $a0, $zero, 2 +/* EA8F64 80240484 AE020050 */ sw $v0, 0x50($s0) +/* EA8F68 80240488 A600004E */ sh $zero, 0x4e($s0) +/* EA8F6C 8024048C A6000048 */ sh $zero, 0x48($s0) +/* EA8F70 80240490 A600004A */ sh $zero, 0x4a($s0) +/* EA8F74 80240494 A6000044 */ sh $zero, 0x44($s0) +/* EA8F78 80240498 A6000046 */ sh $zero, 0x46($s0) +.L8024049C: +/* EA8F7C 8024049C 8FBF0024 */ lw $ra, 0x24($sp) +/* EA8F80 802404A0 8FB20020 */ lw $s2, 0x20($sp) +/* EA8F84 802404A4 8FB1001C */ lw $s1, 0x1c($sp) +/* EA8F88 802404A8 8FB00018 */ lw $s0, 0x18($sp) +/* EA8F8C 802404AC 24020002 */ addiu $v0, $zero, 2 +/* EA8F90 802404B0 03E00008 */ jr $ra +/* EA8F94 802404B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s b/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s new file mode 100644 index 0000000000..1cd835d628 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s @@ -0,0 +1,272 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404B8_EA8F98 +/* EA8F98 802404B8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EA8F9C 802404BC AFBF0020 */ sw $ra, 0x20($sp) +/* EA8FA0 802404C0 AFB1001C */ sw $s1, 0x1c($sp) +/* EA8FA4 802404C4 AFB00018 */ sw $s0, 0x18($sp) +/* EA8FA8 802404C8 8C910084 */ lw $s1, 0x84($a0) +/* EA8FAC 802404CC 86230044 */ lh $v1, 0x44($s1) +/* EA8FB0 802404D0 3C108011 */ lui $s0, %hi(D_80117578) +/* EA8FB4 802404D4 26107578 */ addiu $s0, $s0, %lo(D_80117578) +/* EA8FB8 802404D8 2C620005 */ sltiu $v0, $v1, 5 +/* EA8FBC 802404DC 1040008A */ beqz $v0, .L80240708 +/* EA8FC0 802404E0 00031080 */ sll $v0, $v1, 2 +/* EA8FC4 802404E4 3C018025 */ lui $at, %hi(D_80248340) +/* EA8FC8 802404E8 00220821 */ addu $at, $at, $v0 +/* EA8FCC 802404EC 8C228340 */ lw $v0, %lo(D_80248340)($at) +/* EA8FD0 802404F0 00400008 */ jr $v0 +/* EA8FD4 802404F4 00000000 */ nop +/* EA8FD8 802404F8 8E22003C */ lw $v0, 0x3c($s1) +/* EA8FDC 802404FC 86270046 */ lh $a3, 0x46($s1) +/* EA8FE0 80240500 AFA20010 */ sw $v0, 0x10($sp) +/* EA8FE4 80240504 8E250010 */ lw $a1, 0x10($s1) +/* EA8FE8 80240508 8E26001C */ lw $a2, 0x1c($s1) +/* EA8FEC 8024050C 0C00ADA9 */ jal func_8002B6A4 +/* EA8FF0 80240510 24040005 */ addiu $a0, $zero, 5 +/* EA8FF4 80240514 86270046 */ lh $a3, 0x46($s1) +/* EA8FF8 80240518 8E22003C */ lw $v0, 0x3c($s1) +/* EA8FFC 8024051C E6200004 */ swc1 $f0, 4($s1) +/* EA9000 80240520 AFA20010 */ sw $v0, 0x10($sp) +/* EA9004 80240524 8E25000C */ lw $a1, 0xc($s1) +/* EA9008 80240528 8E260018 */ lw $a2, 0x18($s1) +/* EA900C 8024052C 0C00ADA9 */ jal func_8002B6A4 +/* EA9010 80240530 0000202D */ daddu $a0, $zero, $zero +/* EA9014 80240534 86270046 */ lh $a3, 0x46($s1) +/* EA9018 80240538 8E22003C */ lw $v0, 0x3c($s1) +/* EA901C 8024053C E6200000 */ swc1 $f0, ($s1) +/* EA9020 80240540 AFA20010 */ sw $v0, 0x10($sp) +/* EA9024 80240544 8E250014 */ lw $a1, 0x14($s1) +/* EA9028 80240548 8E260020 */ lw $a2, 0x20($s1) +/* EA902C 8024054C 0C00ADA9 */ jal func_8002B6A4 +/* EA9030 80240550 0000202D */ daddu $a0, $zero, $zero +/* EA9034 80240554 8E220050 */ lw $v0, 0x50($s1) +/* EA9038 80240558 E6200008 */ swc1 $f0, 8($s1) +/* EA903C 8024055C C6200000 */ lwc1 $f0, ($s1) +/* EA9040 80240560 8C42000C */ lw $v0, 0xc($v0) +/* EA9044 80240564 E4400008 */ swc1 $f0, 8($v0) +/* EA9048 80240568 8E220050 */ lw $v0, 0x50($s1) +/* EA904C 8024056C C6200004 */ lwc1 $f0, 4($s1) +/* EA9050 80240570 8C42000C */ lw $v0, 0xc($v0) +/* EA9054 80240574 E440000C */ swc1 $f0, 0xc($v0) +/* EA9058 80240578 8E220050 */ lw $v0, 0x50($s1) +/* EA905C 8024057C C6200008 */ lwc1 $f0, 8($s1) +/* EA9060 80240580 8C42000C */ lw $v0, 0xc($v0) +/* EA9064 80240584 E4400010 */ swc1 $f0, 0x10($v0) +/* EA9068 80240588 96220046 */ lhu $v0, 0x46($s1) +/* EA906C 8024058C 8E23003C */ lw $v1, 0x3c($s1) +/* EA9070 80240590 24420001 */ addiu $v0, $v0, 1 +/* EA9074 80240594 A6220046 */ sh $v0, 0x46($s1) +/* EA9078 80240598 00021400 */ sll $v0, $v0, 0x10 +/* EA907C 8024059C 00021403 */ sra $v0, $v0, 0x10 +/* EA9080 802405A0 0043102A */ slt $v0, $v0, $v1 +/* EA9084 802405A4 14400058 */ bnez $v0, .L80240708 +/* EA9088 802405A8 24020001 */ addiu $v0, $zero, 1 +/* EA908C 802405AC A6220044 */ sh $v0, 0x44($s1) +/* EA9090 802405B0 080901C2 */ j .L80240708 +/* EA9094 802405B4 A6200046 */ sh $zero, 0x46($s1) +/* EA9098 802405B8 96220046 */ lhu $v0, 0x46($s1) +/* EA909C 802405BC 24420001 */ addiu $v0, $v0, 1 +/* EA90A0 802405C0 A6220046 */ sh $v0, 0x46($s1) +/* EA90A4 802405C4 00021400 */ sll $v0, $v0, 0x10 +/* EA90A8 802405C8 00021403 */ sra $v0, $v0, 0x10 +/* EA90AC 802405CC 2842003C */ slti $v0, $v0, 0x3c +/* EA90B0 802405D0 1440004D */ bnez $v0, .L80240708 +/* EA90B4 802405D4 24020002 */ addiu $v0, $zero, 2 +/* EA90B8 802405D8 8E230050 */ lw $v1, 0x50($s1) +/* EA90BC 802405DC A6220044 */ sh $v0, 0x44($s1) +/* EA90C0 802405E0 A6200046 */ sh $zero, 0x46($s1) +/* EA90C4 802405E4 8C63000C */ lw $v1, 0xc($v1) +/* EA90C8 802405E8 24020001 */ addiu $v0, $zero, 1 +/* EA90CC 802405EC AC620070 */ sw $v0, 0x70($v1) +/* EA90D0 802405F0 8E220050 */ lw $v0, 0x50($s1) +/* EA90D4 802405F4 8C42000C */ lw $v0, 0xc($v0) +/* EA90D8 802405F8 080901C2 */ j .L80240708 +/* EA90DC 802405FC AC400074 */ sw $zero, 0x74($v0) +/* EA90E0 80240600 96220046 */ lhu $v0, 0x46($s1) +/* EA90E4 80240604 24420001 */ addiu $v0, $v0, 1 +/* EA90E8 80240608 A6220046 */ sh $v0, 0x46($s1) +/* EA90EC 8024060C 00021400 */ sll $v0, $v0, 0x10 +/* EA90F0 80240610 00021403 */ sra $v0, $v0, 0x10 +/* EA90F4 80240614 2842003C */ slti $v0, $v0, 0x3c +/* EA90F8 80240618 1440003B */ bnez $v0, .L80240708 +/* EA90FC 8024061C 00000000 */ nop +/* EA9100 80240620 3C013F80 */ lui $at, 0x3f80 +/* EA9104 80240624 44810000 */ mtc1 $at, $f0 +/* EA9108 80240628 AFA00014 */ sw $zero, 0x14($sp) +/* EA910C 8024062C E7A00010 */ swc1 $f0, 0x10($sp) +/* EA9110 80240630 8E250018 */ lw $a1, 0x18($s1) +/* EA9114 80240634 8E26001C */ lw $a2, 0x1c($s1) +/* EA9118 80240638 8E270020 */ lw $a3, 0x20($s1) +/* EA911C 8024063C 0C01DE4C */ jal func_80077930 +/* EA9120 80240640 24040001 */ addiu $a0, $zero, 1 +/* EA9124 80240644 AE220054 */ sw $v0, 0x54($s1) +/* EA9128 80240648 8C43000C */ lw $v1, 0xc($v0) +/* EA912C 8024064C 9222003B */ lbu $v0, 0x3b($s1) +/* EA9130 80240650 A0620034 */ sb $v0, 0x34($v1) +/* EA9134 80240654 8E220054 */ lw $v0, 0x54($s1) +/* EA9138 80240658 8C42000C */ lw $v0, 0xc($v0) +/* EA913C 8024065C AC400020 */ sw $zero, 0x20($v0) +/* EA9140 80240660 8E250018 */ lw $a1, 0x18($s1) +/* EA9144 80240664 8E260028 */ lw $a2, 0x28($s1) +/* EA9148 80240668 8E270020 */ lw $a3, 0x20($s1) +/* EA914C 8024066C 0C046AAD */ jal func_8011AAB4 +/* EA9150 80240670 0000202D */ daddu $a0, $zero, $zero +/* EA9154 80240674 3C014210 */ lui $at, 0x4210 +/* EA9158 80240678 44810000 */ mtc1 $at, $f0 +/* EA915C 8024067C AE220040 */ sw $v0, 0x40($s1) +/* EA9160 80240680 24020003 */ addiu $v0, $zero, 3 +/* EA9164 80240684 A6220044 */ sh $v0, 0x44($s1) +/* EA9168 80240688 24020001 */ addiu $v0, $zero, 1 +/* EA916C 8024068C A6200046 */ sh $zero, 0x46($s1) +/* EA9170 80240690 AE20002C */ sw $zero, 0x2c($s1) +/* EA9174 80240694 A6220048 */ sh $v0, 0x48($s1) +/* EA9178 80240698 080901C2 */ j .L80240708 +/* EA917C 8024069C E6200030 */ swc1 $f0, 0x30($s1) +/* EA9180 802406A0 0000202D */ daddu $a0, $zero, $zero +/* EA9184 802406A4 3C054210 */ lui $a1, 0x4210 +/* EA9188 802406A8 3C064198 */ lui $a2, 0x4198 +/* EA918C 802406AC 86270046 */ lh $a3, 0x46($s1) +/* EA9190 802406B0 24020078 */ addiu $v0, $zero, 0x78 +/* EA9194 802406B4 0C00ADA9 */ jal func_8002B6A4 +/* EA9198 802406B8 AFA20010 */ sw $v0, 0x10($sp) +/* EA919C 802406BC 96220046 */ lhu $v0, 0x46($s1) +/* EA91A0 802406C0 E6200030 */ swc1 $f0, 0x30($s1) +/* EA91A4 802406C4 24420001 */ addiu $v0, $v0, 1 +/* EA91A8 802406C8 A6220046 */ sh $v0, 0x46($s1) +/* EA91AC 802406CC 00021400 */ sll $v0, $v0, 0x10 +/* EA91B0 802406D0 00021403 */ sra $v0, $v0, 0x10 +/* EA91B4 802406D4 28420078 */ slti $v0, $v0, 0x78 +/* EA91B8 802406D8 1440000B */ bnez $v0, .L80240708 +/* EA91BC 802406DC 24030001 */ addiu $v1, $zero, 1 +/* EA91C0 802406E0 C620002C */ lwc1 $f0, 0x2c($s1) +/* EA91C4 802406E4 24020002 */ addiu $v0, $zero, 2 +/* EA91C8 802406E8 A6220048 */ sh $v0, 0x48($s1) +/* EA91CC 802406EC 24020004 */ addiu $v0, $zero, 4 +/* EA91D0 802406F0 A620004C */ sh $zero, 0x4c($s1) +/* EA91D4 802406F4 A623004A */ sh $v1, 0x4a($s1) +/* EA91D8 802406F8 A623004E */ sh $v1, 0x4e($s1) +/* EA91DC 802406FC A6220044 */ sh $v0, 0x44($s1) +/* EA91E0 80240700 A6200046 */ sh $zero, 0x46($s1) +/* EA91E4 80240704 E6200034 */ swc1 $f0, 0x34($s1) +.L80240708: +/* EA91E8 80240708 8623004A */ lh $v1, 0x4a($s1) +/* EA91EC 8024070C 24020001 */ addiu $v0, $zero, 1 +/* EA91F0 80240710 10620005 */ beq $v1, $v0, .L80240728 +/* EA91F4 80240714 24020002 */ addiu $v0, $zero, 2 +/* EA91F8 80240718 1062001E */ beq $v1, $v0, .L80240794 +/* EA91FC 8024071C 00000000 */ nop +/* EA9200 80240720 0809020F */ j .L8024083C +/* EA9204 80240724 00000000 */ nop +.L80240728: +/* EA9208 80240728 8627004C */ lh $a3, 0x4c($s1) +/* EA920C 8024072C 24100078 */ addiu $s0, $zero, 0x78 +/* EA9210 80240730 AFB00010 */ sw $s0, 0x10($sp) +/* EA9214 80240734 8E250034 */ lw $a1, 0x34($s1) +/* EA9218 80240738 3C0644B4 */ lui $a2, 0x44b4 +/* EA921C 8024073C 0C00ADA9 */ jal func_8002B6A4 +/* EA9220 80240740 24040004 */ addiu $a0, $zero, 4 +/* EA9224 80240744 8627004C */ lh $a3, 0x4c($s1) +/* EA9228 80240748 E620002C */ swc1 $f0, 0x2c($s1) +/* EA922C 8024074C AFB00010 */ sw $s0, 0x10($sp) +/* EA9230 80240750 8E25001C */ lw $a1, 0x1c($s1) +/* EA9234 80240754 8E260024 */ lw $a2, 0x24($s1) +/* EA9238 80240758 0C00ADA9 */ jal func_8002B6A4 +/* EA923C 8024075C 2404000A */ addiu $a0, $zero, 0xa +/* EA9240 80240760 9622004C */ lhu $v0, 0x4c($s1) +/* EA9244 80240764 E6200004 */ swc1 $f0, 4($s1) +/* EA9248 80240768 24420001 */ addiu $v0, $v0, 1 +/* EA924C 8024076C A622004C */ sh $v0, 0x4c($s1) +/* EA9250 80240770 00021400 */ sll $v0, $v0, 0x10 +/* EA9254 80240774 00021403 */ sra $v0, $v0, 0x10 +/* EA9258 80240778 0050102A */ slt $v0, $v0, $s0 +/* EA925C 8024077C 1440002F */ bnez $v0, .L8024083C +/* EA9260 80240780 2402010E */ addiu $v0, $zero, 0x10e +/* EA9264 80240784 A622004C */ sh $v0, 0x4c($s1) +/* EA9268 80240788 24020002 */ addiu $v0, $zero, 2 +/* EA926C 8024078C 0809020E */ j .L80240838 +/* EA9270 80240790 A622004A */ sh $v0, 0x4a($s1) +.L80240794: +/* EA9274 80240794 8622004C */ lh $v0, 0x4c($s1) +/* EA9278 80240798 44826000 */ mtc1 $v0, $f12 +/* EA927C 8024079C 00000000 */ nop +/* EA9280 802407A0 0C00AD77 */ jal func_8002B5DC +/* EA9284 802407A4 46806320 */ cvt.s.w $f12, $f12 +/* EA9288 802407A8 3C013F80 */ lui $at, 0x3f80 +/* EA928C 802407AC 44811000 */ mtc1 $at, $f2 +/* EA9290 802407B0 00000000 */ nop +/* EA9294 802407B4 46020000 */ add.s $f0, $f0, $f2 +/* EA9298 802407B8 46000000 */ add.s $f0, $f0, $f0 +/* EA929C 802407BC C6220024 */ lwc1 $f2, 0x24($s1) +/* EA92A0 802407C0 8622004C */ lh $v0, 0x4c($s1) +/* EA92A4 802407C4 46001080 */ add.s $f2, $f2, $f0 +/* EA92A8 802407C8 24420008 */ addiu $v0, $v0, 8 +/* EA92AC 802407CC 44826000 */ mtc1 $v0, $f12 +/* EA92B0 802407D0 00000000 */ nop +/* EA92B4 802407D4 46806320 */ cvt.s.w $f12, $f12 +/* EA92B8 802407D8 0C00AB85 */ jal func_8002AE14 +/* EA92BC 802407DC E6220004 */ swc1 $f2, 4($s1) +/* EA92C0 802407E0 4600010D */ trunc.w.s $f4, $f0 +/* EA92C4 802407E4 44022000 */ mfc1 $v0, $f4 +/* EA92C8 802407E8 C6200004 */ lwc1 $f0, 4($s1) +/* EA92CC 802407EC A622004C */ sh $v0, 0x4c($s1) +/* EA92D0 802407F0 C60C0028 */ lwc1 $f12, 0x28($s0) +/* EA92D4 802407F4 8E060030 */ lw $a2, 0x30($s0) +/* EA92D8 802407F8 3C0141A0 */ lui $at, 0x41a0 +/* EA92DC 802407FC 44817000 */ mtc1 $at, $f14 +/* EA92E0 80240800 E7A00010 */ swc1 $f0, 0x10($sp) +/* EA92E4 80240804 C602002C */ lwc1 $f2, 0x2c($s0) +/* EA92E8 80240808 C6200008 */ lwc1 $f0, 8($s1) +/* EA92EC 8024080C E7A00014 */ swc1 $f0, 0x14($sp) +/* EA92F0 80240810 8E270000 */ lw $a3, ($s1) +/* EA92F4 80240814 0C00AC87 */ jal func_8002B21C +/* EA92F8 80240818 460E1380 */ add.s $f14, $f2, $f14 +/* EA92FC 8024081C 3C0141F0 */ lui $at, 0x41f0 +/* EA9300 80240820 44811000 */ mtc1 $at, $f2 +/* EA9304 80240824 00000000 */ nop +/* EA9308 80240828 4600103C */ c.lt.s $f2, $f0 +/* EA930C 8024082C 00000000 */ nop +/* EA9310 80240830 45010002 */ bc1t .L8024083C +/* EA9314 80240834 24020003 */ addiu $v0, $zero, 3 +.L80240838: +/* EA9318 80240838 A622004E */ sh $v0, 0x4e($s1) +.L8024083C: +/* EA931C 8024083C 86230048 */ lh $v1, 0x48($s1) +/* EA9320 80240840 24020001 */ addiu $v0, $zero, 1 +/* EA9324 80240844 10620005 */ beq $v1, $v0, .L8024085C +/* EA9328 80240848 24020002 */ addiu $v0, $zero, 2 +/* EA932C 8024084C 10620008 */ beq $v1, $v0, .L80240870 +/* EA9330 80240850 00000000 */ nop +/* EA9334 80240854 0809022C */ j .L802408B0 +/* EA9338 80240858 00000000 */ nop +.L8024085C: +/* EA933C 8024085C C620002C */ lwc1 $f0, 0x2c($s1) +/* EA9340 80240860 C62C0030 */ lwc1 $f12, 0x30($s1) +/* EA9344 80240864 0C00AB85 */ jal func_8002AE14 +/* EA9348 80240868 460C0300 */ add.s $f12, $f0, $f12 +/* EA934C 8024086C E620002C */ swc1 $f0, 0x2c($s1) +.L80240870: +/* EA9350 80240870 8E220054 */ lw $v0, 0x54($s1) +/* EA9354 80240874 C620002C */ lwc1 $f0, 0x2c($s1) +/* EA9358 80240878 8C42000C */ lw $v0, 0xc($v0) +/* EA935C 8024087C E4400024 */ swc1 $f0, 0x24($v0) +/* EA9360 80240880 8E220054 */ lw $v0, 0x54($s1) +/* EA9364 80240884 C6200018 */ lwc1 $f0, 0x18($s1) +/* EA9368 80240888 8C42000C */ lw $v0, 0xc($v0) +/* EA936C 8024088C E4400004 */ swc1 $f0, 4($v0) +/* EA9370 80240890 8E220054 */ lw $v0, 0x54($s1) +/* EA9374 80240894 C6200004 */ lwc1 $f0, 4($s1) +/* EA9378 80240898 8C42000C */ lw $v0, 0xc($v0) +/* EA937C 8024089C E4400008 */ swc1 $f0, 8($v0) +/* EA9380 802408A0 8E220054 */ lw $v0, 0x54($s1) +/* EA9384 802408A4 C6200020 */ lwc1 $f0, 0x20($s1) +/* EA9388 802408A8 8C42000C */ lw $v0, 0xc($v0) +/* EA938C 802408AC E440000C */ swc1 $f0, 0xc($v0) +.L802408B0: +/* EA9390 802408B0 8FBF0020 */ lw $ra, 0x20($sp) +/* EA9394 802408B4 8FB1001C */ lw $s1, 0x1c($sp) +/* EA9398 802408B8 8FB00018 */ lw $s0, 0x18($sp) +/* EA939C 802408BC 0000102D */ daddu $v0, $zero, $zero +/* EA93A0 802408C0 03E00008 */ jr $ra +/* EA93A4 802408C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EA8AE0/func_802408C8_EA93A8.s b/asm/nonmatchings/code_EA8AE0/func_802408C8_EA93A8.s new file mode 100644 index 0000000000..7c75c5a06c --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_802408C8_EA93A8.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408C8_EA93A8 +/* EA93A8 802408C8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA93AC 802408CC AFB00010 */ sw $s0, 0x10($sp) +/* EA93B0 802408D0 0080802D */ daddu $s0, $a0, $zero +/* EA93B4 802408D4 AFBF0014 */ sw $ra, 0x14($sp) +/* EA93B8 802408D8 8E02000C */ lw $v0, 0xc($s0) +/* EA93BC 802408DC 0C0B53A3 */ jal func_802D4E8C +/* EA93C0 802408E0 8C450000 */ lw $a1, ($v0) +/* EA93C4 802408E4 8E030084 */ lw $v1, 0x84($s0) +/* EA93C8 802408E8 8FBF0014 */ lw $ra, 0x14($sp) +/* EA93CC 802408EC 8463004E */ lh $v1, 0x4e($v1) +/* EA93D0 802408F0 8FB00010 */ lw $s0, 0x10($sp) +/* EA93D4 802408F4 00621826 */ xor $v1, $v1, $v0 +/* EA93D8 802408F8 2C630001 */ sltiu $v1, $v1, 1 +/* EA93DC 802408FC 00031040 */ sll $v0, $v1, 1 +/* EA93E0 80240900 03E00008 */ jr $ra +/* EA93E4 80240904 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA8AE0/func_80240908_EA93E8.s b/asm/nonmatchings/code_EA8AE0/func_80240908_EA93E8.s new file mode 100644 index 0000000000..f4a63de96c --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80240908_EA93E8.s @@ -0,0 +1,72 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240908_EA93E8 +/* EA93E8 80240908 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EA93EC 8024090C AFB20020 */ sw $s2, 0x20($sp) +/* EA93F0 80240910 0080902D */ daddu $s2, $a0, $zero +/* EA93F4 80240914 AFBF0024 */ sw $ra, 0x24($sp) +/* EA93F8 80240918 AFB1001C */ sw $s1, 0x1c($sp) +/* EA93FC 8024091C AFB00018 */ sw $s0, 0x18($sp) +/* EA9400 80240920 10A00035 */ beqz $a1, .L802409F8 +/* EA9404 80240924 8E51000C */ lw $s1, 0xc($s2) +/* EA9408 80240928 0C00AFF5 */ jal func_8002BFD4 +/* EA940C 8024092C 24040058 */ addiu $a0, $zero, 0x58 +/* EA9410 80240930 0040802D */ daddu $s0, $v0, $zero +/* EA9414 80240934 AE500084 */ sw $s0, 0x84($s2) +/* EA9418 80240938 8E250000 */ lw $a1, ($s1) +/* EA941C 8024093C 26310004 */ addiu $s1, $s1, 4 +/* EA9420 80240940 0C0B53A3 */ jal func_802D4E8C +/* EA9424 80240944 0240202D */ daddu $a0, $s2, $zero +/* EA9428 80240948 AE020038 */ sw $v0, 0x38($s0) +/* EA942C 8024094C 8E250000 */ lw $a1, ($s1) +/* EA9430 80240950 26310004 */ addiu $s1, $s1, 4 +/* EA9434 80240954 0C0B55FF */ jal func_802D57FC +/* EA9438 80240958 0240202D */ daddu $a0, $s2, $zero +/* EA943C 8024095C E6000018 */ swc1 $f0, 0x18($s0) +/* EA9440 80240960 8E250000 */ lw $a1, ($s1) +/* EA9444 80240964 26310004 */ addiu $s1, $s1, 4 +/* EA9448 80240968 0C0B55FF */ jal func_802D57FC +/* EA944C 8024096C 0240202D */ daddu $a0, $s2, $zero +/* EA9450 80240970 E6000024 */ swc1 $f0, 0x24($s0) +/* EA9454 80240974 8E250000 */ lw $a1, ($s1) +/* EA9458 80240978 26310004 */ addiu $s1, $s1, 4 +/* EA945C 8024097C 0C0B55FF */ jal func_802D57FC +/* EA9460 80240980 0240202D */ daddu $a0, $s2, $zero +/* EA9464 80240984 E6000020 */ swc1 $f0, 0x20($s0) +/* EA9468 80240988 8E250000 */ lw $a1, ($s1) +/* EA946C 8024098C 0C0B55FF */ jal func_802D57FC +/* EA9470 80240990 0240202D */ daddu $a0, $s2, $zero +/* EA9474 80240994 3C013F80 */ lui $at, 0x3f80 +/* EA9478 80240998 44811000 */ mtc1 $at, $f2 +/* EA947C 8024099C E6000028 */ swc1 $f0, 0x28($s0) +/* EA9480 802409A0 AFA00014 */ sw $zero, 0x14($sp) +/* EA9484 802409A4 E7A20010 */ swc1 $f2, 0x10($sp) +/* EA9488 802409A8 8E050018 */ lw $a1, 0x18($s0) +/* EA948C 802409AC 8E060024 */ lw $a2, 0x24($s0) +/* EA9490 802409B0 8E070020 */ lw $a3, 0x20($s0) +/* EA9494 802409B4 0C01DE4C */ jal func_80077930 +/* EA9498 802409B8 24040001 */ addiu $a0, $zero, 1 +/* EA949C 802409BC AE020054 */ sw $v0, 0x54($s0) +/* EA94A0 802409C0 8C43000C */ lw $v1, 0xc($v0) +/* EA94A4 802409C4 9202003B */ lbu $v0, 0x3b($s0) +/* EA94A8 802409C8 A0620034 */ sb $v0, 0x34($v1) +/* EA94AC 802409CC 8E020054 */ lw $v0, 0x54($s0) +/* EA94B0 802409D0 8C42000C */ lw $v0, 0xc($v0) +/* EA94B4 802409D4 AC400020 */ sw $zero, 0x20($v0) +/* EA94B8 802409D8 8E050018 */ lw $a1, 0x18($s0) +/* EA94BC 802409DC 8E060028 */ lw $a2, 0x28($s0) +/* EA94C0 802409E0 8E070020 */ lw $a3, 0x20($s0) +/* EA94C4 802409E4 0C046AAD */ jal func_8011AAB4 +/* EA94C8 802409E8 0000202D */ daddu $a0, $zero, $zero +/* EA94CC 802409EC AE020040 */ sw $v0, 0x40($s0) +/* EA94D0 802409F0 2402010E */ addiu $v0, $zero, 0x10e +/* EA94D4 802409F4 A602004C */ sh $v0, 0x4c($s0) +.L802409F8: +/* EA94D8 802409F8 8FBF0024 */ lw $ra, 0x24($sp) +/* EA94DC 802409FC 8FB20020 */ lw $s2, 0x20($sp) +/* EA94E0 80240A00 8FB1001C */ lw $s1, 0x1c($sp) +/* EA94E4 80240A04 8FB00018 */ lw $s0, 0x18($sp) +/* EA94E8 80240A08 24020002 */ addiu $v0, $zero, 2 +/* EA94EC 80240A0C 03E00008 */ jr $ra +/* EA94F0 80240A10 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EA8AE0/func_80240A14_EA94F4.s b/asm/nonmatchings/code_EA8AE0/func_80240A14_EA94F4.s new file mode 100644 index 0000000000..343f567749 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80240A14_EA94F4.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A14_EA94F4 +/* EA94F4 80240A14 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA94F8 80240A18 AFBF0014 */ sw $ra, 0x14($sp) +/* EA94FC 80240A1C AFB00010 */ sw $s0, 0x10($sp) +/* EA9500 80240A20 8C900084 */ lw $s0, 0x84($a0) +/* EA9504 80240A24 8602004C */ lh $v0, 0x4c($s0) +/* EA9508 80240A28 44826000 */ mtc1 $v0, $f12 +/* EA950C 80240A2C 00000000 */ nop +/* EA9510 80240A30 0C00AD77 */ jal func_8002B5DC +/* EA9514 80240A34 46806320 */ cvt.s.w $f12, $f12 +/* EA9518 80240A38 3C013F80 */ lui $at, 0x3f80 +/* EA951C 80240A3C 44811000 */ mtc1 $at, $f2 +/* EA9520 80240A40 00000000 */ nop +/* EA9524 80240A44 46020000 */ add.s $f0, $f0, $f2 +/* EA9528 80240A48 46000000 */ add.s $f0, $f0, $f0 +/* EA952C 80240A4C C6020024 */ lwc1 $f2, 0x24($s0) +/* EA9530 80240A50 8602004C */ lh $v0, 0x4c($s0) +/* EA9534 80240A54 46001080 */ add.s $f2, $f2, $f0 +/* EA9538 80240A58 24420008 */ addiu $v0, $v0, 8 +/* EA953C 80240A5C 44826000 */ mtc1 $v0, $f12 +/* EA9540 80240A60 00000000 */ nop +/* EA9544 80240A64 46806320 */ cvt.s.w $f12, $f12 +/* EA9548 80240A68 0C00AB85 */ jal func_8002AE14 +/* EA954C 80240A6C E6020004 */ swc1 $f2, 4($s0) +/* EA9550 80240A70 4600010D */ trunc.w.s $f4, $f0 +/* EA9554 80240A74 44022000 */ mfc1 $v0, $f4 +/* EA9558 80240A78 00000000 */ nop +/* EA955C 80240A7C A602004C */ sh $v0, 0x4c($s0) +/* EA9560 80240A80 3C028011 */ lui $v0, %hi(D_80117578) +/* EA9564 80240A84 24427578 */ addiu $v0, $v0, %lo(D_80117578) +/* EA9568 80240A88 C44C0028 */ lwc1 $f12, 0x28($v0) +/* EA956C 80240A8C C44E0030 */ lwc1 $f14, 0x30($v0) +/* EA9570 80240A90 8E060018 */ lw $a2, 0x18($s0) +/* EA9574 80240A94 0C00AC71 */ jal func_8002B1C4 +/* EA9578 80240A98 8E070020 */ lw $a3, 0x20($s0) +/* EA957C 80240A9C 3C0141F0 */ lui $at, 0x41f0 +/* EA9580 80240AA0 44811000 */ mtc1 $at, $f2 +/* EA9584 80240AA4 00000000 */ nop +/* EA9588 80240AA8 4602003E */ c.le.s $f0, $f2 +/* EA958C 80240AAC 00000000 */ nop +/* EA9590 80240AB0 45000002 */ bc1f .L80240ABC +/* EA9594 80240AB4 24020003 */ addiu $v0, $zero, 3 +/* EA9598 80240AB8 A602004E */ sh $v0, 0x4e($s0) +.L80240ABC: +/* EA959C 80240ABC 8E020054 */ lw $v0, 0x54($s0) +/* EA95A0 80240AC0 C6000018 */ lwc1 $f0, 0x18($s0) +/* EA95A4 80240AC4 8C42000C */ lw $v0, 0xc($v0) +/* EA95A8 80240AC8 E4400004 */ swc1 $f0, 4($v0) +/* EA95AC 80240ACC 8E020054 */ lw $v0, 0x54($s0) +/* EA95B0 80240AD0 C6000004 */ lwc1 $f0, 4($s0) +/* EA95B4 80240AD4 8C42000C */ lw $v0, 0xc($v0) +/* EA95B8 80240AD8 E4400008 */ swc1 $f0, 8($v0) +/* EA95BC 80240ADC 8E020054 */ lw $v0, 0x54($s0) +/* EA95C0 80240AE0 C6000020 */ lwc1 $f0, 0x20($s0) +/* EA95C4 80240AE4 8C42000C */ lw $v0, 0xc($v0) +/* EA95C8 80240AE8 E440000C */ swc1 $f0, 0xc($v0) +/* EA95CC 80240AEC 8FBF0014 */ lw $ra, 0x14($sp) +/* EA95D0 80240AF0 8FB00010 */ lw $s0, 0x10($sp) +/* EA95D4 80240AF4 0000102D */ daddu $v0, $zero, $zero +/* EA95D8 80240AF8 03E00008 */ jr $ra +/* EA95DC 80240AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA8AE0/func_80240B00_EA95E0.s b/asm/nonmatchings/code_EA8AE0/func_80240B00_EA95E0.s new file mode 100644 index 0000000000..9105d4998a --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80240B00_EA95E0.s @@ -0,0 +1,58 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B00_EA95E0 +/* EA95E0 80240B00 27BDFE60 */ addiu $sp, $sp, -0x1a0 +/* EA95E4 80240B04 AFB30194 */ sw $s3, 0x194($sp) +/* EA95E8 80240B08 0080982D */ daddu $s3, $a0, $zero +/* EA95EC 80240B0C AFB1018C */ sw $s1, 0x18c($sp) +/* EA95F0 80240B10 27B10010 */ addiu $s1, $sp, 0x10 +/* EA95F4 80240B14 0220202D */ daddu $a0, $s1, $zero +/* EA95F8 80240B18 24050001 */ addiu $a1, $zero, 1 +/* EA95FC 80240B1C AFBF0198 */ sw $ra, 0x198($sp) +/* EA9600 80240B20 AFB20190 */ sw $s2, 0x190($sp) +/* EA9604 80240B24 AFB00188 */ sw $s0, 0x188($sp) +/* EA9608 80240B28 8E630090 */ lw $v1, 0x90($s3) +/* EA960C 80240B2C 0000902D */ daddu $s2, $zero, $zero +/* EA9610 80240B30 AFB3017C */ sw $s3, 0x17c($sp) +/* EA9614 80240B34 00A31004 */ sllv $v0, $v1, $a1 +/* EA9618 80240B38 00431021 */ addu $v0, $v0, $v1 +/* EA961C 80240B3C AFA20178 */ sw $v0, 0x178($sp) +/* EA9620 80240B40 8E630090 */ lw $v1, 0x90($s3) +/* EA9624 80240B44 27A20178 */ addiu $v0, $sp, 0x178 +/* EA9628 80240B48 AFA00184 */ sw $zero, 0x184($sp) +/* EA962C 80240B4C AFA2001C */ sw $v0, 0x1c($sp) +/* EA9630 80240B50 0C0B8AA0 */ jal func_802E2A80 +/* EA9634 80240B54 AFA30180 */ sw $v1, 0x180($sp) +/* EA9638 80240B58 0260802D */ daddu $s0, $s3, $zero +.L80240B5C: +/* EA963C 80240B5C 0220202D */ daddu $a0, $s1, $zero +/* EA9640 80240B60 0C0B8ADD */ jal func_802E2B74 +/* EA9644 80240B64 24050001 */ addiu $a1, $zero, 1 +/* EA9648 80240B68 0220202D */ daddu $a0, $s1, $zero +/* EA964C 80240B6C 3C05FE36 */ lui $a1, 0xfe36 +/* EA9650 80240B70 0C0B55FF */ jal func_802D57FC +/* EA9654 80240B74 34A53C81 */ ori $a1, $a1, 0x3c81 +/* EA9658 80240B78 0220202D */ daddu $a0, $s1, $zero +/* EA965C 80240B7C 3C05FE36 */ lui $a1, 0xfe36 +/* EA9660 80240B80 34A53C82 */ ori $a1, $a1, 0x3c82 +/* EA9664 80240B84 0C0B55FF */ jal func_802D57FC +/* EA9668 80240B88 E6000098 */ swc1 $f0, 0x98($s0) +/* EA966C 80240B8C 0220202D */ daddu $a0, $s1, $zero +/* EA9670 80240B90 3C05FE36 */ lui $a1, 0xfe36 +/* EA9674 80240B94 34A53C83 */ ori $a1, $a1, 0x3c83 +/* EA9678 80240B98 0C0B55FF */ jal func_802D57FC +/* EA967C 80240B9C E600009C */ swc1 $f0, 0x9c($s0) +/* EA9680 80240BA0 E60000A0 */ swc1 $f0, 0xa0($s0) +/* EA9684 80240BA4 2610000C */ addiu $s0, $s0, 0xc +/* EA9688 80240BA8 8E220084 */ lw $v0, 0x84($s1) +/* EA968C 80240BAC 1440FFEB */ bnez $v0, .L80240B5C +/* EA9690 80240BB0 26520001 */ addiu $s2, $s2, 1 +/* EA9694 80240BB4 AE7201DC */ sw $s2, 0x1dc($s3) +/* EA9698 80240BB8 8FBF0198 */ lw $ra, 0x198($sp) +/* EA969C 80240BBC 8FB30194 */ lw $s3, 0x194($sp) +/* EA96A0 80240BC0 8FB20190 */ lw $s2, 0x190($sp) +/* EA96A4 80240BC4 8FB1018C */ lw $s1, 0x18c($sp) +/* EA96A8 80240BC8 8FB00188 */ lw $s0, 0x188($sp) +/* EA96AC 80240BCC 03E00008 */ jr $ra +/* EA96B0 80240BD0 27BD01A0 */ addiu $sp, $sp, 0x1a0 diff --git a/asm/nonmatchings/code_EA8AE0/func_80240BD4_EA96B4.s b/asm/nonmatchings/code_EA8AE0/func_80240BD4_EA96B4.s new file mode 100644 index 0000000000..142ae02659 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80240BD4_EA96B4.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BD4_EA96B4 +/* EA96B4 80240BD4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EA96B8 80240BD8 AFB10014 */ sw $s1, 0x14($sp) +/* EA96BC 80240BDC 0080882D */ daddu $s1, $a0, $zero +/* EA96C0 80240BE0 AFBF0024 */ sw $ra, 0x24($sp) +/* EA96C4 80240BE4 AFB40020 */ sw $s4, 0x20($sp) +/* EA96C8 80240BE8 AFB3001C */ sw $s3, 0x1c($sp) +/* EA96CC 80240BEC AFB20018 */ sw $s2, 0x18($sp) +/* EA96D0 80240BF0 AFB00010 */ sw $s0, 0x10($sp) +/* EA96D4 80240BF4 8E30000C */ lw $s0, 0xc($s1) +/* EA96D8 80240BF8 8E050000 */ lw $a1, ($s0) +/* EA96DC 80240BFC 0C0B53A3 */ jal func_802D4E8C +/* EA96E0 80240C00 26100004 */ addiu $s0, $s0, 4 +/* EA96E4 80240C04 8E050000 */ lw $a1, ($s0) +/* EA96E8 80240C08 26100004 */ addiu $s0, $s0, 4 +/* EA96EC 80240C0C 0220202D */ daddu $a0, $s1, $zero +/* EA96F0 80240C10 0C0B53A3 */ jal func_802D4E8C +/* EA96F4 80240C14 0040982D */ daddu $s3, $v0, $zero +/* EA96F8 80240C18 8E050000 */ lw $a1, ($s0) +/* EA96FC 80240C1C 26100004 */ addiu $s0, $s0, 4 +/* EA9700 80240C20 0220202D */ daddu $a0, $s1, $zero +/* EA9704 80240C24 0C0B53A3 */ jal func_802D4E8C +/* EA9708 80240C28 0040902D */ daddu $s2, $v0, $zero +/* EA970C 80240C2C 8E050000 */ lw $a1, ($s0) +/* EA9710 80240C30 26100004 */ addiu $s0, $s0, 4 +/* EA9714 80240C34 0220202D */ daddu $a0, $s1, $zero +/* EA9718 80240C38 0C0B53A3 */ jal func_802D4E8C +/* EA971C 80240C3C 0040A02D */ daddu $s4, $v0, $zero +/* EA9720 80240C40 0220202D */ daddu $a0, $s1, $zero +/* EA9724 80240C44 8E050000 */ lw $a1, ($s0) +/* EA9728 80240C48 0C0B53A3 */ jal func_802D4E8C +/* EA972C 80240C4C 0040882D */ daddu $s1, $v0, $zero +/* EA9730 80240C50 0000202D */ daddu $a0, $zero, $zero +/* EA9734 80240C54 3C05FD05 */ lui $a1, 0xfd05 +/* EA9738 80240C58 34A50F80 */ ori $a1, $a1, 0xf80 +/* EA973C 80240C5C 0C0B53A3 */ jal func_802D4E8C +/* EA9740 80240C60 0040802D */ daddu $s0, $v0, $zero +/* EA9744 80240C64 00131900 */ sll $v1, $s3, 4 +/* EA9748 80240C68 00731823 */ subu $v1, $v1, $s3 +/* EA974C 80240C6C 00031940 */ sll $v1, $v1, 5 +/* EA9750 80240C70 00432021 */ addu $a0, $v0, $v1 +/* EA9754 80240C74 24020002 */ addiu $v0, $zero, 2 +/* EA9758 80240C78 00121840 */ sll $v1, $s2, 1 +/* EA975C 80240C7C 00721821 */ addu $v1, $v1, $s2 +/* EA9760 80240C80 00431804 */ sllv $v1, $v1, $v0 +/* EA9764 80240C84 00832021 */ addu $a0, $a0, $v1 +/* EA9768 80240C88 44940000 */ mtc1 $s4, $f0 +/* EA976C 80240C8C 00000000 */ nop +/* EA9770 80240C90 46800020 */ cvt.s.w $f0, $f0 +/* EA9774 80240C94 E4800000 */ swc1 $f0, ($a0) +/* EA9778 80240C98 44910000 */ mtc1 $s1, $f0 +/* EA977C 80240C9C 00000000 */ nop +/* EA9780 80240CA0 46800020 */ cvt.s.w $f0, $f0 +/* EA9784 80240CA4 E4800004 */ swc1 $f0, 4($a0) +/* EA9788 80240CA8 44900000 */ mtc1 $s0, $f0 +/* EA978C 80240CAC 00000000 */ nop +/* EA9790 80240CB0 46800020 */ cvt.s.w $f0, $f0 +/* EA9794 80240CB4 E4800008 */ swc1 $f0, 8($a0) +/* EA9798 80240CB8 8FBF0024 */ lw $ra, 0x24($sp) +/* EA979C 80240CBC 8FB40020 */ lw $s4, 0x20($sp) +/* EA97A0 80240CC0 8FB3001C */ lw $s3, 0x1c($sp) +/* EA97A4 80240CC4 8FB20018 */ lw $s2, 0x18($sp) +/* EA97A8 80240CC8 8FB10014 */ lw $s1, 0x14($sp) +/* EA97AC 80240CCC 8FB00010 */ lw $s0, 0x10($sp) +/* EA97B0 80240CD0 03E00008 */ jr $ra +/* EA97B4 80240CD4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EA8AE0/func_80240CD8_EA97B8.s b/asm/nonmatchings/code_EA8AE0/func_80240CD8_EA97B8.s new file mode 100644 index 0000000000..a4a5988231 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80240CD8_EA97B8.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CD8_EA97B8 +/* EA97B8 80240CD8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EA97BC 80240CDC AFB10014 */ sw $s1, 0x14($sp) +/* EA97C0 80240CE0 0080882D */ daddu $s1, $a0, $zero +/* EA97C4 80240CE4 AFBF0020 */ sw $ra, 0x20($sp) +/* EA97C8 80240CE8 AFB3001C */ sw $s3, 0x1c($sp) +/* EA97CC 80240CEC AFB20018 */ sw $s2, 0x18($sp) +/* EA97D0 80240CF0 AFB00010 */ sw $s0, 0x10($sp) +/* EA97D4 80240CF4 8E30000C */ lw $s0, 0xc($s1) +/* EA97D8 80240CF8 8E050000 */ lw $a1, ($s0) +/* EA97DC 80240CFC 0C0B53A3 */ jal func_802D4E8C +/* EA97E0 80240D00 26100004 */ addiu $s0, $s0, 4 +/* EA97E4 80240D04 8E050000 */ lw $a1, ($s0) +/* EA97E8 80240D08 26100004 */ addiu $s0, $s0, 4 +/* EA97EC 80240D0C 0220202D */ daddu $a0, $s1, $zero +/* EA97F0 80240D10 0C0B53A3 */ jal func_802D4E8C +/* EA97F4 80240D14 0040982D */ daddu $s3, $v0, $zero +/* EA97F8 80240D18 8E050000 */ lw $a1, ($s0) +/* EA97FC 80240D1C 26100004 */ addiu $s0, $s0, 4 +/* EA9800 80240D20 0220202D */ daddu $a0, $s1, $zero +/* EA9804 80240D24 0C0B53A3 */ jal func_802D4E8C +/* EA9808 80240D28 0040902D */ daddu $s2, $v0, $zero +/* EA980C 80240D2C 8E050000 */ lw $a1, ($s0) +/* EA9810 80240D30 26100004 */ addiu $s0, $s0, 4 +/* EA9814 80240D34 0C0B53A3 */ jal func_802D4E8C +/* EA9818 80240D38 0220202D */ daddu $a0, $s1, $zero +/* EA981C 80240D3C 8E050000 */ lw $a1, ($s0) +/* EA9820 80240D40 0C0B53A3 */ jal func_802D4E8C +/* EA9824 80240D44 0220202D */ daddu $a0, $s1, $zero +/* EA9828 80240D48 0000202D */ daddu $a0, $zero, $zero +/* EA982C 80240D4C 3C05FD05 */ lui $a1, 0xfd05 +/* EA9830 80240D50 34A50F80 */ ori $a1, $a1, 0xf80 +/* EA9834 80240D54 0C0B53A3 */ jal func_802D4E8C +/* EA9838 80240D58 0040802D */ daddu $s0, $v0, $zero +/* EA983C 80240D5C 00131900 */ sll $v1, $s3, 4 +/* EA9840 80240D60 00731823 */ subu $v1, $v1, $s3 +/* EA9844 80240D64 00031940 */ sll $v1, $v1, 5 +/* EA9848 80240D68 00431821 */ addu $v1, $v0, $v1 +/* EA984C 80240D6C 24020002 */ addiu $v0, $zero, 2 +/* EA9850 80240D70 00529004 */ sllv $s2, $s2, $v0 +/* EA9854 80240D74 00721821 */ addu $v1, $v1, $s2 +/* EA9858 80240D78 44900000 */ mtc1 $s0, $f0 +/* EA985C 80240D7C 00000000 */ nop +/* EA9860 80240D80 46800020 */ cvt.s.w $f0, $f0 +/* EA9864 80240D84 E460006C */ swc1 $f0, 0x6c($v1) +/* EA9868 80240D88 8FBF0020 */ lw $ra, 0x20($sp) +/* EA986C 80240D8C 8FB3001C */ lw $s3, 0x1c($sp) +/* EA9870 80240D90 8FB20018 */ lw $s2, 0x18($sp) +/* EA9874 80240D94 8FB10014 */ lw $s1, 0x14($sp) +/* EA9878 80240D98 8FB00010 */ lw $s0, 0x10($sp) +/* EA987C 80240D9C 03E00008 */ jr $ra +/* EA9880 80240DA0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EA8AE0/func_80240DA4_EA9884.s b/asm/nonmatchings/code_EA8AE0/func_80240DA4_EA9884.s new file mode 100644 index 0000000000..c32c542018 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80240DA4_EA9884.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DA4_EA9884 +/* EA9884 80240DA4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA9888 80240DA8 AFB10014 */ sw $s1, 0x14($sp) +/* EA988C 80240DAC 0080882D */ daddu $s1, $a0, $zero +/* EA9890 80240DB0 AFBF0018 */ sw $ra, 0x18($sp) +/* EA9894 80240DB4 AFB00010 */ sw $s0, 0x10($sp) +/* EA9898 80240DB8 8E30000C */ lw $s0, 0xc($s1) +/* EA989C 80240DBC 8E050000 */ lw $a1, ($s0) +/* EA98A0 80240DC0 0C0B53A3 */ jal func_802D4E8C +/* EA98A4 80240DC4 26100004 */ addiu $s0, $s0, 4 +/* EA98A8 80240DC8 8E050000 */ lw $a1, ($s0) +/* EA98AC 80240DCC 26100004 */ addiu $s0, $s0, 4 +/* EA98B0 80240DD0 0C0B53A3 */ jal func_802D4E8C +/* EA98B4 80240DD4 0220202D */ daddu $a0, $s1, $zero +/* EA98B8 80240DD8 8E050000 */ lw $a1, ($s0) +/* EA98BC 80240DDC 26100004 */ addiu $s0, $s0, 4 +/* EA98C0 80240DE0 0C0B53A3 */ jal func_802D4E8C +/* EA98C4 80240DE4 0220202D */ daddu $a0, $s1, $zero +/* EA98C8 80240DE8 8E050000 */ lw $a1, ($s0) +/* EA98CC 80240DEC 26100004 */ addiu $s0, $s0, 4 +/* EA98D0 80240DF0 0C0B53A3 */ jal func_802D4E8C +/* EA98D4 80240DF4 0220202D */ daddu $a0, $s1, $zero +/* EA98D8 80240DF8 8E050000 */ lw $a1, ($s0) +/* EA98DC 80240DFC 0C0B53A3 */ jal func_802D4E8C +/* EA98E0 80240E00 0220202D */ daddu $a0, $s1, $zero +/* EA98E4 80240E04 0000202D */ daddu $a0, $zero, $zero +/* EA98E8 80240E08 3C05FD05 */ lui $a1, 0xfd05 +/* EA98EC 80240E0C 0C0B53A3 */ jal func_802D4E8C +/* EA98F0 80240E10 34A50F80 */ ori $a1, $a1, 0xf80 +/* EA98F4 80240E14 8FBF0018 */ lw $ra, 0x18($sp) +/* EA98F8 80240E18 8FB10014 */ lw $s1, 0x14($sp) +/* EA98FC 80240E1C 8FB00010 */ lw $s0, 0x10($sp) +/* EA9900 80240E20 24020002 */ addiu $v0, $zero, 2 +/* EA9904 80240E24 03E00008 */ jr $ra +/* EA9908 80240E28 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA8AE0/func_80240E2C_EA990C.s b/asm/nonmatchings/code_EA8AE0/func_80240E2C_EA990C.s new file mode 100644 index 0000000000..d6fbe7ee40 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80240E2C_EA990C.s @@ -0,0 +1,385 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E2C_EA990C +/* EA990C 80240E2C 27BDFF70 */ addiu $sp, $sp, -0x90 +/* EA9910 80240E30 3C038025 */ lui $v1, %hi(D_80248380) +/* EA9914 80240E34 8C638380 */ lw $v1, %lo(D_80248380)($v1) +/* EA9918 80240E38 2402FFFF */ addiu $v0, $zero, -1 +/* EA991C 80240E3C AFBF005C */ sw $ra, 0x5c($sp) +/* EA9920 80240E40 AFBE0058 */ sw $fp, 0x58($sp) +/* EA9924 80240E44 AFB70054 */ sw $s7, 0x54($sp) +/* EA9928 80240E48 AFB60050 */ sw $s6, 0x50($sp) +/* EA992C 80240E4C AFB5004C */ sw $s5, 0x4c($sp) +/* EA9930 80240E50 AFB40048 */ sw $s4, 0x48($sp) +/* EA9934 80240E54 AFB30044 */ sw $s3, 0x44($sp) +/* EA9938 80240E58 AFB20040 */ sw $s2, 0x40($sp) +/* EA993C 80240E5C AFB1003C */ sw $s1, 0x3c($sp) +/* EA9940 80240E60 AFB00038 */ sw $s0, 0x38($sp) +/* EA9944 80240E64 F7BE0088 */ sdc1 $f30, 0x88($sp) +/* EA9948 80240E68 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* EA994C 80240E6C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* EA9950 80240E70 F7B80070 */ sdc1 $f24, 0x70($sp) +/* EA9954 80240E74 F7B60068 */ sdc1 $f22, 0x68($sp) +/* EA9958 80240E78 1062013F */ beq $v1, $v0, .L80241378 +/* EA995C 80240E7C F7B40060 */ sdc1 $f20, 0x60($sp) +/* EA9960 80240E80 1460005E */ bnez $v1, .L80240FFC +/* EA9964 80240E84 0000382D */ daddu $a3, $zero, $zero +/* EA9968 80240E88 00E0802D */ daddu $s0, $a3, $zero +/* EA996C 80240E8C 3C0142B4 */ lui $at, 0x42b4 +/* EA9970 80240E90 4481E000 */ mtc1 $at, $f28 +/* EA9974 80240E94 3C014334 */ lui $at, 0x4334 +/* EA9978 80240E98 4481D000 */ mtc1 $at, $f26 +/* EA997C 80240E9C 3C0143B4 */ lui $at, 0x43b4 +/* EA9980 80240EA0 4481A000 */ mtc1 $at, $f20 +/* EA9984 80240EA4 3C01C334 */ lui $at, 0xc334 +/* EA9988 80240EA8 4481B000 */ mtc1 $at, $f22 +.L80240EAC: +/* EA998C 80240EAC 0000202D */ daddu $a0, $zero, $zero +/* EA9990 80240EB0 3C05FD05 */ lui $a1, 0xfd05 +/* EA9994 80240EB4 34A50F80 */ ori $a1, $a1, 0xf80 +/* EA9998 80240EB8 0C0B53A3 */ jal func_802D4E8C +/* EA999C 80240EBC AFA70030 */ sw $a3, 0x30($sp) +/* EA99A0 80240EC0 00502021 */ addu $a0, $v0, $s0 +/* EA99A4 80240EC4 8FA70030 */ lw $a3, 0x30($sp) +/* EA99A8 80240EC8 24020001 */ addiu $v0, $zero, 1 +/* EA99AC 80240ECC 10E20011 */ beq $a3, $v0, .L80240F14 +/* EA99B0 80240ED0 28E20002 */ slti $v0, $a3, 2 +/* EA99B4 80240ED4 50400005 */ beql $v0, $zero, .L80240EEC +/* EA99B8 80240ED8 24020002 */ addiu $v0, $zero, 2 +/* EA99BC 80240EDC 10E00009 */ beqz $a3, .L80240F04 +/* EA99C0 80240EE0 00000000 */ nop +/* EA99C4 80240EE4 080904DE */ j .L80241378 +/* EA99C8 80240EE8 00000000 */ nop +.L80240EEC: +/* EA99CC 80240EEC 10E2000B */ beq $a3, $v0, .L80240F1C +/* EA99D0 80240EF0 24020003 */ addiu $v0, $zero, 3 +/* EA99D4 80240EF4 10E2000A */ beq $a3, $v0, .L80240F20 +/* EA99D8 80240EF8 24140005 */ addiu $s4, $zero, 5 +/* EA99DC 80240EFC 080904DE */ j .L80241378 +/* EA99E0 80240F00 00000000 */ nop +.L80240F04: +/* EA99E4 80240F04 3C014120 */ lui $at, 0x4120 +/* EA99E8 80240F08 4481C000 */ mtc1 $at, $f24 +/* EA99EC 80240F0C 080903CA */ j .L80240F28 +/* EA99F0 80240F10 24140009 */ addiu $s4, $zero, 9 +.L80240F14: +/* EA99F4 80240F14 080903C8 */ j .L80240F20 +/* EA99F8 80240F18 24140007 */ addiu $s4, $zero, 7 +.L80240F1C: +/* EA99FC 80240F1C 24140007 */ addiu $s4, $zero, 7 +.L80240F20: +/* EA9A00 80240F20 3C014100 */ lui $at, 0x4100 +/* EA9A04 80240F24 4481C000 */ mtc1 $at, $f24 +.L80240F28: +/* EA9A08 80240F28 0000882D */ daddu $s1, $zero, $zero +/* EA9A0C 80240F2C AC940090 */ sw $s4, 0x90($a0) +/* EA9A10 80240F30 1A800027 */ blez $s4, .L80240FD0 +/* EA9A14 80240F34 E4980094 */ swc1 $f24, 0x94($a0) +/* EA9A18 80240F38 2686FFFF */ addiu $a2, $s4, -1 +/* EA9A1C 80240F3C 0080182D */ daddu $v1, $a0, $zero +/* EA9A20 80240F40 24050004 */ addiu $a1, $zero, 4 +/* EA9A24 80240F44 3C013FE0 */ lui $at, 0x3fe0 +/* EA9A28 80240F48 44814800 */ mtc1 $at, $f9 +/* EA9A2C 80240F4C 44804000 */ mtc1 $zero, $f8 +/* EA9A30 80240F50 3C018025 */ lui $at, %hi(D_80248370) +/* EA9A34 80240F54 D4268370 */ ldc1 $f6, %lo(D_80248370)($at) +.L80240F58: +/* EA9A38 80240F58 16260004 */ bne $s1, $a2, .L80240F6C +/* EA9A3C 80240F5C 00851021 */ addu $v0, $a0, $a1 +/* EA9A40 80240F60 C460006C */ lwc1 $f0, 0x6c($v1) +/* EA9A44 80240F64 080903EE */ j .L80240FB8 +/* EA9A48 80240F68 461C0000 */ add.s $f0, $f0, $f28 +.L80240F6C: +/* EA9A4C 80240F6C C460006C */ lwc1 $f0, 0x6c($v1) +/* EA9A50 80240F70 C444006C */ lwc1 $f4, 0x6c($v0) +/* EA9A54 80240F74 46002081 */ sub.s $f2, $f4, $f0 +/* EA9A58 80240F78 4602D03C */ c.lt.s $f26, $f2 +/* EA9A5C 80240F7C 00000000 */ nop +/* EA9A60 80240F80 45000003 */ bc1f .L80240F90 +/* EA9A64 80240F84 00000000 */ nop +/* EA9A68 80240F88 080903E8 */ j .L80240FA0 +/* EA9A6C 80240F8C 46140000 */ add.s $f0, $f0, $f20 +.L80240F90: +/* EA9A70 80240F90 4616103C */ c.lt.s $f2, $f22 +/* EA9A74 80240F94 00000000 */ nop +/* EA9A78 80240F98 45030001 */ bc1tl .L80240FA0 +/* EA9A7C 80240F9C 46142100 */ add.s $f4, $f4, $f20 +.L80240FA0: +/* EA9A80 80240FA0 46040000 */ add.s $f0, $f0, $f4 +/* EA9A84 80240FA4 46000021 */ cvt.d.s $f0, $f0 +/* EA9A88 80240FA8 46280002 */ mul.d $f0, $f0, $f8 +/* EA9A8C 80240FAC 00000000 */ nop +/* EA9A90 80240FB0 46260000 */ add.d $f0, $f0, $f6 +/* EA9A94 80240FB4 46200020 */ cvt.s.d $f0, $f0 +.L80240FB8: +/* EA9A98 80240FB8 E460006C */ swc1 $f0, 0x6c($v1) +/* EA9A9C 80240FBC 24630004 */ addiu $v1, $v1, 4 +/* EA9AA0 80240FC0 26310001 */ addiu $s1, $s1, 1 +/* EA9AA4 80240FC4 0234102A */ slt $v0, $s1, $s4 +/* EA9AA8 80240FC8 1440FFE3 */ bnez $v0, .L80240F58 +/* EA9AAC 80240FCC 24A50004 */ addiu $a1, $a1, 4 +.L80240FD0: +/* EA9AB0 80240FD0 0C0902C0 */ jal func_80240B00_EA95E0 +/* EA9AB4 80240FD4 AFA70030 */ sw $a3, 0x30($sp) +/* EA9AB8 80240FD8 8FA70030 */ lw $a3, 0x30($sp) +/* EA9ABC 80240FDC 24E70001 */ addiu $a3, $a3, 1 +/* EA9AC0 80240FE0 28E20004 */ slti $v0, $a3, 4 +/* EA9AC4 80240FE4 1440FFB1 */ bnez $v0, .L80240EAC +/* EA9AC8 80240FE8 261001E0 */ addiu $s0, $s0, 0x1e0 +/* EA9ACC 80240FEC 24020001 */ addiu $v0, $zero, 1 +/* EA9AD0 80240FF0 3C018025 */ lui $at, %hi(D_80248380) +/* EA9AD4 80240FF4 AC228380 */ sw $v0, %lo(D_80248380)($at) +/* EA9AD8 80240FF8 0000382D */ daddu $a3, $zero, $zero +.L80240FFC: +/* EA9ADC 80240FFC 3C02800A */ lui $v0, %hi(D_800A15C4) +/* EA9AE0 80241000 244215C4 */ addiu $v0, $v0, %lo(D_800A15C4) +/* EA9AE4 80241004 0040402D */ daddu $t0, $v0, $zero +/* EA9AE8 80241008 3C090100 */ lui $t1, 0x100 +/* EA9AEC 8024100C 35294008 */ ori $t1, $t1, 0x4008 +/* EA9AF0 80241010 AFA90018 */ sw $t1, 0x18($sp) +/* EA9AF4 80241014 3C090602 */ lui $t1, 0x602 +/* EA9AF8 80241018 35290004 */ ori $t1, $t1, 4 +/* EA9AFC 8024101C AFA9001C */ sw $t1, 0x1c($sp) +/* EA9B00 80241020 AFA00020 */ sw $zero, 0x20($sp) +/* EA9B04 80241024 8D030000 */ lw $v1, ($t0) +/* EA9B08 80241028 3C02E700 */ lui $v0, 0xe700 +/* EA9B0C 8024102C 0060202D */ daddu $a0, $v1, $zero +/* EA9B10 80241030 24630008 */ addiu $v1, $v1, 8 +/* EA9B14 80241034 AD030000 */ sw $v1, ($t0) +/* EA9B18 80241038 AC820000 */ sw $v0, ($a0) +/* EA9B1C 8024103C 24620008 */ addiu $v0, $v1, 8 +/* EA9B20 80241040 AC800004 */ sw $zero, 4($a0) +/* EA9B24 80241044 AD020000 */ sw $v0, ($t0) +/* EA9B28 80241048 3C02DE00 */ lui $v0, 0xde00 +/* EA9B2C 8024104C AC620000 */ sw $v0, ($v1) +/* EA9B30 80241050 3C028024 */ lui $v0, %hi(D_80243AD8) +/* EA9B34 80241054 24423AD8 */ addiu $v0, $v0, %lo(D_80243AD8) +/* EA9B38 80241058 AC620004 */ sw $v0, 4($v1) +.L8024105C: +/* EA9B3C 8024105C 0000202D */ daddu $a0, $zero, $zero +/* EA9B40 80241060 3C05FD05 */ lui $a1, 0xfd05 +/* EA9B44 80241064 34A50F80 */ ori $a1, $a1, 0xf80 +/* EA9B48 80241068 AFA70030 */ sw $a3, 0x30($sp) +/* EA9B4C 8024106C 0C0B53A3 */ jal func_802D4E8C +/* EA9B50 80241070 AFA80034 */ sw $t0, 0x34($sp) +/* EA9B54 80241074 0000882D */ daddu $s1, $zero, $zero +/* EA9B58 80241078 8FA90020 */ lw $t1, 0x20($sp) +/* EA9B5C 8024107C 8FA80034 */ lw $t0, 0x34($sp) +/* EA9B60 80241080 0049A821 */ addu $s5, $v0, $t1 +/* EA9B64 80241084 3C02DE01 */ lui $v0, 0xde01 +/* EA9B68 80241088 C6B80094 */ lwc1 $f24, 0x94($s5) +/* EA9B6C 8024108C 8D040000 */ lw $a0, ($t0) +/* EA9B70 80241090 8EB40090 */ lw $s4, 0x90($s5) +/* EA9B74 80241094 24890008 */ addiu $t1, $a0, 8 +/* EA9B78 80241098 AFA90010 */ sw $t1, 0x10($sp) +/* EA9B7C 8024109C 8EA601DC */ lw $a2, 0x1dc($s5) +/* EA9B80 802410A0 AC820000 */ sw $v0, ($a0) +/* EA9B84 802410A4 00061940 */ sll $v1, $a2, 5 +/* EA9B88 802410A8 24620008 */ addiu $v0, $v1, 8 +/* EA9B8C 802410AC 00821021 */ addu $v0, $a0, $v0 +/* EA9B90 802410B0 01231821 */ addu $v1, $t1, $v1 +/* EA9B94 802410B4 AC820004 */ sw $v0, 4($a0) +/* EA9B98 802410B8 AD030000 */ sw $v1, ($t0) +/* EA9B9C 802410BC 8FA70030 */ lw $a3, 0x30($sp) +/* EA9BA0 802410C0 18C00088 */ blez $a2, .L802412E4 +/* EA9BA4 802410C4 0120982D */ daddu $s3, $t1, $zero +/* EA9BA8 802410C8 2682FFFF */ addiu $v0, $s4, -1 +/* EA9BAC 802410CC 00021080 */ sll $v0, $v0, 2 +/* EA9BB0 802410D0 02A21021 */ addu $v0, $s5, $v0 +/* EA9BB4 802410D4 AFA20014 */ sw $v0, 0x14($sp) +/* EA9BB8 802410D8 0220282D */ daddu $a1, $s1, $zero +/* EA9BBC 802410DC 0220F02D */ daddu $fp, $s1, $zero +/* EA9BC0 802410E0 0220B82D */ daddu $s7, $s1, $zero +/* EA9BC4 802410E4 0220B02D */ daddu $s6, $s1, $zero +/* EA9BC8 802410E8 02A0902D */ daddu $s2, $s5, $zero +/* EA9BCC 802410EC 24900016 */ addiu $s0, $a0, 0x16 +.L802410F0: +/* EA9BD0 802410F0 44911000 */ mtc1 $s1, $f2 +/* EA9BD4 802410F4 00000000 */ nop +/* EA9BD8 802410F8 468010A0 */ cvt.s.w $f2, $f2 +/* EA9BDC 802410FC 44940000 */ mtc1 $s4, $f0 +/* EA9BE0 80241100 00000000 */ nop +/* EA9BE4 80241104 46800020 */ cvt.s.w $f0, $f0 +/* EA9BE8 80241108 46001082 */ mul.s $f2, $f2, $f0 +/* EA9BEC 8024110C 00000000 */ nop +/* EA9BF0 80241110 44860000 */ mtc1 $a2, $f0 +/* EA9BF4 80241114 00000000 */ nop +/* EA9BF8 80241118 46800020 */ cvt.s.w $f0, $f0 +/* EA9BFC 8024111C C65A0098 */ lwc1 $f26, 0x98($s2) +/* EA9C00 80241120 C65C009C */ lwc1 $f28, 0x9c($s2) +/* EA9C04 80241124 C65E00A0 */ lwc1 $f30, 0xa0($s2) +/* EA9C08 80241128 46001083 */ div.s $f2, $f2, $f0 +/* EA9C0C 8024112C 4600128D */ trunc.w.s $f10, $f2 +/* EA9C10 80241130 44045000 */ mfc1 $a0, $f10 +/* EA9C14 80241134 00000000 */ nop +/* EA9C18 80241138 44840000 */ mtc1 $a0, $f0 +/* EA9C1C 8024113C 00000000 */ nop +/* EA9C20 80241140 46800020 */ cvt.s.w $f0, $f0 +/* EA9C24 80241144 24830001 */ addiu $v1, $a0, 1 +/* EA9C28 80241148 0074102A */ slt $v0, $v1, $s4 +/* EA9C2C 8024114C 14400005 */ bnez $v0, .L80241164 +/* EA9C30 80241150 46001181 */ sub.s $f6, $f2, $f0 +/* EA9C34 80241154 8FA90014 */ lw $t1, 0x14($sp) +/* EA9C38 80241158 C536006C */ lwc1 $f22, 0x6c($t1) +/* EA9C3C 8024115C 0809047C */ j .L802411F0 +/* EA9C40 80241160 4600B306 */ mov.s $f12, $f22 +.L80241164: +/* EA9C44 80241164 00031080 */ sll $v0, $v1, 2 +/* EA9C48 80241168 02A21021 */ addu $v0, $s5, $v0 +/* EA9C4C 8024116C C444006C */ lwc1 $f4, 0x6c($v0) +/* EA9C50 80241170 00041080 */ sll $v0, $a0, 2 +/* EA9C54 80241174 02A21021 */ addu $v0, $s5, $v0 +/* EA9C58 80241178 C44C006C */ lwc1 $f12, 0x6c($v0) +/* EA9C5C 8024117C 460C2081 */ sub.s $f2, $f4, $f12 +/* EA9C60 80241180 3C014334 */ lui $at, 0x4334 +/* EA9C64 80241184 44810000 */ mtc1 $at, $f0 +/* EA9C68 80241188 00000000 */ nop +/* EA9C6C 8024118C 4602003C */ c.lt.s $f0, $f2 +/* EA9C70 80241190 00000000 */ nop +/* EA9C74 80241194 45000006 */ bc1f .L802411B0 +/* EA9C78 80241198 00000000 */ nop +/* EA9C7C 8024119C 3C0143B4 */ lui $at, 0x43b4 +/* EA9C80 802411A0 44815000 */ mtc1 $at, $f10 +/* EA9C84 802411A4 00000000 */ nop +/* EA9C88 802411A8 460A2101 */ sub.s $f4, $f4, $f10 +/* EA9C8C 802411AC 460C2081 */ sub.s $f2, $f4, $f12 +.L802411B0: +/* EA9C90 802411B0 3C01C334 */ lui $at, 0xc334 +/* EA9C94 802411B4 44810000 */ mtc1 $at, $f0 +/* EA9C98 802411B8 00000000 */ nop +/* EA9C9C 802411BC 4600103C */ c.lt.s $f2, $f0 +/* EA9CA0 802411C0 00000000 */ nop +/* EA9CA4 802411C4 45020006 */ bc1fl .L802411E0 +/* EA9CA8 802411C8 460C2001 */ sub.s $f0, $f4, $f12 +/* EA9CAC 802411CC 3C0143B4 */ lui $at, 0x43b4 +/* EA9CB0 802411D0 44815000 */ mtc1 $at, $f10 +/* EA9CB4 802411D4 00000000 */ nop +/* EA9CB8 802411D8 460A2100 */ add.s $f4, $f4, $f10 +/* EA9CBC 802411DC 460C2001 */ sub.s $f0, $f4, $f12 +.L802411E0: +/* EA9CC0 802411E0 46060002 */ mul.s $f0, $f0, $f6 +/* EA9CC4 802411E4 00000000 */ nop +/* EA9CC8 802411E8 460C0580 */ add.s $f22, $f0, $f12 +/* EA9CCC 802411EC 4600B306 */ mov.s $f12, $f22 +.L802411F0: +/* EA9CD0 802411F0 AFA50028 */ sw $a1, 0x28($sp) +/* EA9CD4 802411F4 AFA6002C */ sw $a2, 0x2c($sp) +/* EA9CD8 802411F8 AFA70030 */ sw $a3, 0x30($sp) +/* EA9CDC 802411FC 0C00AD77 */ jal func_8002B5DC +/* EA9CE0 80241200 AFA80034 */ sw $t0, 0x34($sp) +/* EA9CE4 80241204 46180502 */ mul.s $f20, $f0, $f24 +/* EA9CE8 80241208 00000000 */ nop +/* EA9CEC 8024120C 0C00AD90 */ jal func_8002B640 +/* EA9CF0 80241210 4600B306 */ mov.s $f12, $f22 +/* EA9CF4 80241214 46000007 */ neg.s $f0, $f0 +/* EA9CF8 80241218 46180002 */ mul.s $f0, $f0, $f24 +/* EA9CFC 8024121C 00000000 */ nop +/* EA9D00 80241220 4614D100 */ add.s $f4, $f26, $f20 +/* EA9D04 80241224 4600E080 */ add.s $f2, $f28, $f0 +/* EA9D08 80241228 4614D501 */ sub.s $f20, $f26, $f20 +/* EA9D0C 8024122C 2652000C */ addiu $s2, $s2, 0xc +/* EA9D10 80241230 26310001 */ addiu $s1, $s1, 1 +/* EA9D14 80241234 4600E001 */ sub.s $f0, $f28, $f0 +/* EA9D18 80241238 4600228D */ trunc.w.s $f10, $f4 +/* EA9D1C 8024123C 44025000 */ mfc1 $v0, $f10 +/* EA9D20 80241240 00000000 */ nop +/* EA9D24 80241244 A6620000 */ sh $v0, ($s3) +/* EA9D28 80241248 4600128D */ trunc.w.s $f10, $f2 +/* EA9D2C 8024124C 44025000 */ mfc1 $v0, $f10 +/* EA9D30 80241250 4600F28D */ trunc.w.s $f10, $f30 +/* EA9D34 80241254 44035000 */ mfc1 $v1, $f10 +/* EA9D38 80241258 26730010 */ addiu $s3, $s3, 0x10 +/* EA9D3C 8024125C A602FFF4 */ sh $v0, -0xc($s0) +/* EA9D40 80241260 A603FFF6 */ sh $v1, -0xa($s0) +/* EA9D44 80241264 A616FFFA */ sh $s6, -6($s0) +/* EA9D48 80241268 A600FFFC */ sh $zero, -4($s0) +/* EA9D4C 8024126C A217FFFE */ sb $s7, -2($s0) +/* EA9D50 80241270 A21EFFFF */ sb $fp, -1($s0) +/* EA9D54 80241274 8FA50028 */ lw $a1, 0x28($sp) +/* EA9D58 80241278 4600A28D */ trunc.w.s $f10, $f20 +/* EA9D5C 8024127C 44025000 */ mfc1 $v0, $f10 +/* EA9D60 80241280 A2050000 */ sb $a1, ($s0) +/* EA9D64 80241284 26100010 */ addiu $s0, $s0, 0x10 +/* EA9D68 80241288 A6620000 */ sh $v0, ($s3) +/* EA9D6C 8024128C 4600028D */ trunc.w.s $f10, $f0 +/* EA9D70 80241290 44025000 */ mfc1 $v0, $f10 +/* EA9D74 80241294 00000000 */ nop +/* EA9D78 80241298 A602FFF4 */ sh $v0, -0xc($s0) +/* EA9D7C 8024129C 24020400 */ addiu $v0, $zero, 0x400 +/* EA9D80 802412A0 A603FFF6 */ sh $v1, -0xa($s0) +/* EA9D84 802412A4 A616FFFA */ sh $s6, -6($s0) +/* EA9D88 802412A8 A602FFFC */ sh $v0, -4($s0) +/* EA9D8C 802412AC A217FFFE */ sb $s7, -2($s0) +/* EA9D90 802412B0 A21EFFFF */ sb $fp, -1($s0) +/* EA9D94 802412B4 A2050000 */ sb $a1, ($s0) +/* EA9D98 802412B8 26100010 */ addiu $s0, $s0, 0x10 +/* EA9D9C 802412BC 26730010 */ addiu $s3, $s3, 0x10 +/* EA9DA0 802412C0 24A5001E */ addiu $a1, $a1, 0x1e +/* EA9DA4 802412C4 27DE0078 */ addiu $fp, $fp, 0x78 +/* EA9DA8 802412C8 26F70032 */ addiu $s7, $s7, 0x32 +/* EA9DAC 802412CC 8FA6002C */ lw $a2, 0x2c($sp) +/* EA9DB0 802412D0 8FA70030 */ lw $a3, 0x30($sp) +/* EA9DB4 802412D4 8FA80034 */ lw $t0, 0x34($sp) +/* EA9DB8 802412D8 0226102A */ slt $v0, $s1, $a2 +/* EA9DBC 802412DC 1440FF84 */ bnez $v0, .L802410F0 +/* EA9DC0 802412E0 26D60140 */ addiu $s6, $s6, 0x140 +.L802412E4: +/* EA9DC4 802412E4 24C5FFFF */ addiu $a1, $a2, -1 +/* EA9DC8 802412E8 18A00014 */ blez $a1, .L8024133C +/* EA9DCC 802412EC 0000882D */ daddu $s1, $zero, $zero +/* EA9DD0 802412F0 3C060002 */ lui $a2, 2 +/* EA9DD4 802412F4 34C60406 */ ori $a2, $a2, 0x406 +/* EA9DD8 802412F8 8FA40010 */ lw $a0, 0x10($sp) +.L802412FC: +/* EA9DDC 802412FC 8D030000 */ lw $v1, ($t0) +/* EA9DE0 80241300 26310001 */ addiu $s1, $s1, 1 +/* EA9DE4 80241304 0060102D */ daddu $v0, $v1, $zero +/* EA9DE8 80241308 24630008 */ addiu $v1, $v1, 8 +/* EA9DEC 8024130C AC440004 */ sw $a0, 4($v0) +/* EA9DF0 80241310 AD030000 */ sw $v1, ($t0) +/* EA9DF4 80241314 8FA90018 */ lw $t1, 0x18($sp) +/* EA9DF8 80241318 24840020 */ addiu $a0, $a0, 0x20 +/* EA9DFC 8024131C AC490000 */ sw $t1, ($v0) +/* EA9E00 80241320 24620008 */ addiu $v0, $v1, 8 +/* EA9E04 80241324 AD020000 */ sw $v0, ($t0) +/* EA9E08 80241328 8FA9001C */ lw $t1, 0x1c($sp) +/* EA9E0C 8024132C 0225102A */ slt $v0, $s1, $a1 +/* EA9E10 80241330 AC660004 */ sw $a2, 4($v1) +/* EA9E14 80241334 1440FFF1 */ bnez $v0, .L802412FC +/* EA9E18 80241338 AC690000 */ sw $t1, ($v1) +.L8024133C: +/* EA9E1C 8024133C 24E70001 */ addiu $a3, $a3, 1 +/* EA9E20 80241340 8FA90020 */ lw $t1, 0x20($sp) +/* EA9E24 80241344 28E20004 */ slti $v0, $a3, 4 +/* EA9E28 80241348 252901E0 */ addiu $t1, $t1, 0x1e0 +/* EA9E2C 8024134C 1440FF43 */ bnez $v0, .L8024105C +/* EA9E30 80241350 AFA90020 */ sw $t1, 0x20($sp) +/* EA9E34 80241354 3C03800A */ lui $v1, %hi(D_800A15C4) +/* EA9E38 80241358 246315C4 */ addiu $v1, $v1, %lo(D_800A15C4) +/* EA9E3C 8024135C 8C620000 */ lw $v0, ($v1) +/* EA9E40 80241360 0040202D */ daddu $a0, $v0, $zero +/* EA9E44 80241364 24420008 */ addiu $v0, $v0, 8 +/* EA9E48 80241368 AC620000 */ sw $v0, ($v1) +/* EA9E4C 8024136C 3C02E700 */ lui $v0, 0xe700 +/* EA9E50 80241370 AC820000 */ sw $v0, ($a0) +/* EA9E54 80241374 AC800004 */ sw $zero, 4($a0) +.L80241378: +/* EA9E58 80241378 8FBF005C */ lw $ra, 0x5c($sp) +/* EA9E5C 8024137C 8FBE0058 */ lw $fp, 0x58($sp) +/* EA9E60 80241380 8FB70054 */ lw $s7, 0x54($sp) +/* EA9E64 80241384 8FB60050 */ lw $s6, 0x50($sp) +/* EA9E68 80241388 8FB5004C */ lw $s5, 0x4c($sp) +/* EA9E6C 8024138C 8FB40048 */ lw $s4, 0x48($sp) +/* EA9E70 80241390 8FB30044 */ lw $s3, 0x44($sp) +/* EA9E74 80241394 8FB20040 */ lw $s2, 0x40($sp) +/* EA9E78 80241398 8FB1003C */ lw $s1, 0x3c($sp) +/* EA9E7C 8024139C 8FB00038 */ lw $s0, 0x38($sp) +/* EA9E80 802413A0 D7BE0088 */ ldc1 $f30, 0x88($sp) +/* EA9E84 802413A4 D7BC0080 */ ldc1 $f28, 0x80($sp) +/* EA9E88 802413A8 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* EA9E8C 802413AC D7B80070 */ ldc1 $f24, 0x70($sp) +/* EA9E90 802413B0 D7B60068 */ ldc1 $f22, 0x68($sp) +/* EA9E94 802413B4 D7B40060 */ ldc1 $f20, 0x60($sp) +/* EA9E98 802413B8 03E00008 */ jr $ra +/* EA9E9C 802413BC 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/asm/nonmatchings/code_EA8AE0/func_802413C0_EA9EA0.s b/asm/nonmatchings/code_EA8AE0/func_802413C0_EA9EA0.s new file mode 100644 index 0000000000..563016e8ea --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_802413C0_EA9EA0.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413C0_EA9EA0 +/* EA9EA0 802413C0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EA9EA4 802413C4 3C028024 */ lui $v0, %hi(func_80240E2C_EA990C) +/* EA9EA8 802413C8 24420E2C */ addiu $v0, $v0, %lo(func_80240E2C_EA990C) +/* EA9EAC 802413CC AFA2001C */ sw $v0, 0x1c($sp) +/* EA9EB0 802413D0 2402000A */ addiu $v0, $zero, 0xa +/* EA9EB4 802413D4 AFA20014 */ sw $v0, 0x14($sp) +/* EA9EB8 802413D8 24020001 */ addiu $v0, $zero, 1 +/* EA9EBC 802413DC 27A40010 */ addiu $a0, $sp, 0x10 +/* EA9EC0 802413E0 AFBF0020 */ sw $ra, 0x20($sp) +/* EA9EC4 802413E4 AFA00018 */ sw $zero, 0x18($sp) +/* EA9EC8 802413E8 0C04A144 */ jal func_80128510 +/* EA9ECC 802413EC AFA20010 */ sw $v0, 0x10($sp) +/* EA9ED0 802413F0 8FBF0020 */ lw $ra, 0x20($sp) +/* EA9ED4 802413F4 03E00008 */ jr $ra +/* EA9ED8 802413F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EA8AE0/func_802413FC_EA9EDC.s b/asm/nonmatchings/code_EA8AE0/func_802413FC_EA9EDC.s new file mode 100644 index 0000000000..b06c7bd309 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_802413FC_EA9EDC.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413FC_EA9EDC +/* EA9EDC 802413FC 3C018025 */ lui $at, %hi(D_80248380) +/* EA9EE0 80241400 AC208380 */ sw $zero, %lo(D_80248380)($at) +/* EA9EE4 80241404 03E00008 */ jr $ra +/* EA9EE8 80241408 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EA8AE0/func_8024140C_EA9EEC.s b/asm/nonmatchings/code_EA8AE0/func_8024140C_EA9EEC.s new file mode 100644 index 0000000000..2b995cd028 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_8024140C_EA9EEC.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024140C_EA9EEC +/* EA9EEC 8024140C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EA9EF0 80241410 AFB00010 */ sw $s0, 0x10($sp) +/* EA9EF4 80241414 0080802D */ daddu $s0, $a0, $zero +/* EA9EF8 80241418 AFBF0014 */ sw $ra, 0x14($sp) +/* EA9EFC 8024141C 0C00AFF5 */ jal func_8002BFD4 +/* EA9F00 80241420 24040780 */ addiu $a0, $zero, 0x780 +/* EA9F04 80241424 0200202D */ daddu $a0, $s0, $zero +/* EA9F08 80241428 3C05FD05 */ lui $a1, 0xfd05 +/* EA9F0C 8024142C 34A50F80 */ ori $a1, $a1, 0xf80 +/* EA9F10 80241430 0C0B551A */ jal func_802D5468 +/* EA9F14 80241434 0040302D */ daddu $a2, $v0, $zero +/* EA9F18 80241438 2402FFFF */ addiu $v0, $zero, -1 +/* EA9F1C 8024143C 3C058024 */ lui $a1, %hi(func_802413C0_EA9EA0) +/* EA9F20 80241440 24A513C0 */ addiu $a1, $a1, %lo(func_802413C0_EA9EA0) +/* EA9F24 80241444 3C018025 */ lui $at, %hi(D_80248380) +/* EA9F28 80241448 AC228380 */ sw $v0, %lo(D_80248380)($at) +/* EA9F2C 8024144C 0C04B7FA */ jal func_8012DFE8 +/* EA9F30 80241450 0000202D */ daddu $a0, $zero, $zero +/* EA9F34 80241454 8FBF0014 */ lw $ra, 0x14($sp) +/* EA9F38 80241458 8FB00010 */ lw $s0, 0x10($sp) +/* EA9F3C 8024145C 24020002 */ addiu $v0, $zero, 2 +/* EA9F40 80241460 03E00008 */ jr $ra +/* EA9F44 80241464 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA8AE0/func_80241468_EA9F48.s b/asm/nonmatchings/code_EA8AE0/func_80241468_EA9F48.s new file mode 100644 index 0000000000..3dee9a2865 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80241468_EA9F48.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241468_EA9F48 +/* EA9F48 80241468 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EA9F4C 8024146C AFB00010 */ sw $s0, 0x10($sp) +/* EA9F50 80241470 3C108024 */ lui $s0, %hi(D_80243D74) +/* EA9F54 80241474 26103D74 */ addiu $s0, $s0, %lo(D_80243D74) +/* EA9F58 80241478 AFBF0018 */ sw $ra, 0x18($sp) +/* EA9F5C 8024147C AFB10014 */ sw $s1, 0x14($sp) +/* EA9F60 80241480 8E020000 */ lw $v0, ($s0) +/* EA9F64 80241484 14400010 */ bnez $v0, .L802414C8 +/* EA9F68 80241488 0080882D */ daddu $s1, $a0, $zero +/* EA9F6C 8024148C 0C00AFF5 */ jal func_8002BFD4 +/* EA9F70 80241490 24040040 */ addiu $a0, $zero, 0x40 +/* EA9F74 80241494 AE020000 */ sw $v0, ($s0) +/* EA9F78 80241498 0000182D */ daddu $v1, $zero, $zero +/* EA9F7C 8024149C 0040282D */ daddu $a1, $v0, $zero +/* EA9F80 802414A0 0220202D */ daddu $a0, $s1, $zero +.L802414A4: +/* EA9F84 802414A4 8C820084 */ lw $v0, 0x84($a0) +/* EA9F88 802414A8 24840004 */ addiu $a0, $a0, 4 +/* EA9F8C 802414AC 24630001 */ addiu $v1, $v1, 1 +/* EA9F90 802414B0 ACA20000 */ sw $v0, ($a1) +/* EA9F94 802414B4 28620010 */ slti $v0, $v1, 0x10 +/* EA9F98 802414B8 1440FFFA */ bnez $v0, .L802414A4 +/* EA9F9C 802414BC 24A50004 */ addiu $a1, $a1, 4 +/* EA9FA0 802414C0 08090541 */ j .L80241504 +/* EA9FA4 802414C4 00000000 */ nop +.L802414C8: +/* EA9FA8 802414C8 0000182D */ daddu $v1, $zero, $zero +/* EA9FAC 802414CC 0040282D */ daddu $a1, $v0, $zero +/* EA9FB0 802414D0 0220202D */ daddu $a0, $s1, $zero +.L802414D4: +/* EA9FB4 802414D4 8CA20000 */ lw $v0, ($a1) +/* EA9FB8 802414D8 24A50004 */ addiu $a1, $a1, 4 +/* EA9FBC 802414DC 24630001 */ addiu $v1, $v1, 1 +/* EA9FC0 802414E0 AC820084 */ sw $v0, 0x84($a0) +/* EA9FC4 802414E4 28620010 */ slti $v0, $v1, 0x10 +/* EA9FC8 802414E8 1440FFFA */ bnez $v0, .L802414D4 +/* EA9FCC 802414EC 24840004 */ addiu $a0, $a0, 4 +/* EA9FD0 802414F0 3C108024 */ lui $s0, %hi(D_80243D74) +/* EA9FD4 802414F4 26103D74 */ addiu $s0, $s0, %lo(D_80243D74) +/* EA9FD8 802414F8 0C00B007 */ jal func_8002C01C +/* EA9FDC 802414FC 8E040000 */ lw $a0, ($s0) +/* EA9FE0 80241500 AE000000 */ sw $zero, ($s0) +.L80241504: +/* EA9FE4 80241504 8FBF0018 */ lw $ra, 0x18($sp) +/* EA9FE8 80241508 8FB10014 */ lw $s1, 0x14($sp) +/* EA9FEC 8024150C 8FB00010 */ lw $s0, 0x10($sp) +/* EA9FF0 80241510 24020002 */ addiu $v0, $zero, 2 +/* EA9FF4 80241514 03E00008 */ jr $ra +/* EA9FF8 80241518 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA8AE0/func_8024151C_EA9FFC.s b/asm/nonmatchings/code_EA8AE0/func_8024151C_EA9FFC.s new file mode 100644 index 0000000000..4d0a83fa38 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_8024151C_EA9FFC.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024151C_EA9FFC +/* EA9FFC 8024151C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EAA000 80241520 AFB00010 */ sw $s0, 0x10($sp) +/* EAA004 80241524 0080802D */ daddu $s0, $a0, $zero +/* EAA008 80241528 AFBF0018 */ sw $ra, 0x18($sp) +/* EAA00C 8024152C AFB10014 */ sw $s1, 0x14($sp) +/* EAA010 80241530 8E02000C */ lw $v0, 0xc($s0) +/* EAA014 80241534 8C510000 */ lw $s1, ($v0) +/* EAA018 80241538 0C0B53A3 */ jal func_802D4E8C +/* EAA01C 8024153C 0220282D */ daddu $a1, $s1, $zero +/* EAA020 80241540 3C03FFF0 */ lui $v1, 0xfff0 +/* EAA024 80241544 3463FFFF */ ori $v1, $v1, 0xffff +/* EAA028 80241548 0200202D */ daddu $a0, $s0, $zero +/* EAA02C 8024154C 00431024 */ and $v0, $v0, $v1 +/* EAA030 80241550 00021140 */ sll $v0, $v0, 5 +/* EAA034 80241554 3C068009 */ lui $a2, %hi(D_8008D2C0) +/* EAA038 80241558 00C23021 */ addu $a2, $a2, $v0 +/* EAA03C 8024155C 8CC6D2C0 */ lw $a2, %lo(D_8008D2C0)($a2) +/* EAA040 80241560 0C0B551A */ jal func_802D5468 +/* EAA044 80241564 0220282D */ daddu $a1, $s1, $zero +/* EAA048 80241568 8FBF0018 */ lw $ra, 0x18($sp) +/* EAA04C 8024156C 8FB10014 */ lw $s1, 0x14($sp) +/* EAA050 80241570 8FB00010 */ lw $s0, 0x10($sp) +/* EAA054 80241574 24020002 */ addiu $v0, $zero, 2 +/* EAA058 80241578 03E00008 */ jr $ra +/* EAA05C 8024157C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA8AE0/func_80241580_EAA060.s b/asm/nonmatchings/code_EA8AE0/func_80241580_EAA060.s new file mode 100644 index 0000000000..840e9233a6 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80241580_EAA060.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241580_EAA060 +/* EAA060 80241580 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EAA064 80241584 AFB10014 */ sw $s1, 0x14($sp) +/* EAA068 80241588 0080882D */ daddu $s1, $a0, $zero +/* EAA06C 8024158C AFBF0018 */ sw $ra, 0x18($sp) +/* EAA070 80241590 AFB00010 */ sw $s0, 0x10($sp) +/* EAA074 80241594 8E30000C */ lw $s0, 0xc($s1) +/* EAA078 80241598 8E050000 */ lw $a1, ($s0) +/* EAA07C 8024159C 0C0B53A3 */ jal func_802D4E8C +/* EAA080 802415A0 26100004 */ addiu $s0, $s0, 4 +/* EAA084 802415A4 0C00F94D */ jal func_8003E534 +/* EAA088 802415A8 0040202D */ daddu $a0, $v0, $zero +/* EAA08C 802415AC 10400005 */ beqz $v0, .L802415C4 +/* EAA090 802415B0 00000000 */ nop +/* EAA094 802415B4 8E050000 */ lw $a1, ($s0) +/* EAA098 802415B8 844600A8 */ lh $a2, 0xa8($v0) +/* EAA09C 802415BC 0C0B551A */ jal func_802D5468 +/* EAA0A0 802415C0 0220202D */ daddu $a0, $s1, $zero +.L802415C4: +/* EAA0A4 802415C4 8FBF0018 */ lw $ra, 0x18($sp) +/* EAA0A8 802415C8 8FB10014 */ lw $s1, 0x14($sp) +/* EAA0AC 802415CC 8FB00010 */ lw $s0, 0x10($sp) +/* EAA0B0 802415D0 24020002 */ addiu $v0, $zero, 2 +/* EAA0B4 802415D4 03E00008 */ jr $ra +/* EAA0B8 802415D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA8AE0/func_802415DC_EAA0BC.s b/asm/nonmatchings/code_EA8AE0/func_802415DC_EAA0BC.s new file mode 100644 index 0000000000..f21bdef38d --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_802415DC_EAA0BC.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415DC_EAA0BC +/* EAA0BC 802415DC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EAA0C0 802415E0 AFB10014 */ sw $s1, 0x14($sp) +/* EAA0C4 802415E4 0080882D */ daddu $s1, $a0, $zero +/* EAA0C8 802415E8 AFBF0024 */ sw $ra, 0x24($sp) +/* EAA0CC 802415EC AFB40020 */ sw $s4, 0x20($sp) +/* EAA0D0 802415F0 AFB3001C */ sw $s3, 0x1c($sp) +/* EAA0D4 802415F4 AFB20018 */ sw $s2, 0x18($sp) +/* EAA0D8 802415F8 AFB00010 */ sw $s0, 0x10($sp) +/* EAA0DC 802415FC F7BC0048 */ sdc1 $f28, 0x48($sp) +/* EAA0E0 80241600 F7BA0040 */ sdc1 $f26, 0x40($sp) +/* EAA0E4 80241604 F7B80038 */ sdc1 $f24, 0x38($sp) +/* EAA0E8 80241608 F7B60030 */ sdc1 $f22, 0x30($sp) +/* EAA0EC 8024160C F7B40028 */ sdc1 $f20, 0x28($sp) +/* EAA0F0 80241610 8E30000C */ lw $s0, 0xc($s1) +/* EAA0F4 80241614 8E130000 */ lw $s3, ($s0) +/* EAA0F8 80241618 26100004 */ addiu $s0, $s0, 4 +/* EAA0FC 8024161C 0C0B53A3 */ jal func_802D4E8C +/* EAA100 80241620 0260282D */ daddu $a1, $s3, $zero +/* EAA104 80241624 4482E000 */ mtc1 $v0, $f28 +/* EAA108 80241628 00000000 */ nop +/* EAA10C 8024162C 4680E720 */ cvt.s.w $f28, $f28 +/* EAA110 80241630 8E140000 */ lw $s4, ($s0) +/* EAA114 80241634 26100004 */ addiu $s0, $s0, 4 +/* EAA118 80241638 0220202D */ daddu $a0, $s1, $zero +/* EAA11C 8024163C 0C0B53A3 */ jal func_802D4E8C +/* EAA120 80241640 0280282D */ daddu $a1, $s4, $zero +/* EAA124 80241644 4482D000 */ mtc1 $v0, $f26 +/* EAA128 80241648 00000000 */ nop +/* EAA12C 8024164C 4680D6A0 */ cvt.s.w $f26, $f26 +/* EAA130 80241650 8E100000 */ lw $s0, ($s0) +/* EAA134 80241654 0220202D */ daddu $a0, $s1, $zero +/* EAA138 80241658 0C0B53A3 */ jal func_802D4E8C +/* EAA13C 8024165C 0200282D */ daddu $a1, $s0, $zero +/* EAA140 80241660 4482C000 */ mtc1 $v0, $f24 +/* EAA144 80241664 00000000 */ nop +/* EAA148 80241668 4680C620 */ cvt.s.w $f24, $f24 +/* EAA14C 8024166C 3C128011 */ lui $s2, %hi(D_80117578) +/* EAA150 80241670 26527578 */ addiu $s2, $s2, %lo(D_80117578) +/* EAA154 80241674 3C038008 */ lui $v1, %hi(D_8007C760) +/* EAA158 80241678 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EAA15C 8024167C C64200A8 */ lwc1 $f2, 0xa8($s2) +/* EAA160 80241680 44800000 */ mtc1 $zero, $f0 +/* EAA164 80241684 00031080 */ sll $v0, $v1, 2 +/* EAA168 80241688 00431021 */ addu $v0, $v0, $v1 +/* EAA16C 8024168C 00021080 */ sll $v0, $v0, 2 +/* EAA170 80241690 00431023 */ subu $v0, $v0, $v1 +/* EAA174 80241694 000218C0 */ sll $v1, $v0, 3 +/* EAA178 80241698 00431021 */ addu $v0, $v0, $v1 +/* EAA17C 8024169C 000210C0 */ sll $v0, $v0, 3 +/* EAA180 802416A0 46001032 */ c.eq.s $f2, $f0 +/* EAA184 802416A4 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EAA188 802416A8 00220821 */ addu $at, $at, $v0 +/* EAA18C 802416AC C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) +/* EAA190 802416B0 45000005 */ bc1f .L802416C8 +/* EAA194 802416B4 00000000 */ nop +/* EAA198 802416B8 3C0142C8 */ lui $at, 0x42c8 +/* EAA19C 802416BC 44810000 */ mtc1 $at, $f0 +/* EAA1A0 802416C0 080905B6 */ j .L802416D8 +/* EAA1A4 802416C4 4600B581 */ sub.s $f22, $f22, $f0 +.L802416C8: +/* EAA1A8 802416C8 3C0142C8 */ lui $at, 0x42c8 +/* EAA1AC 802416CC 44810000 */ mtc1 $at, $f0 +/* EAA1B0 802416D0 00000000 */ nop +/* EAA1B4 802416D4 4600B580 */ add.s $f22, $f22, $f0 +.L802416D8: +/* EAA1B8 802416D8 0C00AB85 */ jal func_8002AE14 +/* EAA1BC 802416DC 4600B306 */ mov.s $f12, $f22 +/* EAA1C0 802416E0 46000586 */ mov.s $f22, $f0 +/* EAA1C4 802416E4 3C014170 */ lui $at, 0x4170 +/* EAA1C8 802416E8 4481A000 */ mtc1 $at, $f20 +/* EAA1CC 802416EC 0C00AD77 */ jal func_8002B5DC +/* EAA1D0 802416F0 4600B306 */ mov.s $f12, $f22 +/* EAA1D4 802416F4 46140002 */ mul.s $f0, $f0, $f20 +/* EAA1D8 802416F8 00000000 */ nop +/* EAA1DC 802416FC 864200B0 */ lh $v0, 0xb0($s2) +/* EAA1E0 80241700 3C013F00 */ lui $at, 0x3f00 +/* EAA1E4 80241704 44812000 */ mtc1 $at, $f4 +/* EAA1E8 80241708 44821000 */ mtc1 $v0, $f2 +/* EAA1EC 8024170C 00000000 */ nop +/* EAA1F0 80241710 468010A0 */ cvt.s.w $f2, $f2 +/* EAA1F4 80241714 46041082 */ mul.s $f2, $f2, $f4 +/* EAA1F8 80241718 00000000 */ nop +/* EAA1FC 8024171C 4600E700 */ add.s $f28, $f28, $f0 +/* EAA200 80241720 4602D680 */ add.s $f26, $f26, $f2 +/* EAA204 80241724 0C00AD90 */ jal func_8002B640 +/* EAA208 80241728 4600B306 */ mov.s $f12, $f22 +/* EAA20C 8024172C 46140002 */ mul.s $f0, $f0, $f20 +/* EAA210 80241730 00000000 */ nop +/* EAA214 80241734 0220202D */ daddu $a0, $s1, $zero +/* EAA218 80241738 0260282D */ daddu $a1, $s3, $zero +/* EAA21C 8024173C 4600E18D */ trunc.w.s $f6, $f28 +/* EAA220 80241740 44063000 */ mfc1 $a2, $f6 +/* EAA224 80241744 0C0B551A */ jal func_802D5468 +/* EAA228 80241748 4600C601 */ sub.s $f24, $f24, $f0 +/* EAA22C 8024174C 0220202D */ daddu $a0, $s1, $zero +/* EAA230 80241750 4600D18D */ trunc.w.s $f6, $f26 +/* EAA234 80241754 44063000 */ mfc1 $a2, $f6 +/* EAA238 80241758 0C0B551A */ jal func_802D5468 +/* EAA23C 8024175C 0280282D */ daddu $a1, $s4, $zero +/* EAA240 80241760 0220202D */ daddu $a0, $s1, $zero +/* EAA244 80241764 4600C18D */ trunc.w.s $f6, $f24 +/* EAA248 80241768 44063000 */ mfc1 $a2, $f6 +/* EAA24C 8024176C 0C0B551A */ jal func_802D5468 +/* EAA250 80241770 0200282D */ daddu $a1, $s0, $zero +/* EAA254 80241774 8FBF0024 */ lw $ra, 0x24($sp) +/* EAA258 80241778 8FB40020 */ lw $s4, 0x20($sp) +/* EAA25C 8024177C 8FB3001C */ lw $s3, 0x1c($sp) +/* EAA260 80241780 8FB20018 */ lw $s2, 0x18($sp) +/* EAA264 80241784 8FB10014 */ lw $s1, 0x14($sp) +/* EAA268 80241788 8FB00010 */ lw $s0, 0x10($sp) +/* EAA26C 8024178C D7BC0048 */ ldc1 $f28, 0x48($sp) +/* EAA270 80241790 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* EAA274 80241794 D7B80038 */ ldc1 $f24, 0x38($sp) +/* EAA278 80241798 D7B60030 */ ldc1 $f22, 0x30($sp) +/* EAA27C 8024179C D7B40028 */ ldc1 $f20, 0x28($sp) +/* EAA280 802417A0 24020002 */ addiu $v0, $zero, 2 +/* EAA284 802417A4 03E00008 */ jr $ra +/* EAA288 802417A8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EA8AE0/func_802417AC_EAA28C.s b/asm/nonmatchings/code_EA8AE0/func_802417AC_EAA28C.s new file mode 100644 index 0000000000..ffd2423a68 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_802417AC_EAA28C.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417AC_EAA28C +/* EAA28C 802417AC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EAA290 802417B0 AFBF0010 */ sw $ra, 0x10($sp) +/* EAA294 802417B4 10A00003 */ beqz $a1, .L802417C4 +/* EAA298 802417B8 8C86000C */ lw $a2, 0xc($a0) +/* EAA29C 802417BC 3C018024 */ lui $at, %hi(D_80243DD8) +/* EAA2A0 802417C0 AC203DD8 */ sw $zero, %lo(D_80243DD8)($at) +.L802417C4: +/* EAA2A4 802417C4 3C038024 */ lui $v1, %hi(D_80243DD8) +/* EAA2A8 802417C8 24633DD8 */ addiu $v1, $v1, %lo(D_80243DD8) +/* EAA2AC 802417CC 8C620000 */ lw $v0, ($v1) +/* EAA2B0 802417D0 54400003 */ bnel $v0, $zero, .L802417E0 +/* EAA2B4 802417D4 AC600000 */ sw $zero, ($v1) +/* EAA2B8 802417D8 080905FD */ j .L802417F4 +/* EAA2BC 802417DC 0000102D */ daddu $v0, $zero, $zero +.L802417E0: +/* EAA2C0 802417E0 8CC50000 */ lw $a1, ($a2) +/* EAA2C4 802417E4 3C068024 */ lui $a2, %hi(D_80243DDC) +/* EAA2C8 802417E8 0C0B551A */ jal func_802D5468 +/* EAA2CC 802417EC 8CC63DDC */ lw $a2, %lo(D_80243DDC)($a2) +/* EAA2D0 802417F0 24020002 */ addiu $v0, $zero, 2 +.L802417F4: +/* EAA2D4 802417F4 8FBF0010 */ lw $ra, 0x10($sp) +/* EAA2D8 802417F8 03E00008 */ jr $ra +/* EAA2DC 802417FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA8AE0/func_80241800_EAA2E0.s b/asm/nonmatchings/code_EA8AE0/func_80241800_EAA2E0.s new file mode 100644 index 0000000000..3957b01a63 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80241800_EAA2E0.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241800_EAA2E0 +/* EAA2E0 80241800 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EAA2E4 80241804 AFBF0010 */ sw $ra, 0x10($sp) +/* EAA2E8 80241808 8C82000C */ lw $v0, 0xc($a0) +/* EAA2EC 8024180C 0C0B53A3 */ jal func_802D4E8C +/* EAA2F0 80241810 8C450000 */ lw $a1, ($v0) +/* EAA2F4 80241814 3C018024 */ lui $at, %hi(D_80243DDC) +/* EAA2F8 80241818 AC223DDC */ sw $v0, %lo(D_80243DDC)($at) +/* EAA2FC 8024181C 24020002 */ addiu $v0, $zero, 2 +/* EAA300 80241820 8FBF0010 */ lw $ra, 0x10($sp) +/* EAA304 80241824 24030001 */ addiu $v1, $zero, 1 +/* EAA308 80241828 3C018024 */ lui $at, %hi(D_80243DD8) +/* EAA30C 8024182C AC233DD8 */ sw $v1, %lo(D_80243DD8)($at) +/* EAA310 80241830 03E00008 */ jr $ra +/* EAA314 80241834 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA8AE0/func_80241838_EAA318.s b/asm/nonmatchings/code_EA8AE0/func_80241838_EAA318.s new file mode 100644 index 0000000000..75ac870e46 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80241838_EAA318.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241838_EAA318 +/* EAA318 80241838 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EAA31C 8024183C AFBF0010 */ sw $ra, 0x10($sp) +/* EAA320 80241840 8C82000C */ lw $v0, 0xc($a0) +/* EAA324 80241844 0C0B53A3 */ jal func_802D4E8C +/* EAA328 80241848 8C450000 */ lw $a1, ($v0) +/* EAA32C 8024184C 0040182D */ daddu $v1, $v0, $zero +/* EAA330 80241850 10600012 */ beqz $v1, .L8024189C +/* EAA334 80241854 0000202D */ daddu $a0, $zero, $zero +/* EAA338 80241858 8C620000 */ lw $v0, ($v1) +/* EAA33C 8024185C 5040000A */ beql $v0, $zero, .L80241888 +/* EAA340 80241860 00041080 */ sll $v0, $a0, 2 +/* EAA344 80241864 3C058025 */ lui $a1, %hi(D_80248388) +/* EAA348 80241868 24A58388 */ addiu $a1, $a1, %lo(D_80248388) +.L8024186C: +/* EAA34C 8024186C 24630004 */ addiu $v1, $v1, 4 +/* EAA350 80241870 24840001 */ addiu $a0, $a0, 1 +/* EAA354 80241874 ACA20000 */ sw $v0, ($a1) +/* EAA358 80241878 8C620000 */ lw $v0, ($v1) +/* EAA35C 8024187C 1440FFFB */ bnez $v0, .L8024186C +/* EAA360 80241880 24A50004 */ addiu $a1, $a1, 4 +/* EAA364 80241884 00041080 */ sll $v0, $a0, 2 +.L80241888: +/* EAA368 80241888 3C018025 */ lui $at, %hi(D_80248388) +/* EAA36C 8024188C 00220821 */ addu $at, $at, $v0 +/* EAA370 80241890 AC208388 */ sw $zero, %lo(D_80248388)($at) +/* EAA374 80241894 08090631 */ j .L802418C4 +/* EAA378 80241898 00000000 */ nop +.L8024189C: +/* EAA37C 8024189C 3C038025 */ lui $v1, %hi(D_80248388) +/* EAA380 802418A0 24638388 */ addiu $v1, $v1, %lo(D_80248388) +/* EAA384 802418A4 0060282D */ daddu $a1, $v1, $zero +.L802418A8: +/* EAA388 802418A8 24820010 */ addiu $v0, $a0, 0x10 +/* EAA38C 802418AC AC620000 */ sw $v0, ($v1) +/* EAA390 802418B0 24630004 */ addiu $v1, $v1, 4 +/* EAA394 802418B4 24840001 */ addiu $a0, $a0, 1 +/* EAA398 802418B8 28820070 */ slti $v0, $a0, 0x70 +/* EAA39C 802418BC 1440FFFA */ bnez $v0, .L802418A8 +/* EAA3A0 802418C0 ACA001C0 */ sw $zero, 0x1c0($a1) +.L802418C4: +/* EAA3A4 802418C4 8FBF0010 */ lw $ra, 0x10($sp) +/* EAA3A8 802418C8 24020002 */ addiu $v0, $zero, 2 +/* EAA3AC 802418CC 03E00008 */ jr $ra +/* EAA3B0 802418D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA8AE0/func_802418D4_EAA3B4.s b/asm/nonmatchings/code_EA8AE0/func_802418D4_EAA3B4.s new file mode 100644 index 0000000000..364f45c1f2 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_802418D4_EAA3B4.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418D4_EAA3B4 +/* EAA3B4 802418D4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EAA3B8 802418D8 AFB10014 */ sw $s1, 0x14($sp) +/* EAA3BC 802418DC 0080882D */ daddu $s1, $a0, $zero +/* EAA3C0 802418E0 AFBF0018 */ sw $ra, 0x18($sp) +/* EAA3C4 802418E4 AFB00010 */ sw $s0, 0x10($sp) +/* EAA3C8 802418E8 8E30000C */ lw $s0, 0xc($s1) +/* EAA3CC 802418EC 8E050000 */ lw $a1, ($s0) +/* EAA3D0 802418F0 0C0B53A3 */ jal func_802D4E8C +/* EAA3D4 802418F4 26100004 */ addiu $s0, $s0, 4 +/* EAA3D8 802418F8 AE22008C */ sw $v0, 0x8c($s1) +/* EAA3DC 802418FC 8E050000 */ lw $a1, ($s0) +/* EAA3E0 80241900 26100004 */ addiu $s0, $s0, 4 +/* EAA3E4 80241904 0C0B53A3 */ jal func_802D4E8C +/* EAA3E8 80241908 0220202D */ daddu $a0, $s1, $zero +/* EAA3EC 8024190C AE220090 */ sw $v0, 0x90($s1) +/* EAA3F0 80241910 8E050000 */ lw $a1, ($s0) +/* EAA3F4 80241914 26100004 */ addiu $s0, $s0, 4 +/* EAA3F8 80241918 0C0B53A3 */ jal func_802D4E8C +/* EAA3FC 8024191C 0220202D */ daddu $a0, $s1, $zero +/* EAA400 80241920 AE220094 */ sw $v0, 0x94($s1) +/* EAA404 80241924 8E050000 */ lw $a1, ($s0) +/* EAA408 80241928 26100004 */ addiu $s0, $s0, 4 +/* EAA40C 8024192C 0C0B53A3 */ jal func_802D4E8C +/* EAA410 80241930 0220202D */ daddu $a0, $s1, $zero +/* EAA414 80241934 AE220098 */ sw $v0, 0x98($s1) +/* EAA418 80241938 8E050000 */ lw $a1, ($s0) +/* EAA41C 8024193C 26100004 */ addiu $s0, $s0, 4 +/* EAA420 80241940 0C0B53A3 */ jal func_802D4E8C +/* EAA424 80241944 0220202D */ daddu $a0, $s1, $zero +/* EAA428 80241948 AE22009C */ sw $v0, 0x9c($s1) +/* EAA42C 8024194C 8E050000 */ lw $a1, ($s0) +/* EAA430 80241950 26100004 */ addiu $s0, $s0, 4 +/* EAA434 80241954 0C0B53A3 */ jal func_802D4E8C +/* EAA438 80241958 0220202D */ daddu $a0, $s1, $zero +/* EAA43C 8024195C AE2200A0 */ sw $v0, 0xa0($s1) +/* EAA440 80241960 8E050000 */ lw $a1, ($s0) +/* EAA444 80241964 26100004 */ addiu $s0, $s0, 4 +/* EAA448 80241968 0C0B53A3 */ jal func_802D4E8C +/* EAA44C 8024196C 0220202D */ daddu $a0, $s1, $zero +/* EAA450 80241970 AE2200A4 */ sw $v0, 0xa4($s1) +/* EAA454 80241974 8E050000 */ lw $a1, ($s0) +/* EAA458 80241978 26100004 */ addiu $s0, $s0, 4 +/* EAA45C 8024197C 0C0B53A3 */ jal func_802D4E8C +/* EAA460 80241980 0220202D */ daddu $a0, $s1, $zero +/* EAA464 80241984 AE2200A8 */ sw $v0, 0xa8($s1) +/* EAA468 80241988 8E050000 */ lw $a1, ($s0) +/* EAA46C 8024198C 26100004 */ addiu $s0, $s0, 4 +/* EAA470 80241990 0C0B53A3 */ jal func_802D4E8C +/* EAA474 80241994 0220202D */ daddu $a0, $s1, $zero +/* EAA478 80241998 AE2200AC */ sw $v0, 0xac($s1) +/* EAA47C 8024199C 8E050000 */ lw $a1, ($s0) +/* EAA480 802419A0 0C0B53A3 */ jal func_802D4E8C +/* EAA484 802419A4 0220202D */ daddu $a0, $s1, $zero +/* EAA488 802419A8 AE2200B0 */ sw $v0, 0xb0($s1) +/* EAA48C 802419AC 8FBF0018 */ lw $ra, 0x18($sp) +/* EAA490 802419B0 8FB10014 */ lw $s1, 0x14($sp) +/* EAA494 802419B4 8FB00010 */ lw $s0, 0x10($sp) +/* EAA498 802419B8 24020002 */ addiu $v0, $zero, 2 +/* EAA49C 802419BC 03E00008 */ jr $ra +/* EAA4A0 802419C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EA8AE0/func_802419C4_EAA4A4.s b/asm/nonmatchings/code_EA8AE0/func_802419C4_EAA4A4.s new file mode 100644 index 0000000000..6b68e3354c --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_802419C4_EAA4A4.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419C4_EAA4A4 +/* EAA4A4 802419C4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EAA4A8 802419C8 AFB1001C */ sw $s1, 0x1c($sp) +/* EAA4AC 802419CC 0080882D */ daddu $s1, $a0, $zero +/* EAA4B0 802419D0 AFBF0034 */ sw $ra, 0x34($sp) +/* EAA4B4 802419D4 AFB60030 */ sw $s6, 0x30($sp) +/* EAA4B8 802419D8 AFB5002C */ sw $s5, 0x2c($sp) +/* EAA4BC 802419DC AFB40028 */ sw $s4, 0x28($sp) +/* EAA4C0 802419E0 AFB30024 */ sw $s3, 0x24($sp) +/* EAA4C4 802419E4 AFB20020 */ sw $s2, 0x20($sp) +/* EAA4C8 802419E8 AFB00018 */ sw $s0, 0x18($sp) +/* EAA4CC 802419EC F7B60040 */ sdc1 $f22, 0x40($sp) +/* EAA4D0 802419F0 F7B40038 */ sdc1 $f20, 0x38($sp) +/* EAA4D4 802419F4 8E30000C */ lw $s0, 0xc($s1) +/* EAA4D8 802419F8 8E160000 */ lw $s6, ($s0) +/* EAA4DC 802419FC 26100004 */ addiu $s0, $s0, 4 +/* EAA4E0 80241A00 0C0B53A3 */ jal func_802D4E8C +/* EAA4E4 80241A04 02C0282D */ daddu $a1, $s6, $zero +/* EAA4E8 80241A08 44820000 */ mtc1 $v0, $f0 +/* EAA4EC 80241A0C 00000000 */ nop +/* EAA4F0 80241A10 46800020 */ cvt.s.w $f0, $f0 +/* EAA4F4 80241A14 E7A00010 */ swc1 $f0, 0x10($sp) +/* EAA4F8 80241A18 8E140000 */ lw $s4, ($s0) +/* EAA4FC 80241A1C 26100004 */ addiu $s0, $s0, 4 +/* EAA500 80241A20 0220202D */ daddu $a0, $s1, $zero +/* EAA504 80241A24 0C0B53A3 */ jal func_802D4E8C +/* EAA508 80241A28 0280282D */ daddu $a1, $s4, $zero +/* EAA50C 80241A2C 0220202D */ daddu $a0, $s1, $zero +/* EAA510 80241A30 8E150000 */ lw $s5, ($s0) +/* EAA514 80241A34 4482B000 */ mtc1 $v0, $f22 +/* EAA518 80241A38 00000000 */ nop +/* EAA51C 80241A3C 4680B5A0 */ cvt.s.w $f22, $f22 +/* EAA520 80241A40 0C0B53A3 */ jal func_802D4E8C +/* EAA524 80241A44 02A0282D */ daddu $a1, $s5, $zero +/* EAA528 80241A48 2404FFFC */ addiu $a0, $zero, -4 +/* EAA52C 80241A4C 44820000 */ mtc1 $v0, $f0 +/* EAA530 80241A50 00000000 */ nop +/* EAA534 80241A54 46800020 */ cvt.s.w $f0, $f0 +/* EAA538 80241A58 0C00F92F */ jal func_8003E4BC +/* EAA53C 80241A5C E7A00014 */ swc1 $f0, 0x14($sp) +/* EAA540 80241A60 3C048008 */ lui $a0, %hi(D_8007C760) +/* EAA544 80241A64 8C84C760 */ lw $a0, %lo(D_8007C760)($a0) +/* EAA548 80241A68 3C014334 */ lui $at, 0x4334 +/* EAA54C 80241A6C 44816000 */ mtc1 $at, $f12 +/* EAA550 80241A70 00041880 */ sll $v1, $a0, 2 +/* EAA554 80241A74 00641821 */ addu $v1, $v1, $a0 +/* EAA558 80241A78 00031880 */ sll $v1, $v1, 2 +/* EAA55C 80241A7C 00641823 */ subu $v1, $v1, $a0 +/* EAA560 80241A80 000320C0 */ sll $a0, $v1, 3 +/* EAA564 80241A84 00641821 */ addu $v1, $v1, $a0 +/* EAA568 80241A88 000318C0 */ sll $v1, $v1, 3 +/* EAA56C 80241A8C 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EAA570 80241A90 00230821 */ addu $at, $at, $v1 +/* EAA574 80241A94 C4208DEC */ lwc1 $f0, %lo(D_800B8DEC)($at) +/* EAA578 80241A98 460C0300 */ add.s $f12, $f0, $f12 +/* EAA57C 80241A9C 0C00AB85 */ jal func_8002AE14 +/* EAA580 80241AA0 0040982D */ daddu $s3, $v0, $zero +/* EAA584 80241AA4 27B00010 */ addiu $s0, $sp, 0x10 +/* EAA588 80241AA8 0200202D */ daddu $a0, $s0, $zero +/* EAA58C 80241AAC 27B20014 */ addiu $s2, $sp, 0x14 +/* EAA590 80241AB0 0240282D */ daddu $a1, $s2, $zero +/* EAA594 80241AB4 3C064170 */ lui $a2, 0x4170 +/* EAA598 80241AB8 8E67000C */ lw $a3, 0xc($s3) +/* EAA59C 80241ABC 0C00ACA3 */ jal func_8002B28C +/* EAA5A0 80241AC0 46000506 */ mov.s $f20, $f0 +/* EAA5A4 80241AC4 0200202D */ daddu $a0, $s0, $zero +/* EAA5A8 80241AC8 3C064120 */ lui $a2, 0x4120 +/* EAA5AC 80241ACC 4407A000 */ mfc1 $a3, $f20 +/* EAA5B0 80241AD0 0C00ACA3 */ jal func_8002B28C +/* EAA5B4 80241AD4 0240282D */ daddu $a1, $s2, $zero +/* EAA5B8 80241AD8 0220202D */ daddu $a0, $s1, $zero +/* EAA5BC 80241ADC C7A00010 */ lwc1 $f0, 0x10($sp) +/* EAA5C0 80241AE0 4600008D */ trunc.w.s $f2, $f0 +/* EAA5C4 80241AE4 44061000 */ mfc1 $a2, $f2 +/* EAA5C8 80241AE8 0C0B551A */ jal func_802D5468 +/* EAA5CC 80241AEC 02C0282D */ daddu $a1, $s6, $zero +/* EAA5D0 80241AF0 0220202D */ daddu $a0, $s1, $zero +/* EAA5D4 80241AF4 4600B08D */ trunc.w.s $f2, $f22 +/* EAA5D8 80241AF8 44061000 */ mfc1 $a2, $f2 +/* EAA5DC 80241AFC 0C0B551A */ jal func_802D5468 +/* EAA5E0 80241B00 0280282D */ daddu $a1, $s4, $zero +/* EAA5E4 80241B04 0220202D */ daddu $a0, $s1, $zero +/* EAA5E8 80241B08 C7A00014 */ lwc1 $f0, 0x14($sp) +/* EAA5EC 80241B0C 4600008D */ trunc.w.s $f2, $f0 +/* EAA5F0 80241B10 44061000 */ mfc1 $a2, $f2 +/* EAA5F4 80241B14 0C0B551A */ jal func_802D5468 +/* EAA5F8 80241B18 02A0282D */ daddu $a1, $s5, $zero +/* EAA5FC 80241B1C 8FBF0034 */ lw $ra, 0x34($sp) +/* EAA600 80241B20 8FB60030 */ lw $s6, 0x30($sp) +/* EAA604 80241B24 8FB5002C */ lw $s5, 0x2c($sp) +/* EAA608 80241B28 8FB40028 */ lw $s4, 0x28($sp) +/* EAA60C 80241B2C 8FB30024 */ lw $s3, 0x24($sp) +/* EAA610 80241B30 8FB20020 */ lw $s2, 0x20($sp) +/* EAA614 80241B34 8FB1001C */ lw $s1, 0x1c($sp) +/* EAA618 80241B38 8FB00018 */ lw $s0, 0x18($sp) +/* EAA61C 80241B3C D7B60040 */ ldc1 $f22, 0x40($sp) +/* EAA620 80241B40 D7B40038 */ ldc1 $f20, 0x38($sp) +/* EAA624 80241B44 24020002 */ addiu $v0, $zero, 2 +/* EAA628 80241B48 03E00008 */ jr $ra +/* EAA62C 80241B4C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EA8AE0/func_80241B50_EAA630.s b/asm/nonmatchings/code_EA8AE0/func_80241B50_EAA630.s new file mode 100644 index 0000000000..c2b698edd8 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80241B50_EAA630.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B50_EAA630 +/* EAA630 80241B50 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EAA634 80241B54 AFB00010 */ sw $s0, 0x10($sp) +/* EAA638 80241B58 0080802D */ daddu $s0, $a0, $zero +/* EAA63C 80241B5C AFBF0014 */ sw $ra, 0x14($sp) +/* EAA640 80241B60 0C00F92F */ jal func_8003E4BC +/* EAA644 80241B64 8E04008C */ lw $a0, 0x8c($s0) +/* EAA648 80241B68 0040282D */ daddu $a1, $v0, $zero +/* EAA64C 80241B6C 8E040094 */ lw $a0, 0x94($s0) +/* EAA650 80241B70 8CA30028 */ lw $v1, 0x28($a1) +/* EAA654 80241B74 ACA40028 */ sw $a0, 0x28($a1) +/* EAA658 80241B78 8FBF0014 */ lw $ra, 0x14($sp) +/* EAA65C 80241B7C 8FB00010 */ lw $s0, 0x10($sp) +/* EAA660 80241B80 24020002 */ addiu $v0, $zero, 2 +/* EAA664 80241B84 3C018025 */ lui $at, %hi(D_8024854C) +/* EAA668 80241B88 AC23854C */ sw $v1, %lo(D_8024854C)($at) +/* EAA66C 80241B8C 03E00008 */ jr $ra +/* EAA670 80241B90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA8AE0/func_80241B94_EAA674.s b/asm/nonmatchings/code_EA8AE0/func_80241B94_EAA674.s new file mode 100644 index 0000000000..55c6b35245 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80241B94_EAA674.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B94_EAA674 +/* EAA674 80241B94 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EAA678 80241B98 AFBF0010 */ sw $ra, 0x10($sp) +/* EAA67C 80241B9C 0C00F92F */ jal func_8003E4BC +/* EAA680 80241BA0 8C84008C */ lw $a0, 0x8c($a0) +/* EAA684 80241BA4 3C038025 */ lui $v1, %hi(D_8024854C) +/* EAA688 80241BA8 8C63854C */ lw $v1, %lo(D_8024854C)($v1) +/* EAA68C 80241BAC AC430028 */ sw $v1, 0x28($v0) +/* EAA690 80241BB0 8FBF0010 */ lw $ra, 0x10($sp) +/* EAA694 80241BB4 24020002 */ addiu $v0, $zero, 2 +/* EAA698 80241BB8 03E00008 */ jr $ra +/* EAA69C 80241BBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EA8AE0/func_80241BC0_EAA6A0.s b/asm/nonmatchings/code_EA8AE0/func_80241BC0_EAA6A0.s new file mode 100644 index 0000000000..e1fe9b8c29 --- /dev/null +++ b/asm/nonmatchings/code_EA8AE0/func_80241BC0_EAA6A0.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BC0_EAA6A0 +/* EAA6A0 80241BC0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EAA6A4 80241BC4 AFB10014 */ sw $s1, 0x14($sp) +/* EAA6A8 80241BC8 0080882D */ daddu $s1, $a0, $zero +/* EAA6AC 80241BCC AFBF0018 */ sw $ra, 0x18($sp) +/* EAA6B0 80241BD0 AFB00010 */ sw $s0, 0x10($sp) +/* EAA6B4 80241BD4 8E30000C */ lw $s0, 0xc($s1) +/* EAA6B8 80241BD8 8E050000 */ lw $a1, ($s0) +/* EAA6BC 80241BDC 0C0B53A3 */ jal func_802D4E8C +/* EAA6C0 80241BE0 26100004 */ addiu $s0, $s0, 4 +/* EAA6C4 80241BE4 0220202D */ daddu $a0, $s1, $zero +/* EAA6C8 80241BE8 8E050000 */ lw $a1, ($s0) +/* EAA6CC 80241BEC 0C0B53A3 */ jal func_802D4E8C +/* EAA6D0 80241BF0 0040802D */ daddu $s0, $v0, $zero +/* EAA6D4 80241BF4 0040202D */ daddu $a0, $v0, $zero +/* EAA6D8 80241BF8 24020001 */ addiu $v0, $zero, 1 +/* EAA6DC 80241BFC 12020019 */ beq $s0, $v0, .L80241C64 +/* EAA6E0 80241C00 2A020002 */ slti $v0, $s0, 2 +/* EAA6E4 80241C04 10400005 */ beqz $v0, .L80241C1C +/* EAA6E8 80241C08 24020002 */ addiu $v0, $zero, 2 +/* EAA6EC 80241C0C 12000009 */ beqz $s0, .L80241C34 +/* EAA6F0 80241C10 00041840 */ sll $v1, $a0, 1 +/* EAA6F4 80241C14 08090743 */ j .L80241D0C +/* EAA6F8 80241C18 00000000 */ nop +.L80241C1C: +/* EAA6FC 80241C1C 1202001F */ beq $s0, $v0, .L80241C9C +/* EAA700 80241C20 24020003 */ addiu $v0, $zero, 3 +/* EAA704 80241C24 1202002B */ beq $s0, $v0, .L80241CD4 +/* EAA708 80241C28 3C068020 */ lui $a2, 0x8020 +/* EAA70C 80241C2C 08090743 */ j .L80241D0C +/* EAA710 80241C30 00000000 */ nop +.L80241C34: +/* EAA714 80241C34 3C028024 */ lui $v0, %hi(D_80243BB8) +/* EAA718 80241C38 24423BB8 */ addiu $v0, $v0, %lo(D_80243BB8) +/* EAA71C 80241C3C 00641821 */ addu $v1, $v1, $a0 +/* EAA720 80241C40 00032080 */ sll $a0, $v1, 2 +/* EAA724 80241C44 00822021 */ addu $a0, $a0, $v0 +/* EAA728 80241C48 24630001 */ addiu $v1, $v1, 1 +/* EAA72C 80241C4C 00031880 */ sll $v1, $v1, 2 +/* EAA730 80241C50 00621821 */ addu $v1, $v1, $v0 +/* EAA734 80241C54 8C840000 */ lw $a0, ($a0) +/* EAA738 80241C58 8C650000 */ lw $a1, ($v1) +/* EAA73C 80241C5C 08090741 */ j .L80241D04 +/* EAA740 80241C60 3C068020 */ lui $a2, 0x8020 +.L80241C64: +/* EAA744 80241C64 3C068020 */ lui $a2, 0x8020 +/* EAA748 80241C68 3C028024 */ lui $v0, %hi(D_80243BB8) +/* EAA74C 80241C6C 24423BB8 */ addiu $v0, $v0, %lo(D_80243BB8) +/* EAA750 80241C70 00041840 */ sll $v1, $a0, 1 +/* EAA754 80241C74 00641821 */ addu $v1, $v1, $a0 +/* EAA758 80241C78 00032080 */ sll $a0, $v1, 2 +/* EAA75C 80241C7C 00822021 */ addu $a0, $a0, $v0 +/* EAA760 80241C80 24630001 */ addiu $v1, $v1, 1 +/* EAA764 80241C84 00031880 */ sll $v1, $v1, 2 +/* EAA768 80241C88 00621821 */ addu $v1, $v1, $v0 +/* EAA76C 80241C8C 8C840000 */ lw $a0, ($a0) +/* EAA770 80241C90 8C650000 */ lw $a1, ($v1) +/* EAA774 80241C94 08090741 */ j .L80241D04 +/* EAA778 80241C98 34C64000 */ ori $a2, $a2, 0x4000 +.L80241C9C: +/* EAA77C 80241C9C 3C068020 */ lui $a2, 0x8020 +/* EAA780 80241CA0 3C028024 */ lui $v0, %hi(D_80243BB8) +/* EAA784 80241CA4 24423BB8 */ addiu $v0, $v0, %lo(D_80243BB8) +/* EAA788 80241CA8 00041840 */ sll $v1, $a0, 1 +/* EAA78C 80241CAC 00641821 */ addu $v1, $v1, $a0 +/* EAA790 80241CB0 00032080 */ sll $a0, $v1, 2 +/* EAA794 80241CB4 00822021 */ addu $a0, $a0, $v0 +/* EAA798 80241CB8 24630001 */ addiu $v1, $v1, 1 +/* EAA79C 80241CBC 00031880 */ sll $v1, $v1, 2 +/* EAA7A0 80241CC0 00621821 */ addu $v1, $v1, $v0 +/* EAA7A4 80241CC4 8C840000 */ lw $a0, ($a0) +/* EAA7A8 80241CC8 8C650000 */ lw $a1, ($v1) +/* EAA7AC 80241CCC 08090741 */ j .L80241D04 +/* EAA7B0 80241CD0 34C67000 */ ori $a2, $a2, 0x7000 +.L80241CD4: +/* EAA7B4 80241CD4 3C028024 */ lui $v0, %hi(D_80243BB8) +/* EAA7B8 80241CD8 24423BB8 */ addiu $v0, $v0, %lo(D_80243BB8) +/* EAA7BC 80241CDC 00041840 */ sll $v1, $a0, 1 +/* EAA7C0 80241CE0 00641821 */ addu $v1, $v1, $a0 +/* EAA7C4 80241CE4 00032080 */ sll $a0, $v1, 2 +/* EAA7C8 80241CE8 00822021 */ addu $a0, $a0, $v0 +/* EAA7CC 80241CEC 24630001 */ addiu $v1, $v1, 1 +/* EAA7D0 80241CF0 00031880 */ sll $v1, $v1, 2 +/* EAA7D4 80241CF4 00621821 */ addu $v1, $v1, $v0 +/* EAA7D8 80241CF8 8C840000 */ lw $a0, ($a0) +/* EAA7DC 80241CFC 8C650000 */ lw $a1, ($v1) +/* EAA7E0 80241D00 34C6A000 */ ori $a2, $a2, 0xa000 +.L80241D04: +/* EAA7E4 80241D04 0C00AA8B */ jal func_8002AA2C +/* EAA7E8 80241D08 00000000 */ nop +.L80241D0C: +/* EAA7EC 80241D0C 8FBF0018 */ lw $ra, 0x18($sp) +/* EAA7F0 80241D10 8FB10014 */ lw $s1, 0x14($sp) +/* EAA7F4 80241D14 8FB00010 */ lw $s0, 0x10($sp) +/* EAA7F8 80241D18 24020002 */ addiu $v0, $zero, 2 +/* EAA7FC 80241D1C 03E00008 */ jr $ra +/* EAA800 80241D20 27BD0020 */ addiu $sp, $sp, 0x20 +/* EAA804 80241D24 00000000 */ nop +/* EAA808 80241D28 00000000 */ nop +/* EAA80C 80241D2C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB0E60/func_80240000_EB0E60.s b/asm/nonmatchings/code_EB0E60/func_80240000_EB0E60.s new file mode 100644 index 0000000000..1116c25b2c --- /dev/null +++ b/asm/nonmatchings/code_EB0E60/func_80240000_EB0E60.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EB0E60 +/* EB0E60 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB0E64 80240004 AFB00010 */ sw $s0, 0x10($sp) +/* EB0E68 80240008 0080802D */ daddu $s0, $a0, $zero +/* EB0E6C 8024000C AFBF0014 */ sw $ra, 0x14($sp) +/* EB0E70 80240010 8E0300A8 */ lw $v1, 0xa8($s0) +/* EB0E74 80240014 8E020088 */ lw $v0, 0x88($s0) +/* EB0E78 80240018 00621821 */ addu $v1, $v1, $v0 +/* EB0E7C 8024001C 04610004 */ bgez $v1, .L80240030 +/* EB0E80 80240020 AE0300A8 */ sw $v1, 0xa8($s0) +/* EB0E84 80240024 3C020002 */ lui $v0, 2 +/* EB0E88 80240028 08090010 */ j .L80240040 +/* EB0E8C 8024002C 00621021 */ addu $v0, $v1, $v0 +.L80240030: +/* EB0E90 80240030 3C040002 */ lui $a0, 2 +/* EB0E94 80240034 0083102A */ slt $v0, $a0, $v1 +/* EB0E98 80240038 10400002 */ beqz $v0, .L80240044 +/* EB0E9C 8024003C 00641023 */ subu $v0, $v1, $a0 +.L80240040: +/* EB0EA0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240044: +/* EB0EA4 80240044 8E0300AC */ lw $v1, 0xac($s0) +/* EB0EA8 80240048 8E02008C */ lw $v0, 0x8c($s0) +/* EB0EAC 8024004C 00621821 */ addu $v1, $v1, $v0 +/* EB0EB0 80240050 04610004 */ bgez $v1, .L80240064 +/* EB0EB4 80240054 AE0300AC */ sw $v1, 0xac($s0) +/* EB0EB8 80240058 3C020002 */ lui $v0, 2 +/* EB0EBC 8024005C 0809001D */ j .L80240074 +/* EB0EC0 80240060 00621021 */ addu $v0, $v1, $v0 +.L80240064: +/* EB0EC4 80240064 3C040002 */ lui $a0, 2 +/* EB0EC8 80240068 0083102A */ slt $v0, $a0, $v1 +/* EB0ECC 8024006C 10400002 */ beqz $v0, .L80240078 +/* EB0ED0 80240070 00641023 */ subu $v0, $v1, $a0 +.L80240074: +/* EB0ED4 80240074 AE0200AC */ sw $v0, 0xac($s0) +.L80240078: +/* EB0ED8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) +/* EB0EDC 8024007C 8E020090 */ lw $v0, 0x90($s0) +/* EB0EE0 80240080 00621821 */ addu $v1, $v1, $v0 +/* EB0EE4 80240084 04610004 */ bgez $v1, .L80240098 +/* EB0EE8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) +/* EB0EEC 8024008C 3C020002 */ lui $v0, 2 +/* EB0EF0 80240090 0809002A */ j .L802400A8 +/* EB0EF4 80240094 00621021 */ addu $v0, $v1, $v0 +.L80240098: +/* EB0EF8 80240098 3C040002 */ lui $a0, 2 +/* EB0EFC 8024009C 0083102A */ slt $v0, $a0, $v1 +/* EB0F00 802400A0 10400002 */ beqz $v0, .L802400AC +/* EB0F04 802400A4 00641023 */ subu $v0, $v1, $a0 +.L802400A8: +/* EB0F08 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802400AC: +/* EB0F0C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) +/* EB0F10 802400B0 8E020094 */ lw $v0, 0x94($s0) +/* EB0F14 802400B4 00621821 */ addu $v1, $v1, $v0 +/* EB0F18 802400B8 04610004 */ bgez $v1, .L802400CC +/* EB0F1C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) +/* EB0F20 802400C0 3C020002 */ lui $v0, 2 +/* EB0F24 802400C4 08090037 */ j .L802400DC +/* EB0F28 802400C8 00621021 */ addu $v0, $v1, $v0 +.L802400CC: +/* EB0F2C 802400CC 3C040002 */ lui $a0, 2 +/* EB0F30 802400D0 0083102A */ slt $v0, $a0, $v1 +/* EB0F34 802400D4 10400002 */ beqz $v0, .L802400E0 +/* EB0F38 802400D8 00641023 */ subu $v0, $v1, $a0 +.L802400DC: +/* EB0F3C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) +.L802400E0: +/* EB0F40 802400E0 8E040084 */ lw $a0, 0x84($s0) +/* EB0F44 802400E4 0C049819 */ jal func_80126064 +/* EB0F48 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) +/* EB0F4C 802400EC 8E040084 */ lw $a0, 0x84($s0) +/* EB0F50 802400F0 0C04981F */ jal func_8012607C +/* EB0F54 802400F4 8E0500AC */ lw $a1, 0xac($s0) +/* EB0F58 802400F8 8E040084 */ lw $a0, 0x84($s0) +/* EB0F5C 802400FC 0C049825 */ jal func_80126094 +/* EB0F60 80240100 8E0500B0 */ lw $a1, 0xb0($s0) +/* EB0F64 80240104 8E040084 */ lw $a0, 0x84($s0) +/* EB0F68 80240108 0C04982B */ jal func_801260AC +/* EB0F6C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) +/* EB0F70 80240110 8FBF0014 */ lw $ra, 0x14($sp) +/* EB0F74 80240114 8FB00010 */ lw $s0, 0x10($sp) +/* EB0F78 80240118 0000102D */ daddu $v0, $zero, $zero +/* EB0F7C 8024011C 03E00008 */ jr $ra +/* EB0F80 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB0E60/func_80240124_EB0F84.s b/asm/nonmatchings/code_EB0E60/func_80240124_EB0F84.s new file mode 100644 index 0000000000..a7fae4bee7 --- /dev/null +++ b/asm/nonmatchings/code_EB0E60/func_80240124_EB0F84.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240124_EB0F84 +/* EB0F84 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB0F88 80240128 AFB00010 */ sw $s0, 0x10($sp) +/* EB0F8C 8024012C 0080802D */ daddu $s0, $a0, $zero +/* EB0F90 80240130 10A00005 */ beqz $a1, .L80240148 +/* EB0F94 80240134 AFBF0014 */ sw $ra, 0x14($sp) +/* EB0F98 80240138 AE000070 */ sw $zero, 0x70($s0) +/* EB0F9C 8024013C AE000074 */ sw $zero, 0x74($s0) +/* EB0FA0 80240140 AE000078 */ sw $zero, 0x78($s0) +/* EB0FA4 80240144 AE00007C */ sw $zero, 0x7c($s0) +.L80240148: +/* EB0FA8 80240148 8E020070 */ lw $v0, 0x70($s0) +/* EB0FAC 8024014C 1440000E */ bnez $v0, .L80240188 +/* EB0FB0 80240150 00000000 */ nop +/* EB0FB4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) +/* EB0FB8 80240158 8E020088 */ lw $v0, 0x88($s0) +/* EB0FBC 8024015C 00621821 */ addu $v1, $v1, $v0 +/* EB0FC0 80240160 04610004 */ bgez $v1, .L80240174 +/* EB0FC4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) +/* EB0FC8 80240168 3C020002 */ lui $v0, 2 +/* EB0FCC 8024016C 08090061 */ j .L80240184 +/* EB0FD0 80240170 00621021 */ addu $v0, $v1, $v0 +.L80240174: +/* EB0FD4 80240174 3C040002 */ lui $a0, 2 +/* EB0FD8 80240178 0083102A */ slt $v0, $a0, $v1 +/* EB0FDC 8024017C 10400002 */ beqz $v0, .L80240188 +/* EB0FE0 80240180 00641023 */ subu $v0, $v1, $a0 +.L80240184: +/* EB0FE4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240188: +/* EB0FE8 80240188 8E020074 */ lw $v0, 0x74($s0) +/* EB0FEC 8024018C 1440000E */ bnez $v0, .L802401C8 +/* EB0FF0 80240190 00000000 */ nop +/* EB0FF4 80240194 8E0300AC */ lw $v1, 0xac($s0) +/* EB0FF8 80240198 8E02008C */ lw $v0, 0x8c($s0) +/* EB0FFC 8024019C 00621821 */ addu $v1, $v1, $v0 +/* EB1000 802401A0 04610004 */ bgez $v1, .L802401B4 +/* EB1004 802401A4 AE0300AC */ sw $v1, 0xac($s0) +/* EB1008 802401A8 3C020002 */ lui $v0, 2 +/* EB100C 802401AC 08090071 */ j .L802401C4 +/* EB1010 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* EB1014 802401B4 3C040002 */ lui $a0, 2 +/* EB1018 802401B8 0083102A */ slt $v0, $a0, $v1 +/* EB101C 802401BC 10400002 */ beqz $v0, .L802401C8 +/* EB1020 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* EB1024 802401C4 AE0200AC */ sw $v0, 0xac($s0) +.L802401C8: +/* EB1028 802401C8 8E020078 */ lw $v0, 0x78($s0) +/* EB102C 802401CC 1440000E */ bnez $v0, .L80240208 +/* EB1030 802401D0 00000000 */ nop +/* EB1034 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) +/* EB1038 802401D8 8E020090 */ lw $v0, 0x90($s0) +/* EB103C 802401DC 00621821 */ addu $v1, $v1, $v0 +/* EB1040 802401E0 04610004 */ bgez $v1, .L802401F4 +/* EB1044 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) +/* EB1048 802401E8 3C020002 */ lui $v0, 2 +/* EB104C 802401EC 08090081 */ j .L80240204 +/* EB1050 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* EB1054 802401F4 3C040002 */ lui $a0, 2 +/* EB1058 802401F8 0083102A */ slt $v0, $a0, $v1 +/* EB105C 802401FC 10400002 */ beqz $v0, .L80240208 +/* EB1060 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* EB1064 80240204 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240208: +/* EB1068 80240208 8E02007C */ lw $v0, 0x7c($s0) +/* EB106C 8024020C 1440000E */ bnez $v0, .L80240248 +/* EB1070 80240210 00000000 */ nop +/* EB1074 80240214 8E0300B4 */ lw $v1, 0xb4($s0) +/* EB1078 80240218 8E020094 */ lw $v0, 0x94($s0) +/* EB107C 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EB1080 80240220 04610004 */ bgez $v1, .L80240234 +/* EB1084 80240224 AE0300B4 */ sw $v1, 0xb4($s0) +/* EB1088 80240228 3C020002 */ lui $v0, 2 +/* EB108C 8024022C 08090091 */ j .L80240244 +/* EB1090 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* EB1094 80240234 3C040002 */ lui $a0, 2 +/* EB1098 80240238 0083102A */ slt $v0, $a0, $v1 +/* EB109C 8024023C 10400002 */ beqz $v0, .L80240248 +/* EB10A0 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* EB10A4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240248: +/* EB10A8 80240248 8E040084 */ lw $a0, 0x84($s0) +/* EB10AC 8024024C 0C049819 */ jal func_80126064 +/* EB10B0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) +/* EB10B4 80240254 8E040084 */ lw $a0, 0x84($s0) +/* EB10B8 80240258 0C04981F */ jal func_8012607C +/* EB10BC 8024025C 8E0500AC */ lw $a1, 0xac($s0) +/* EB10C0 80240260 8E040084 */ lw $a0, 0x84($s0) +/* EB10C4 80240264 0C049825 */ jal func_80126094 +/* EB10C8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) +/* EB10CC 8024026C 8E040084 */ lw $a0, 0x84($s0) +/* EB10D0 80240270 0C04982B */ jal func_801260AC +/* EB10D4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) +/* EB10D8 80240278 8E020070 */ lw $v0, 0x70($s0) +/* EB10DC 8024027C 8E030078 */ lw $v1, 0x78($s0) +/* EB10E0 80240280 8E040098 */ lw $a0, 0x98($s0) +/* EB10E4 80240284 24420001 */ addiu $v0, $v0, 1 +/* EB10E8 80240288 AE020070 */ sw $v0, 0x70($s0) +/* EB10EC 8024028C 8E020074 */ lw $v0, 0x74($s0) +/* EB10F0 80240290 24630001 */ addiu $v1, $v1, 1 +/* EB10F4 80240294 AE030078 */ sw $v1, 0x78($s0) +/* EB10F8 80240298 8E030070 */ lw $v1, 0x70($s0) +/* EB10FC 8024029C 24420001 */ addiu $v0, $v0, 1 +/* EB1100 802402A0 AE020074 */ sw $v0, 0x74($s0) +/* EB1104 802402A4 8E02007C */ lw $v0, 0x7c($s0) +/* EB1108 802402A8 0064182A */ slt $v1, $v1, $a0 +/* EB110C 802402AC 24420001 */ addiu $v0, $v0, 1 +/* EB1110 802402B0 14600002 */ bnez $v1, .L802402BC +/* EB1114 802402B4 AE02007C */ sw $v0, 0x7c($s0) +/* EB1118 802402B8 AE000070 */ sw $zero, 0x70($s0) +.L802402BC: +/* EB111C 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* EB1120 802402C0 8E03009C */ lw $v1, 0x9c($s0) +/* EB1124 802402C4 0043102A */ slt $v0, $v0, $v1 +/* EB1128 802402C8 50400001 */ beql $v0, $zero, .L802402D0 +/* EB112C 802402CC AE000074 */ sw $zero, 0x74($s0) +.L802402D0: +/* EB1130 802402D0 8E020078 */ lw $v0, 0x78($s0) +/* EB1134 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) +/* EB1138 802402D8 0043102A */ slt $v0, $v0, $v1 +/* EB113C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* EB1140 802402E0 AE000078 */ sw $zero, 0x78($s0) +.L802402E4: +/* EB1144 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* EB1148 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) +/* EB114C 802402EC 0043102A */ slt $v0, $v0, $v1 +/* EB1150 802402F0 50400001 */ beql $v0, $zero, .L802402F8 +/* EB1154 802402F4 AE00007C */ sw $zero, 0x7c($s0) +.L802402F8: +/* EB1158 802402F8 8FBF0014 */ lw $ra, 0x14($sp) +/* EB115C 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* EB1160 80240300 0000102D */ daddu $v0, $zero, $zero +/* EB1164 80240304 03E00008 */ jr $ra +/* EB1168 80240308 27BD0018 */ addiu $sp, $sp, 0x18 +/* EB116C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB1170/func_80240310_EB1170.s b/asm/nonmatchings/code_EB1170/func_80240310_EB1170.s new file mode 100644 index 0000000000..1d3d78602e --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_80240310_EB1170.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240310_EB1170 +/* EB1170 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB1174 80240314 AFB00010 */ sw $s0, 0x10($sp) +/* EB1178 80240318 3C108024 */ lui $s0, %hi(func_80241780_E13EE0) +/* EB117C 8024031C 26101780 */ addiu $s0, $s0, %lo(func_80241780_E13EE0) +/* EB1180 80240320 AFBF0018 */ sw $ra, 0x18($sp) +/* EB1184 80240324 AFB10014 */ sw $s1, 0x14($sp) +/* EB1188 80240328 8E020000 */ lw $v0, ($s0) +/* EB118C 8024032C 14400010 */ bnez $v0, .L80240370 +/* EB1190 80240330 0080882D */ daddu $s1, $a0, $zero +/* EB1194 80240334 0C00AFF5 */ jal func_8002BFD4 +/* EB1198 80240338 24040040 */ addiu $a0, $zero, 0x40 +/* EB119C 8024033C AE020000 */ sw $v0, ($s0) +/* EB11A0 80240340 0000182D */ daddu $v1, $zero, $zero +/* EB11A4 80240344 0040282D */ daddu $a1, $v0, $zero +/* EB11A8 80240348 0220202D */ daddu $a0, $s1, $zero +.L8024034C: +/* EB11AC 8024034C 8C820084 */ lw $v0, 0x84($a0) +/* EB11B0 80240350 24840004 */ addiu $a0, $a0, 4 +/* EB11B4 80240354 24630001 */ addiu $v1, $v1, 1 +/* EB11B8 80240358 ACA20000 */ sw $v0, ($a1) +/* EB11BC 8024035C 28620010 */ slti $v0, $v1, 0x10 +/* EB11C0 80240360 1440FFFA */ bnez $v0, .L8024034C +/* EB11C4 80240364 24A50004 */ addiu $a1, $a1, 4 +/* EB11C8 80240368 080900EB */ j .L802403AC +/* EB11CC 8024036C 00000000 */ nop +.L80240370: +/* EB11D0 80240370 0000182D */ daddu $v1, $zero, $zero +/* EB11D4 80240374 0040282D */ daddu $a1, $v0, $zero +/* EB11D8 80240378 0220202D */ daddu $a0, $s1, $zero +.L8024037C: +/* EB11DC 8024037C 8CA20000 */ lw $v0, ($a1) +/* EB11E0 80240380 24A50004 */ addiu $a1, $a1, 4 +/* EB11E4 80240384 24630001 */ addiu $v1, $v1, 1 +/* EB11E8 80240388 AC820084 */ sw $v0, 0x84($a0) +/* EB11EC 8024038C 28620010 */ slti $v0, $v1, 0x10 +/* EB11F0 80240390 1440FFFA */ bnez $v0, .L8024037C +/* EB11F4 80240394 24840004 */ addiu $a0, $a0, 4 +/* EB11F8 80240398 3C108024 */ lui $s0, %hi(func_80241780_E13EE0) +/* EB11FC 8024039C 26101780 */ addiu $s0, $s0, %lo(func_80241780_E13EE0) +/* EB1200 802403A0 0C00B007 */ jal func_8002C01C +/* EB1204 802403A4 8E040000 */ lw $a0, ($s0) +/* EB1208 802403A8 AE000000 */ sw $zero, ($s0) +.L802403AC: +/* EB120C 802403AC 8FBF0018 */ lw $ra, 0x18($sp) +/* EB1210 802403B0 8FB10014 */ lw $s1, 0x14($sp) +/* EB1214 802403B4 8FB00010 */ lw $s0, 0x10($sp) +/* EB1218 802403B8 24020002 */ addiu $v0, $zero, 2 +/* EB121C 802403BC 03E00008 */ jr $ra +/* EB1220 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EB1170/func_802403C4_EB1224.s b/asm/nonmatchings/code_EB1170/func_802403C4_EB1224.s new file mode 100644 index 0000000000..edfe3cbebb --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_802403C4_EB1224.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403C4_EB1224 +/* EB1224 802403C4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB1228 802403C8 AFB00010 */ sw $s0, 0x10($sp) +/* EB122C 802403CC 0080802D */ daddu $s0, $a0, $zero +/* EB1230 802403D0 AFBF0018 */ sw $ra, 0x18($sp) +/* EB1234 802403D4 AFB10014 */ sw $s1, 0x14($sp) +/* EB1238 802403D8 8E02000C */ lw $v0, 0xc($s0) +/* EB123C 802403DC 8C510000 */ lw $s1, ($v0) +/* EB1240 802403E0 0C0B53A3 */ jal func_802D4E8C +/* EB1244 802403E4 0220282D */ daddu $a1, $s1, $zero +/* EB1248 802403E8 3C03FFF0 */ lui $v1, 0xfff0 +/* EB124C 802403EC 3463FFFF */ ori $v1, $v1, 0xffff +/* EB1250 802403F0 0200202D */ daddu $a0, $s0, $zero +/* EB1254 802403F4 00431024 */ and $v0, $v0, $v1 +/* EB1258 802403F8 00021140 */ sll $v0, $v0, 5 +/* EB125C 802403FC 3C068009 */ lui $a2, %hi(D_8008D2C0) +/* EB1260 80240400 00C23021 */ addu $a2, $a2, $v0 +/* EB1264 80240404 8CC6D2C0 */ lw $a2, %lo(D_8008D2C0)($a2) +/* EB1268 80240408 0C0B551A */ jal func_802D5468 +/* EB126C 8024040C 0220282D */ daddu $a1, $s1, $zero +/* EB1270 80240410 8FBF0018 */ lw $ra, 0x18($sp) +/* EB1274 80240414 8FB10014 */ lw $s1, 0x14($sp) +/* EB1278 80240418 8FB00010 */ lw $s0, 0x10($sp) +/* EB127C 8024041C 24020002 */ addiu $v0, $zero, 2 +/* EB1280 80240420 03E00008 */ jr $ra +/* EB1284 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EB1170/func_80240428_EB1288.s b/asm/nonmatchings/code_EB1170/func_80240428_EB1288.s new file mode 100644 index 0000000000..e06e790214 --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_80240428_EB1288.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240428_EB1288 +/* EB1288 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB128C 8024042C AFB10014 */ sw $s1, 0x14($sp) +/* EB1290 80240430 0080882D */ daddu $s1, $a0, $zero +/* EB1294 80240434 AFBF0018 */ sw $ra, 0x18($sp) +/* EB1298 80240438 AFB00010 */ sw $s0, 0x10($sp) +/* EB129C 8024043C 8E30000C */ lw $s0, 0xc($s1) +/* EB12A0 80240440 8E050000 */ lw $a1, ($s0) +/* EB12A4 80240444 0C0B53A3 */ jal func_802D4E8C +/* EB12A8 80240448 26100004 */ addiu $s0, $s0, 4 +/* EB12AC 8024044C 0C00F94D */ jal func_8003E534 +/* EB12B0 80240450 0040202D */ daddu $a0, $v0, $zero +/* EB12B4 80240454 10400005 */ beqz $v0, .L8024046C +/* EB12B8 80240458 00000000 */ nop +/* EB12BC 8024045C 8E050000 */ lw $a1, ($s0) +/* EB12C0 80240460 844600A8 */ lh $a2, 0xa8($v0) +/* EB12C4 80240464 0C0B551A */ jal func_802D5468 +/* EB12C8 80240468 0220202D */ daddu $a0, $s1, $zero +.L8024046C: +/* EB12CC 8024046C 8FBF0018 */ lw $ra, 0x18($sp) +/* EB12D0 80240470 8FB10014 */ lw $s1, 0x14($sp) +/* EB12D4 80240474 8FB00010 */ lw $s0, 0x10($sp) +/* EB12D8 80240478 24020002 */ addiu $v0, $zero, 2 +/* EB12DC 8024047C 03E00008 */ jr $ra +/* EB12E0 80240480 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EB1170/func_80240484_EB12E4.s b/asm/nonmatchings/code_EB1170/func_80240484_EB12E4.s new file mode 100644 index 0000000000..0e1de0f903 --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_80240484_EB12E4.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240484_EB12E4 +/* EB12E4 80240484 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EB12E8 80240488 AFB10014 */ sw $s1, 0x14($sp) +/* EB12EC 8024048C 0080882D */ daddu $s1, $a0, $zero +/* EB12F0 80240490 AFBF0024 */ sw $ra, 0x24($sp) +/* EB12F4 80240494 AFB40020 */ sw $s4, 0x20($sp) +/* EB12F8 80240498 AFB3001C */ sw $s3, 0x1c($sp) +/* EB12FC 8024049C AFB20018 */ sw $s2, 0x18($sp) +/* EB1300 802404A0 AFB00010 */ sw $s0, 0x10($sp) +/* EB1304 802404A4 F7BC0048 */ sdc1 $f28, 0x48($sp) +/* EB1308 802404A8 F7BA0040 */ sdc1 $f26, 0x40($sp) +/* EB130C 802404AC F7B80038 */ sdc1 $f24, 0x38($sp) +/* EB1310 802404B0 F7B60030 */ sdc1 $f22, 0x30($sp) +/* EB1314 802404B4 F7B40028 */ sdc1 $f20, 0x28($sp) +/* EB1318 802404B8 8E30000C */ lw $s0, 0xc($s1) +/* EB131C 802404BC 8E130000 */ lw $s3, ($s0) +/* EB1320 802404C0 26100004 */ addiu $s0, $s0, 4 +/* EB1324 802404C4 0C0B53A3 */ jal func_802D4E8C +/* EB1328 802404C8 0260282D */ daddu $a1, $s3, $zero +/* EB132C 802404CC 4482E000 */ mtc1 $v0, $f28 +/* EB1330 802404D0 00000000 */ nop +/* EB1334 802404D4 4680E720 */ cvt.s.w $f28, $f28 +/* EB1338 802404D8 8E140000 */ lw $s4, ($s0) +/* EB133C 802404DC 26100004 */ addiu $s0, $s0, 4 +/* EB1340 802404E0 0220202D */ daddu $a0, $s1, $zero +/* EB1344 802404E4 0C0B53A3 */ jal func_802D4E8C +/* EB1348 802404E8 0280282D */ daddu $a1, $s4, $zero +/* EB134C 802404EC 4482D000 */ mtc1 $v0, $f26 +/* EB1350 802404F0 00000000 */ nop +/* EB1354 802404F4 4680D6A0 */ cvt.s.w $f26, $f26 +/* EB1358 802404F8 8E100000 */ lw $s0, ($s0) +/* EB135C 802404FC 0220202D */ daddu $a0, $s1, $zero +/* EB1360 80240500 0C0B53A3 */ jal func_802D4E8C +/* EB1364 80240504 0200282D */ daddu $a1, $s0, $zero +/* EB1368 80240508 4482C000 */ mtc1 $v0, $f24 +/* EB136C 8024050C 00000000 */ nop +/* EB1370 80240510 4680C620 */ cvt.s.w $f24, $f24 +/* EB1374 80240514 3C128011 */ lui $s2, %hi(D_80117578) +/* EB1378 80240518 26527578 */ addiu $s2, $s2, %lo(D_80117578) +/* EB137C 8024051C 3C038008 */ lui $v1, %hi(D_8007C760) +/* EB1380 80240520 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EB1384 80240524 C64200A8 */ lwc1 $f2, 0xa8($s2) +/* EB1388 80240528 44800000 */ mtc1 $zero, $f0 +/* EB138C 8024052C 00031080 */ sll $v0, $v1, 2 +/* EB1390 80240530 00431021 */ addu $v0, $v0, $v1 +/* EB1394 80240534 00021080 */ sll $v0, $v0, 2 +/* EB1398 80240538 00431023 */ subu $v0, $v0, $v1 +/* EB139C 8024053C 000218C0 */ sll $v1, $v0, 3 +/* EB13A0 80240540 00431021 */ addu $v0, $v0, $v1 +/* EB13A4 80240544 000210C0 */ sll $v0, $v0, 3 +/* EB13A8 80240548 46001032 */ c.eq.s $f2, $f0 +/* EB13AC 8024054C 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EB13B0 80240550 00220821 */ addu $at, $at, $v0 +/* EB13B4 80240554 C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) +/* EB13B8 80240558 45000005 */ bc1f .L80240570 +/* EB13BC 8024055C 00000000 */ nop +/* EB13C0 80240560 3C0142C8 */ lui $at, 0x42c8 +/* EB13C4 80240564 44810000 */ mtc1 $at, $f0 +/* EB13C8 80240568 08090160 */ j .L80240580 +/* EB13CC 8024056C 4600B581 */ sub.s $f22, $f22, $f0 +.L80240570: +/* EB13D0 80240570 3C0142C8 */ lui $at, 0x42c8 +/* EB13D4 80240574 44810000 */ mtc1 $at, $f0 +/* EB13D8 80240578 00000000 */ nop +/* EB13DC 8024057C 4600B580 */ add.s $f22, $f22, $f0 +.L80240580: +/* EB13E0 80240580 0C00AB85 */ jal func_8002AE14 +/* EB13E4 80240584 4600B306 */ mov.s $f12, $f22 +/* EB13E8 80240588 46000586 */ mov.s $f22, $f0 +/* EB13EC 8024058C 3C014170 */ lui $at, 0x4170 +/* EB13F0 80240590 4481A000 */ mtc1 $at, $f20 +/* EB13F4 80240594 0C00AD77 */ jal func_8002B5DC +/* EB13F8 80240598 4600B306 */ mov.s $f12, $f22 +/* EB13FC 8024059C 46140002 */ mul.s $f0, $f0, $f20 +/* EB1400 802405A0 00000000 */ nop +/* EB1404 802405A4 864200B0 */ lh $v0, 0xb0($s2) +/* EB1408 802405A8 3C013F00 */ lui $at, 0x3f00 +/* EB140C 802405AC 44812000 */ mtc1 $at, $f4 +/* EB1410 802405B0 44821000 */ mtc1 $v0, $f2 +/* EB1414 802405B4 00000000 */ nop +/* EB1418 802405B8 468010A0 */ cvt.s.w $f2, $f2 +/* EB141C 802405BC 46041082 */ mul.s $f2, $f2, $f4 +/* EB1420 802405C0 00000000 */ nop +/* EB1424 802405C4 4600E700 */ add.s $f28, $f28, $f0 +/* EB1428 802405C8 4602D680 */ add.s $f26, $f26, $f2 +/* EB142C 802405CC 0C00AD90 */ jal func_8002B640 +/* EB1430 802405D0 4600B306 */ mov.s $f12, $f22 +/* EB1434 802405D4 46140002 */ mul.s $f0, $f0, $f20 +/* EB1438 802405D8 00000000 */ nop +/* EB143C 802405DC 0220202D */ daddu $a0, $s1, $zero +/* EB1440 802405E0 0260282D */ daddu $a1, $s3, $zero +/* EB1444 802405E4 4600E18D */ trunc.w.s $f6, $f28 +/* EB1448 802405E8 44063000 */ mfc1 $a2, $f6 +/* EB144C 802405EC 0C0B551A */ jal func_802D5468 +/* EB1450 802405F0 4600C601 */ sub.s $f24, $f24, $f0 +/* EB1454 802405F4 0220202D */ daddu $a0, $s1, $zero +/* EB1458 802405F8 4600D18D */ trunc.w.s $f6, $f26 +/* EB145C 802405FC 44063000 */ mfc1 $a2, $f6 +/* EB1460 80240600 0C0B551A */ jal func_802D5468 +/* EB1464 80240604 0280282D */ daddu $a1, $s4, $zero +/* EB1468 80240608 0220202D */ daddu $a0, $s1, $zero +/* EB146C 8024060C 4600C18D */ trunc.w.s $f6, $f24 +/* EB1470 80240610 44063000 */ mfc1 $a2, $f6 +/* EB1474 80240614 0C0B551A */ jal func_802D5468 +/* EB1478 80240618 0200282D */ daddu $a1, $s0, $zero +/* EB147C 8024061C 8FBF0024 */ lw $ra, 0x24($sp) +/* EB1480 80240620 8FB40020 */ lw $s4, 0x20($sp) +/* EB1484 80240624 8FB3001C */ lw $s3, 0x1c($sp) +/* EB1488 80240628 8FB20018 */ lw $s2, 0x18($sp) +/* EB148C 8024062C 8FB10014 */ lw $s1, 0x14($sp) +/* EB1490 80240630 8FB00010 */ lw $s0, 0x10($sp) +/* EB1494 80240634 D7BC0048 */ ldc1 $f28, 0x48($sp) +/* EB1498 80240638 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* EB149C 8024063C D7B80038 */ ldc1 $f24, 0x38($sp) +/* EB14A0 80240640 D7B60030 */ ldc1 $f22, 0x30($sp) +/* EB14A4 80240644 D7B40028 */ ldc1 $f20, 0x28($sp) +/* EB14A8 80240648 24020002 */ addiu $v0, $zero, 2 +/* EB14AC 8024064C 03E00008 */ jr $ra +/* EB14B0 80240650 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EB1170/func_80240654_EB14B4.s b/asm/nonmatchings/code_EB1170/func_80240654_EB14B4.s new file mode 100644 index 0000000000..632ee21bab --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_80240654_EB14B4.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240654_EB14B4 +/* EB14B4 80240654 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB14B8 80240658 AFBF0010 */ sw $ra, 0x10($sp) +/* EB14BC 8024065C 10A00003 */ beqz $a1, .L8024066C +/* EB14C0 80240660 8C86000C */ lw $a2, 0xc($a0) +/* EB14C4 80240664 3C018024 */ lui $at, %hi(D_802417E4) +/* EB14C8 80240668 AC2017E4 */ sw $zero, %lo(D_802417E4)($at) +.L8024066C: +/* EB14CC 8024066C 3C038024 */ lui $v1, %hi(D_802417E4) +/* EB14D0 80240670 246317E4 */ addiu $v1, $v1, %lo(D_802417E4) +/* EB14D4 80240674 8C620000 */ lw $v0, ($v1) +/* EB14D8 80240678 54400003 */ bnel $v0, $zero, .L80240688 +/* EB14DC 8024067C AC600000 */ sw $zero, ($v1) +/* EB14E0 80240680 080901A7 */ j .L8024069C +/* EB14E4 80240684 0000102D */ daddu $v0, $zero, $zero +.L80240688: +/* EB14E8 80240688 8CC50000 */ lw $a1, ($a2) +/* EB14EC 8024068C 3C068024 */ lui $a2, %hi(D_802417E8) +/* EB14F0 80240690 0C0B551A */ jal func_802D5468 +/* EB14F4 80240694 8CC617E8 */ lw $a2, %lo(D_802417E8)($a2) +/* EB14F8 80240698 24020002 */ addiu $v0, $zero, 2 +.L8024069C: +/* EB14FC 8024069C 8FBF0010 */ lw $ra, 0x10($sp) +/* EB1500 802406A0 03E00008 */ jr $ra +/* EB1504 802406A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB1170/func_802406A8_EB1508.s b/asm/nonmatchings/code_EB1170/func_802406A8_EB1508.s new file mode 100644 index 0000000000..aeaeb9d6e2 --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_802406A8_EB1508.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406A8_EB1508 +/* EB1508 802406A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB150C 802406AC AFBF0010 */ sw $ra, 0x10($sp) +/* EB1510 802406B0 8C82000C */ lw $v0, 0xc($a0) +/* EB1514 802406B4 0C0B53A3 */ jal func_802D4E8C +/* EB1518 802406B8 8C450000 */ lw $a1, ($v0) +/* EB151C 802406BC 3C018024 */ lui $at, %hi(D_802417E8) +/* EB1520 802406C0 AC2217E8 */ sw $v0, %lo(D_802417E8)($at) +/* EB1524 802406C4 24020002 */ addiu $v0, $zero, 2 +/* EB1528 802406C8 8FBF0010 */ lw $ra, 0x10($sp) +/* EB152C 802406CC 24030001 */ addiu $v1, $zero, 1 +/* EB1530 802406D0 3C018024 */ lui $at, %hi(D_802417E4) +/* EB1534 802406D4 AC2317E4 */ sw $v1, %lo(D_802417E4)($at) +/* EB1538 802406D8 03E00008 */ jr $ra +/* EB153C 802406DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB1170/func_802406E0_EB1540.s b/asm/nonmatchings/code_EB1170/func_802406E0_EB1540.s new file mode 100644 index 0000000000..32bb8c9d33 --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_802406E0_EB1540.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406E0_EB1540 +/* EB1540 802406E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB1544 802406E4 AFBF0010 */ sw $ra, 0x10($sp) +/* EB1548 802406E8 8C82000C */ lw $v0, 0xc($a0) +/* EB154C 802406EC 0C0B53A3 */ jal func_802D4E8C +/* EB1550 802406F0 8C450000 */ lw $a1, ($v0) +/* EB1554 802406F4 0040182D */ daddu $v1, $v0, $zero +/* EB1558 802406F8 10600012 */ beqz $v1, .L80240744 +/* EB155C 802406FC 0000202D */ daddu $a0, $zero, $zero +/* EB1560 80240700 8C620000 */ lw $v0, ($v1) +/* EB1564 80240704 5040000A */ beql $v0, $zero, .L80240730 +/* EB1568 80240708 00041080 */ sll $v0, $a0, 2 +/* EB156C 8024070C 3C058024 */ lui $a1, %hi(D_802442D0) +/* EB1570 80240710 24A542D0 */ addiu $a1, $a1, %lo(D_802442D0) +.L80240714: +/* EB1574 80240714 24630004 */ addiu $v1, $v1, 4 +/* EB1578 80240718 24840001 */ addiu $a0, $a0, 1 +/* EB157C 8024071C ACA20000 */ sw $v0, ($a1) +/* EB1580 80240720 8C620000 */ lw $v0, ($v1) +/* EB1584 80240724 1440FFFB */ bnez $v0, .L80240714 +/* EB1588 80240728 24A50004 */ addiu $a1, $a1, 4 +/* EB158C 8024072C 00041080 */ sll $v0, $a0, 2 +.L80240730: +/* EB1590 80240730 3C018024 */ lui $at, %hi(D_802442D0) +/* EB1594 80240734 00220821 */ addu $at, $at, $v0 +/* EB1598 80240738 AC2042D0 */ sw $zero, %lo(D_802442D0)($at) +/* EB159C 8024073C 080901DB */ j .L8024076C +/* EB15A0 80240740 00000000 */ nop +.L80240744: +/* EB15A4 80240744 3C038024 */ lui $v1, %hi(D_802442D0) +/* EB15A8 80240748 246342D0 */ addiu $v1, $v1, %lo(D_802442D0) +/* EB15AC 8024074C 0060282D */ daddu $a1, $v1, $zero +.L80240750: +/* EB15B0 80240750 24820010 */ addiu $v0, $a0, 0x10 +/* EB15B4 80240754 AC620000 */ sw $v0, ($v1) +/* EB15B8 80240758 24630004 */ addiu $v1, $v1, 4 +/* EB15BC 8024075C 24840001 */ addiu $a0, $a0, 1 +/* EB15C0 80240760 28820070 */ slti $v0, $a0, 0x70 +/* EB15C4 80240764 1440FFFA */ bnez $v0, .L80240750 +/* EB15C8 80240768 ACA001C0 */ sw $zero, 0x1c0($a1) +.L8024076C: +/* EB15CC 8024076C 8FBF0010 */ lw $ra, 0x10($sp) +/* EB15D0 80240770 24020002 */ addiu $v0, $zero, 2 +/* EB15D4 80240774 03E00008 */ jr $ra +/* EB15D8 80240778 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB1170/func_8024077C_EB15DC.s b/asm/nonmatchings/code_EB1170/func_8024077C_EB15DC.s new file mode 100644 index 0000000000..db7da8a2c5 --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_8024077C_EB15DC.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024077C_EB15DC +/* EB15DC 8024077C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB15E0 80240780 AFB10014 */ sw $s1, 0x14($sp) +/* EB15E4 80240784 0080882D */ daddu $s1, $a0, $zero +/* EB15E8 80240788 AFBF0018 */ sw $ra, 0x18($sp) +/* EB15EC 8024078C AFB00010 */ sw $s0, 0x10($sp) +/* EB15F0 80240790 8E30000C */ lw $s0, 0xc($s1) +/* EB15F4 80240794 8E050000 */ lw $a1, ($s0) +/* EB15F8 80240798 0C0B53A3 */ jal func_802D4E8C +/* EB15FC 8024079C 26100004 */ addiu $s0, $s0, 4 +/* EB1600 802407A0 AE22008C */ sw $v0, 0x8c($s1) +/* EB1604 802407A4 8E050000 */ lw $a1, ($s0) +/* EB1608 802407A8 26100004 */ addiu $s0, $s0, 4 +/* EB160C 802407AC 0C0B53A3 */ jal func_802D4E8C +/* EB1610 802407B0 0220202D */ daddu $a0, $s1, $zero +/* EB1614 802407B4 AE220090 */ sw $v0, 0x90($s1) +/* EB1618 802407B8 8E050000 */ lw $a1, ($s0) +/* EB161C 802407BC 26100004 */ addiu $s0, $s0, 4 +/* EB1620 802407C0 0C0B53A3 */ jal func_802D4E8C +/* EB1624 802407C4 0220202D */ daddu $a0, $s1, $zero +/* EB1628 802407C8 AE220094 */ sw $v0, 0x94($s1) +/* EB162C 802407CC 8E050000 */ lw $a1, ($s0) +/* EB1630 802407D0 26100004 */ addiu $s0, $s0, 4 +/* EB1634 802407D4 0C0B53A3 */ jal func_802D4E8C +/* EB1638 802407D8 0220202D */ daddu $a0, $s1, $zero +/* EB163C 802407DC AE220098 */ sw $v0, 0x98($s1) +/* EB1640 802407E0 8E050000 */ lw $a1, ($s0) +/* EB1644 802407E4 26100004 */ addiu $s0, $s0, 4 +/* EB1648 802407E8 0C0B53A3 */ jal func_802D4E8C +/* EB164C 802407EC 0220202D */ daddu $a0, $s1, $zero +/* EB1650 802407F0 AE22009C */ sw $v0, 0x9c($s1) +/* EB1654 802407F4 8E050000 */ lw $a1, ($s0) +/* EB1658 802407F8 26100004 */ addiu $s0, $s0, 4 +/* EB165C 802407FC 0C0B53A3 */ jal func_802D4E8C +/* EB1660 80240800 0220202D */ daddu $a0, $s1, $zero +/* EB1664 80240804 AE2200A0 */ sw $v0, 0xa0($s1) +/* EB1668 80240808 8E050000 */ lw $a1, ($s0) +/* EB166C 8024080C 26100004 */ addiu $s0, $s0, 4 +/* EB1670 80240810 0C0B53A3 */ jal func_802D4E8C +/* EB1674 80240814 0220202D */ daddu $a0, $s1, $zero +/* EB1678 80240818 AE2200A4 */ sw $v0, 0xa4($s1) +/* EB167C 8024081C 8E050000 */ lw $a1, ($s0) +/* EB1680 80240820 26100004 */ addiu $s0, $s0, 4 +/* EB1684 80240824 0C0B53A3 */ jal func_802D4E8C +/* EB1688 80240828 0220202D */ daddu $a0, $s1, $zero +/* EB168C 8024082C AE2200A8 */ sw $v0, 0xa8($s1) +/* EB1690 80240830 8E050000 */ lw $a1, ($s0) +/* EB1694 80240834 26100004 */ addiu $s0, $s0, 4 +/* EB1698 80240838 0C0B53A3 */ jal func_802D4E8C +/* EB169C 8024083C 0220202D */ daddu $a0, $s1, $zero +/* EB16A0 80240840 AE2200AC */ sw $v0, 0xac($s1) +/* EB16A4 80240844 8E050000 */ lw $a1, ($s0) +/* EB16A8 80240848 0C0B53A3 */ jal func_802D4E8C +/* EB16AC 8024084C 0220202D */ daddu $a0, $s1, $zero +/* EB16B0 80240850 AE2200B0 */ sw $v0, 0xb0($s1) +/* EB16B4 80240854 8FBF0018 */ lw $ra, 0x18($sp) +/* EB16B8 80240858 8FB10014 */ lw $s1, 0x14($sp) +/* EB16BC 8024085C 8FB00010 */ lw $s0, 0x10($sp) +/* EB16C0 80240860 24020002 */ addiu $v0, $zero, 2 +/* EB16C4 80240864 03E00008 */ jr $ra +/* EB16C8 80240868 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EB1170/func_8024086C_EB16CC.s b/asm/nonmatchings/code_EB1170/func_8024086C_EB16CC.s new file mode 100644 index 0000000000..11914719a9 --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_8024086C_EB16CC.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024086C_EB16CC +/* EB16CC 8024086C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EB16D0 80240870 AFB1001C */ sw $s1, 0x1c($sp) +/* EB16D4 80240874 0080882D */ daddu $s1, $a0, $zero +/* EB16D8 80240878 AFBF0034 */ sw $ra, 0x34($sp) +/* EB16DC 8024087C AFB60030 */ sw $s6, 0x30($sp) +/* EB16E0 80240880 AFB5002C */ sw $s5, 0x2c($sp) +/* EB16E4 80240884 AFB40028 */ sw $s4, 0x28($sp) +/* EB16E8 80240888 AFB30024 */ sw $s3, 0x24($sp) +/* EB16EC 8024088C AFB20020 */ sw $s2, 0x20($sp) +/* EB16F0 80240890 AFB00018 */ sw $s0, 0x18($sp) +/* EB16F4 80240894 F7B60040 */ sdc1 $f22, 0x40($sp) +/* EB16F8 80240898 F7B40038 */ sdc1 $f20, 0x38($sp) +/* EB16FC 8024089C 8E30000C */ lw $s0, 0xc($s1) +/* EB1700 802408A0 8E160000 */ lw $s6, ($s0) +/* EB1704 802408A4 26100004 */ addiu $s0, $s0, 4 +/* EB1708 802408A8 0C0B53A3 */ jal func_802D4E8C +/* EB170C 802408AC 02C0282D */ daddu $a1, $s6, $zero +/* EB1710 802408B0 44820000 */ mtc1 $v0, $f0 +/* EB1714 802408B4 00000000 */ nop +/* EB1718 802408B8 46800020 */ cvt.s.w $f0, $f0 +/* EB171C 802408BC E7A00010 */ swc1 $f0, 0x10($sp) +/* EB1720 802408C0 8E140000 */ lw $s4, ($s0) +/* EB1724 802408C4 26100004 */ addiu $s0, $s0, 4 +/* EB1728 802408C8 0220202D */ daddu $a0, $s1, $zero +/* EB172C 802408CC 0C0B53A3 */ jal func_802D4E8C +/* EB1730 802408D0 0280282D */ daddu $a1, $s4, $zero +/* EB1734 802408D4 0220202D */ daddu $a0, $s1, $zero +/* EB1738 802408D8 8E150000 */ lw $s5, ($s0) +/* EB173C 802408DC 4482B000 */ mtc1 $v0, $f22 +/* EB1740 802408E0 00000000 */ nop +/* EB1744 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 +/* EB1748 802408E8 0C0B53A3 */ jal func_802D4E8C +/* EB174C 802408EC 02A0282D */ daddu $a1, $s5, $zero +/* EB1750 802408F0 2404FFFC */ addiu $a0, $zero, -4 +/* EB1754 802408F4 44820000 */ mtc1 $v0, $f0 +/* EB1758 802408F8 00000000 */ nop +/* EB175C 802408FC 46800020 */ cvt.s.w $f0, $f0 +/* EB1760 80240900 0C00F92F */ jal func_8003E4BC +/* EB1764 80240904 E7A00014 */ swc1 $f0, 0x14($sp) +/* EB1768 80240908 3C048008 */ lui $a0, %hi(D_8007C760) +/* EB176C 8024090C 8C84C760 */ lw $a0, %lo(D_8007C760)($a0) +/* EB1770 80240910 3C014334 */ lui $at, 0x4334 +/* EB1774 80240914 44816000 */ mtc1 $at, $f12 +/* EB1778 80240918 00041880 */ sll $v1, $a0, 2 +/* EB177C 8024091C 00641821 */ addu $v1, $v1, $a0 +/* EB1780 80240920 00031880 */ sll $v1, $v1, 2 +/* EB1784 80240924 00641823 */ subu $v1, $v1, $a0 +/* EB1788 80240928 000320C0 */ sll $a0, $v1, 3 +/* EB178C 8024092C 00641821 */ addu $v1, $v1, $a0 +/* EB1790 80240930 000318C0 */ sll $v1, $v1, 3 +/* EB1794 80240934 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EB1798 80240938 00230821 */ addu $at, $at, $v1 +/* EB179C 8024093C C4208DEC */ lwc1 $f0, %lo(D_800B8DEC)($at) +/* EB17A0 80240940 460C0300 */ add.s $f12, $f0, $f12 +/* EB17A4 80240944 0C00AB85 */ jal func_8002AE14 +/* EB17A8 80240948 0040982D */ daddu $s3, $v0, $zero +/* EB17AC 8024094C 27B00010 */ addiu $s0, $sp, 0x10 +/* EB17B0 80240950 0200202D */ daddu $a0, $s0, $zero +/* EB17B4 80240954 27B20014 */ addiu $s2, $sp, 0x14 +/* EB17B8 80240958 0240282D */ daddu $a1, $s2, $zero +/* EB17BC 8024095C 3C064170 */ lui $a2, 0x4170 +/* EB17C0 80240960 8E67000C */ lw $a3, 0xc($s3) +/* EB17C4 80240964 0C00ACA3 */ jal func_8002B28C +/* EB17C8 80240968 46000506 */ mov.s $f20, $f0 +/* EB17CC 8024096C 0200202D */ daddu $a0, $s0, $zero +/* EB17D0 80240970 3C064120 */ lui $a2, 0x4120 +/* EB17D4 80240974 4407A000 */ mfc1 $a3, $f20 +/* EB17D8 80240978 0C00ACA3 */ jal func_8002B28C +/* EB17DC 8024097C 0240282D */ daddu $a1, $s2, $zero +/* EB17E0 80240980 0220202D */ daddu $a0, $s1, $zero +/* EB17E4 80240984 C7A00010 */ lwc1 $f0, 0x10($sp) +/* EB17E8 80240988 4600008D */ trunc.w.s $f2, $f0 +/* EB17EC 8024098C 44061000 */ mfc1 $a2, $f2 +/* EB17F0 80240990 0C0B551A */ jal func_802D5468 +/* EB17F4 80240994 02C0282D */ daddu $a1, $s6, $zero +/* EB17F8 80240998 0220202D */ daddu $a0, $s1, $zero +/* EB17FC 8024099C 4600B08D */ trunc.w.s $f2, $f22 +/* EB1800 802409A0 44061000 */ mfc1 $a2, $f2 +/* EB1804 802409A4 0C0B551A */ jal func_802D5468 +/* EB1808 802409A8 0280282D */ daddu $a1, $s4, $zero +/* EB180C 802409AC 0220202D */ daddu $a0, $s1, $zero +/* EB1810 802409B0 C7A00014 */ lwc1 $f0, 0x14($sp) +/* EB1814 802409B4 4600008D */ trunc.w.s $f2, $f0 +/* EB1818 802409B8 44061000 */ mfc1 $a2, $f2 +/* EB181C 802409BC 0C0B551A */ jal func_802D5468 +/* EB1820 802409C0 02A0282D */ daddu $a1, $s5, $zero +/* EB1824 802409C4 8FBF0034 */ lw $ra, 0x34($sp) +/* EB1828 802409C8 8FB60030 */ lw $s6, 0x30($sp) +/* EB182C 802409CC 8FB5002C */ lw $s5, 0x2c($sp) +/* EB1830 802409D0 8FB40028 */ lw $s4, 0x28($sp) +/* EB1834 802409D4 8FB30024 */ lw $s3, 0x24($sp) +/* EB1838 802409D8 8FB20020 */ lw $s2, 0x20($sp) +/* EB183C 802409DC 8FB1001C */ lw $s1, 0x1c($sp) +/* EB1840 802409E0 8FB00018 */ lw $s0, 0x18($sp) +/* EB1844 802409E4 D7B60040 */ ldc1 $f22, 0x40($sp) +/* EB1848 802409E8 D7B40038 */ ldc1 $f20, 0x38($sp) +/* EB184C 802409EC 24020002 */ addiu $v0, $zero, 2 +/* EB1850 802409F0 03E00008 */ jr $ra +/* EB1854 802409F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EB1170/func_802409F8_EB1858.s b/asm/nonmatchings/code_EB1170/func_802409F8_EB1858.s new file mode 100644 index 0000000000..016cc5d969 --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_802409F8_EB1858.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409F8_EB1858 +/* EB1858 802409F8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB185C 802409FC AFB00010 */ sw $s0, 0x10($sp) +/* EB1860 80240A00 0080802D */ daddu $s0, $a0, $zero +/* EB1864 80240A04 AFBF0014 */ sw $ra, 0x14($sp) +/* EB1868 80240A08 0C00F92F */ jal func_8003E4BC +/* EB186C 80240A0C 8E04008C */ lw $a0, 0x8c($s0) +/* EB1870 80240A10 0040282D */ daddu $a1, $v0, $zero +/* EB1874 80240A14 8E040094 */ lw $a0, 0x94($s0) +/* EB1878 80240A18 8CA30028 */ lw $v1, 0x28($a1) +/* EB187C 80240A1C ACA40028 */ sw $a0, 0x28($a1) +/* EB1880 80240A20 8FBF0014 */ lw $ra, 0x14($sp) +/* EB1884 80240A24 8FB00010 */ lw $s0, 0x10($sp) +/* EB1888 80240A28 24020002 */ addiu $v0, $zero, 2 +/* EB188C 80240A2C 3C018024 */ lui $at, %hi(D_80244494) +/* EB1890 80240A30 AC234494 */ sw $v1, %lo(D_80244494)($at) +/* EB1894 80240A34 03E00008 */ jr $ra +/* EB1898 80240A38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB1170/func_80240A3C_EB189C.s b/asm/nonmatchings/code_EB1170/func_80240A3C_EB189C.s new file mode 100644 index 0000000000..a1e25e015d --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_80240A3C_EB189C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A3C_EB189C +/* EB189C 80240A3C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB18A0 80240A40 AFBF0010 */ sw $ra, 0x10($sp) +/* EB18A4 80240A44 0C00F92F */ jal func_8003E4BC +/* EB18A8 80240A48 8C84008C */ lw $a0, 0x8c($a0) +/* EB18AC 80240A4C 3C038024 */ lui $v1, %hi(D_80244494) +/* EB18B0 80240A50 8C634494 */ lw $v1, %lo(D_80244494)($v1) +/* EB18B4 80240A54 AC430028 */ sw $v1, 0x28($v0) +/* EB18B8 80240A58 8FBF0010 */ lw $ra, 0x10($sp) +/* EB18BC 80240A5C 24020002 */ addiu $v0, $zero, 2 +/* EB18C0 80240A60 03E00008 */ jr $ra +/* EB18C4 80240A64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB1170/func_80240A68_EB18C8.s b/asm/nonmatchings/code_EB1170/func_80240A68_EB18C8.s new file mode 100644 index 0000000000..45974f736e --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_80240A68_EB18C8.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A68_EB18C8 +/* EB18C8 80240A68 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB18CC 80240A6C 0000202D */ daddu $a0, $zero, $zero +/* EB18D0 80240A70 AFBF0010 */ sw $ra, 0x10($sp) +/* EB18D4 80240A74 0C0166B2 */ jal func_80059AC8 +/* EB18D8 80240A78 24050001 */ addiu $a1, $zero, 1 +/* EB18DC 80240A7C 8FBF0010 */ lw $ra, 0x10($sp) +/* EB18E0 80240A80 24020002 */ addiu $v0, $zero, 2 +/* EB18E4 80240A84 03E00008 */ jr $ra +/* EB18E8 80240A88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB1170/func_80240A8C_EB18EC.s b/asm/nonmatchings/code_EB1170/func_80240A8C_EB18EC.s new file mode 100644 index 0000000000..209a6b9d78 --- /dev/null +++ b/asm/nonmatchings/code_EB1170/func_80240A8C_EB18EC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A8C_EB18EC +/* EB18EC 80240A8C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB18F0 80240A90 AFBF0010 */ sw $ra, 0x10($sp) +/* EB18F4 80240A94 8C82000C */ lw $v0, 0xc($a0) +/* EB18F8 80240A98 3C068017 */ lui $a2, %hi(D_80169B12) +/* EB18FC 80240A9C 84C69B12 */ lh $a2, %lo(D_80169B12)($a2) +/* EB1900 80240AA0 0C0B551A */ jal func_802D5468 +/* EB1904 80240AA4 8C450000 */ lw $a1, ($v0) +/* EB1908 80240AA8 8FBF0010 */ lw $ra, 0x10($sp) +/* EB190C 80240AAC 24020002 */ addiu $v0, $zero, 2 +/* EB1910 80240AB0 03E00008 */ jr $ra +/* EB1914 80240AB4 27BD0018 */ addiu $sp, $sp, 0x18 +/* EB1918 80240AB8 00000000 */ nop +/* EB191C 80240ABC 00000000 */ nop diff --git a/asm/nonmatchings/code_EB5130/func_80240000_EB5130.s b/asm/nonmatchings/code_EB5130/func_80240000_EB5130.s new file mode 100644 index 0000000000..56566d2aeb --- /dev/null +++ b/asm/nonmatchings/code_EB5130/func_80240000_EB5130.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EB5130 +/* EB5130 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB5134 80240004 AFB00010 */ sw $s0, 0x10($sp) +/* EB5138 80240008 0080802D */ daddu $s0, $a0, $zero +/* EB513C 8024000C AFBF0014 */ sw $ra, 0x14($sp) +/* EB5140 80240010 8E0300A8 */ lw $v1, 0xa8($s0) +/* EB5144 80240014 8E020088 */ lw $v0, 0x88($s0) +/* EB5148 80240018 00621821 */ addu $v1, $v1, $v0 +/* EB514C 8024001C 04610004 */ bgez $v1, .L80240030 +/* EB5150 80240020 AE0300A8 */ sw $v1, 0xa8($s0) +/* EB5154 80240024 3C020002 */ lui $v0, 2 +/* EB5158 80240028 08090010 */ j .L80240040 +/* EB515C 8024002C 00621021 */ addu $v0, $v1, $v0 +.L80240030: +/* EB5160 80240030 3C040002 */ lui $a0, 2 +/* EB5164 80240034 0083102A */ slt $v0, $a0, $v1 +/* EB5168 80240038 10400002 */ beqz $v0, .L80240044 +/* EB516C 8024003C 00641023 */ subu $v0, $v1, $a0 +.L80240040: +/* EB5170 80240040 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240044: +/* EB5174 80240044 8E0300AC */ lw $v1, 0xac($s0) +/* EB5178 80240048 8E02008C */ lw $v0, 0x8c($s0) +/* EB517C 8024004C 00621821 */ addu $v1, $v1, $v0 +/* EB5180 80240050 04610004 */ bgez $v1, .L80240064 +/* EB5184 80240054 AE0300AC */ sw $v1, 0xac($s0) +/* EB5188 80240058 3C020002 */ lui $v0, 2 +/* EB518C 8024005C 0809001D */ j .L80240074 +/* EB5190 80240060 00621021 */ addu $v0, $v1, $v0 +.L80240064: +/* EB5194 80240064 3C040002 */ lui $a0, 2 +/* EB5198 80240068 0083102A */ slt $v0, $a0, $v1 +/* EB519C 8024006C 10400002 */ beqz $v0, .L80240078 +/* EB51A0 80240070 00641023 */ subu $v0, $v1, $a0 +.L80240074: +/* EB51A4 80240074 AE0200AC */ sw $v0, 0xac($s0) +.L80240078: +/* EB51A8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) +/* EB51AC 8024007C 8E020090 */ lw $v0, 0x90($s0) +/* EB51B0 80240080 00621821 */ addu $v1, $v1, $v0 +/* EB51B4 80240084 04610004 */ bgez $v1, .L80240098 +/* EB51B8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) +/* EB51BC 8024008C 3C020002 */ lui $v0, 2 +/* EB51C0 80240090 0809002A */ j .L802400A8 +/* EB51C4 80240094 00621021 */ addu $v0, $v1, $v0 +.L80240098: +/* EB51C8 80240098 3C040002 */ lui $a0, 2 +/* EB51CC 8024009C 0083102A */ slt $v0, $a0, $v1 +/* EB51D0 802400A0 10400002 */ beqz $v0, .L802400AC +/* EB51D4 802400A4 00641023 */ subu $v0, $v1, $a0 +.L802400A8: +/* EB51D8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802400AC: +/* EB51DC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) +/* EB51E0 802400B0 8E020094 */ lw $v0, 0x94($s0) +/* EB51E4 802400B4 00621821 */ addu $v1, $v1, $v0 +/* EB51E8 802400B8 04610004 */ bgez $v1, .L802400CC +/* EB51EC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) +/* EB51F0 802400C0 3C020002 */ lui $v0, 2 +/* EB51F4 802400C4 08090037 */ j .L802400DC +/* EB51F8 802400C8 00621021 */ addu $v0, $v1, $v0 +.L802400CC: +/* EB51FC 802400CC 3C040002 */ lui $a0, 2 +/* EB5200 802400D0 0083102A */ slt $v0, $a0, $v1 +/* EB5204 802400D4 10400002 */ beqz $v0, .L802400E0 +/* EB5208 802400D8 00641023 */ subu $v0, $v1, $a0 +.L802400DC: +/* EB520C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) +.L802400E0: +/* EB5210 802400E0 8E040084 */ lw $a0, 0x84($s0) +/* EB5214 802400E4 0C049819 */ jal func_80126064 +/* EB5218 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) +/* EB521C 802400EC 8E040084 */ lw $a0, 0x84($s0) +/* EB5220 802400F0 0C04981F */ jal func_8012607C +/* EB5224 802400F4 8E0500AC */ lw $a1, 0xac($s0) +/* EB5228 802400F8 8E040084 */ lw $a0, 0x84($s0) +/* EB522C 802400FC 0C049825 */ jal func_80126094 +/* EB5230 80240100 8E0500B0 */ lw $a1, 0xb0($s0) +/* EB5234 80240104 8E040084 */ lw $a0, 0x84($s0) +/* EB5238 80240108 0C04982B */ jal func_801260AC +/* EB523C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) +/* EB5240 80240110 8FBF0014 */ lw $ra, 0x14($sp) +/* EB5244 80240114 8FB00010 */ lw $s0, 0x10($sp) +/* EB5248 80240118 0000102D */ daddu $v0, $zero, $zero +/* EB524C 8024011C 03E00008 */ jr $ra +/* EB5250 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB5130/func_80240124_EB5254.s b/asm/nonmatchings/code_EB5130/func_80240124_EB5254.s new file mode 100644 index 0000000000..f44e380db0 --- /dev/null +++ b/asm/nonmatchings/code_EB5130/func_80240124_EB5254.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240124_EB5254 +/* EB5254 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB5258 80240128 AFB00010 */ sw $s0, 0x10($sp) +/* EB525C 8024012C 0080802D */ daddu $s0, $a0, $zero +/* EB5260 80240130 10A00005 */ beqz $a1, .L80240148 +/* EB5264 80240134 AFBF0014 */ sw $ra, 0x14($sp) +/* EB5268 80240138 AE000070 */ sw $zero, 0x70($s0) +/* EB526C 8024013C AE000074 */ sw $zero, 0x74($s0) +/* EB5270 80240140 AE000078 */ sw $zero, 0x78($s0) +/* EB5274 80240144 AE00007C */ sw $zero, 0x7c($s0) +.L80240148: +/* EB5278 80240148 8E020070 */ lw $v0, 0x70($s0) +/* EB527C 8024014C 1440000E */ bnez $v0, .L80240188 +/* EB5280 80240150 00000000 */ nop +/* EB5284 80240154 8E0300A8 */ lw $v1, 0xa8($s0) +/* EB5288 80240158 8E020088 */ lw $v0, 0x88($s0) +/* EB528C 8024015C 00621821 */ addu $v1, $v1, $v0 +/* EB5290 80240160 04610004 */ bgez $v1, .L80240174 +/* EB5294 80240164 AE0300A8 */ sw $v1, 0xa8($s0) +/* EB5298 80240168 3C020002 */ lui $v0, 2 +/* EB529C 8024016C 08090061 */ j .L80240184 +/* EB52A0 80240170 00621021 */ addu $v0, $v1, $v0 +.L80240174: +/* EB52A4 80240174 3C040002 */ lui $a0, 2 +/* EB52A8 80240178 0083102A */ slt $v0, $a0, $v1 +/* EB52AC 8024017C 10400002 */ beqz $v0, .L80240188 +/* EB52B0 80240180 00641023 */ subu $v0, $v1, $a0 +.L80240184: +/* EB52B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240188: +/* EB52B8 80240188 8E020074 */ lw $v0, 0x74($s0) +/* EB52BC 8024018C 1440000E */ bnez $v0, .L802401C8 +/* EB52C0 80240190 00000000 */ nop +/* EB52C4 80240194 8E0300AC */ lw $v1, 0xac($s0) +/* EB52C8 80240198 8E02008C */ lw $v0, 0x8c($s0) +/* EB52CC 8024019C 00621821 */ addu $v1, $v1, $v0 +/* EB52D0 802401A0 04610004 */ bgez $v1, .L802401B4 +/* EB52D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) +/* EB52D8 802401A8 3C020002 */ lui $v0, 2 +/* EB52DC 802401AC 08090071 */ j .L802401C4 +/* EB52E0 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* EB52E4 802401B4 3C040002 */ lui $a0, 2 +/* EB52E8 802401B8 0083102A */ slt $v0, $a0, $v1 +/* EB52EC 802401BC 10400002 */ beqz $v0, .L802401C8 +/* EB52F0 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* EB52F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) +.L802401C8: +/* EB52F8 802401C8 8E020078 */ lw $v0, 0x78($s0) +/* EB52FC 802401CC 1440000E */ bnez $v0, .L80240208 +/* EB5300 802401D0 00000000 */ nop +/* EB5304 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) +/* EB5308 802401D8 8E020090 */ lw $v0, 0x90($s0) +/* EB530C 802401DC 00621821 */ addu $v1, $v1, $v0 +/* EB5310 802401E0 04610004 */ bgez $v1, .L802401F4 +/* EB5314 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) +/* EB5318 802401E8 3C020002 */ lui $v0, 2 +/* EB531C 802401EC 08090081 */ j .L80240204 +/* EB5320 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* EB5324 802401F4 3C040002 */ lui $a0, 2 +/* EB5328 802401F8 0083102A */ slt $v0, $a0, $v1 +/* EB532C 802401FC 10400002 */ beqz $v0, .L80240208 +/* EB5330 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* EB5334 80240204 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240208: +/* EB5338 80240208 8E02007C */ lw $v0, 0x7c($s0) +/* EB533C 8024020C 1440000E */ bnez $v0, .L80240248 +/* EB5340 80240210 00000000 */ nop +/* EB5344 80240214 8E0300B4 */ lw $v1, 0xb4($s0) +/* EB5348 80240218 8E020094 */ lw $v0, 0x94($s0) +/* EB534C 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EB5350 80240220 04610004 */ bgez $v1, .L80240234 +/* EB5354 80240224 AE0300B4 */ sw $v1, 0xb4($s0) +/* EB5358 80240228 3C020002 */ lui $v0, 2 +/* EB535C 8024022C 08090091 */ j .L80240244 +/* EB5360 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* EB5364 80240234 3C040002 */ lui $a0, 2 +/* EB5368 80240238 0083102A */ slt $v0, $a0, $v1 +/* EB536C 8024023C 10400002 */ beqz $v0, .L80240248 +/* EB5370 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* EB5374 80240244 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240248: +/* EB5378 80240248 8E040084 */ lw $a0, 0x84($s0) +/* EB537C 8024024C 0C049819 */ jal func_80126064 +/* EB5380 80240250 8E0500A8 */ lw $a1, 0xa8($s0) +/* EB5384 80240254 8E040084 */ lw $a0, 0x84($s0) +/* EB5388 80240258 0C04981F */ jal func_8012607C +/* EB538C 8024025C 8E0500AC */ lw $a1, 0xac($s0) +/* EB5390 80240260 8E040084 */ lw $a0, 0x84($s0) +/* EB5394 80240264 0C049825 */ jal func_80126094 +/* EB5398 80240268 8E0500B0 */ lw $a1, 0xb0($s0) +/* EB539C 8024026C 8E040084 */ lw $a0, 0x84($s0) +/* EB53A0 80240270 0C04982B */ jal func_801260AC +/* EB53A4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) +/* EB53A8 80240278 8E020070 */ lw $v0, 0x70($s0) +/* EB53AC 8024027C 8E030078 */ lw $v1, 0x78($s0) +/* EB53B0 80240280 8E040098 */ lw $a0, 0x98($s0) +/* EB53B4 80240284 24420001 */ addiu $v0, $v0, 1 +/* EB53B8 80240288 AE020070 */ sw $v0, 0x70($s0) +/* EB53BC 8024028C 8E020074 */ lw $v0, 0x74($s0) +/* EB53C0 80240290 24630001 */ addiu $v1, $v1, 1 +/* EB53C4 80240294 AE030078 */ sw $v1, 0x78($s0) +/* EB53C8 80240298 8E030070 */ lw $v1, 0x70($s0) +/* EB53CC 8024029C 24420001 */ addiu $v0, $v0, 1 +/* EB53D0 802402A0 AE020074 */ sw $v0, 0x74($s0) +/* EB53D4 802402A4 8E02007C */ lw $v0, 0x7c($s0) +/* EB53D8 802402A8 0064182A */ slt $v1, $v1, $a0 +/* EB53DC 802402AC 24420001 */ addiu $v0, $v0, 1 +/* EB53E0 802402B0 14600002 */ bnez $v1, .L802402BC +/* EB53E4 802402B4 AE02007C */ sw $v0, 0x7c($s0) +/* EB53E8 802402B8 AE000070 */ sw $zero, 0x70($s0) +.L802402BC: +/* EB53EC 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* EB53F0 802402C0 8E03009C */ lw $v1, 0x9c($s0) +/* EB53F4 802402C4 0043102A */ slt $v0, $v0, $v1 +/* EB53F8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 +/* EB53FC 802402CC AE000074 */ sw $zero, 0x74($s0) +.L802402D0: +/* EB5400 802402D0 8E020078 */ lw $v0, 0x78($s0) +/* EB5404 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) +/* EB5408 802402D8 0043102A */ slt $v0, $v0, $v1 +/* EB540C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* EB5410 802402E0 AE000078 */ sw $zero, 0x78($s0) +.L802402E4: +/* EB5414 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* EB5418 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) +/* EB541C 802402EC 0043102A */ slt $v0, $v0, $v1 +/* EB5420 802402F0 50400001 */ beql $v0, $zero, .L802402F8 +/* EB5424 802402F4 AE00007C */ sw $zero, 0x7c($s0) +.L802402F8: +/* EB5428 802402F8 8FBF0014 */ lw $ra, 0x14($sp) +/* EB542C 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* EB5430 80240300 0000102D */ daddu $v0, $zero, $zero +/* EB5434 80240304 03E00008 */ jr $ra +/* EB5438 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB5130/func_8024030C_EB543C.s b/asm/nonmatchings/code_EB5130/func_8024030C_EB543C.s new file mode 100644 index 0000000000..3a5e7dafca --- /dev/null +++ b/asm/nonmatchings/code_EB5130/func_8024030C_EB543C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024030C_EB543C +/* EB543C 8024030C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB5440 80240310 AFBF0010 */ sw $ra, 0x10($sp) +/* EB5444 80240314 8C82000C */ lw $v0, 0xc($a0) +/* EB5448 80240318 3C068017 */ lui $a2, %hi(D_80169B12) +/* EB544C 8024031C 84C69B12 */ lh $a2, %lo(D_80169B12)($a2) +/* EB5450 80240320 0C0B551A */ jal func_802D5468 +/* EB5454 80240324 8C450000 */ lw $a1, ($v0) +/* EB5458 80240328 8FBF0010 */ lw $ra, 0x10($sp) +/* EB545C 8024032C 24020002 */ addiu $v0, $zero, 2 +/* EB5460 80240330 03E00008 */ jr $ra +/* EB5464 80240334 27BD0018 */ addiu $sp, $sp, 0x18 +/* EB5468 80240338 00000000 */ nop +/* EB546C 8024033C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB5470/func_80240340_EB5470.s b/asm/nonmatchings/code_EB5470/func_80240340_EB5470.s new file mode 100644 index 0000000000..e61d007737 --- /dev/null +++ b/asm/nonmatchings/code_EB5470/func_80240340_EB5470.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240340_EB5470 +/* EB5470 80240340 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB5474 80240344 AFBF0010 */ sw $ra, 0x10($sp) +/* EB5478 80240348 8C82000C */ lw $v0, 0xc($a0) +/* EB547C 8024034C 3C068017 */ lui $a2, %hi(D_80169B12) +/* EB5480 80240350 84C69B12 */ lh $a2, %lo(D_80169B12)($a2) +/* EB5484 80240354 0C0B551A */ jal func_802D5468 +/* EB5488 80240358 8C450000 */ lw $a1, ($v0) +/* EB548C 8024035C 8FBF0010 */ lw $ra, 0x10($sp) +/* EB5490 80240360 24020002 */ addiu $v0, $zero, 2 +/* EB5494 80240364 03E00008 */ jr $ra +/* EB5498 80240368 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB5470/func_8024036C_EB549C.s b/asm/nonmatchings/code_EB5470/func_8024036C_EB549C.s new file mode 100644 index 0000000000..bab5464c5f --- /dev/null +++ b/asm/nonmatchings/code_EB5470/func_8024036C_EB549C.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024036C_EB549C +/* EB549C 8024036C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB54A0 80240370 0000202D */ daddu $a0, $zero, $zero +/* EB54A4 80240374 AFBF0010 */ sw $ra, 0x10($sp) +/* EB54A8 80240378 0C0166B2 */ jal func_80059AC8 +/* EB54AC 8024037C 24050001 */ addiu $a1, $zero, 1 +/* EB54B0 80240380 8FBF0010 */ lw $ra, 0x10($sp) +/* EB54B4 80240384 24020002 */ addiu $v0, $zero, 2 +/* EB54B8 80240388 03E00008 */ jr $ra +/* EB54BC 8024038C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB7230/func_80240000_EB7230.s b/asm/nonmatchings/code_EB7230/func_80240000_EB7230.s new file mode 100644 index 0000000000..9c67687457 --- /dev/null +++ b/asm/nonmatchings/code_EB7230/func_80240000_EB7230.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EB7230 +/* EB7230 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB7234 80240004 AFB00010 */ sw $s0, 0x10($sp) +/* EB7238 80240008 0080802D */ daddu $s0, $a0, $zero +/* EB723C 8024000C AFBF0014 */ sw $ra, 0x14($sp) +/* EB7240 80240010 8E0300A8 */ lw $v1, 0xa8($s0) +/* EB7244 80240014 8E020088 */ lw $v0, 0x88($s0) +/* EB7248 80240018 00621821 */ addu $v1, $v1, $v0 +/* EB724C 8024001C 04610004 */ bgez $v1, .L80240030 +/* EB7250 80240020 AE0300A8 */ sw $v1, 0xa8($s0) +/* EB7254 80240024 3C020002 */ lui $v0, 2 +/* EB7258 80240028 08090010 */ j .L80240040 +/* EB725C 8024002C 00621021 */ addu $v0, $v1, $v0 +.L80240030: +/* EB7260 80240030 3C040002 */ lui $a0, 2 +/* EB7264 80240034 0083102A */ slt $v0, $a0, $v1 +/* EB7268 80240038 10400002 */ beqz $v0, .L80240044 +/* EB726C 8024003C 00641023 */ subu $v0, $v1, $a0 +.L80240040: +/* EB7270 80240040 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240044: +/* EB7274 80240044 8E0300AC */ lw $v1, 0xac($s0) +/* EB7278 80240048 8E02008C */ lw $v0, 0x8c($s0) +/* EB727C 8024004C 00621821 */ addu $v1, $v1, $v0 +/* EB7280 80240050 04610004 */ bgez $v1, .L80240064 +/* EB7284 80240054 AE0300AC */ sw $v1, 0xac($s0) +/* EB7288 80240058 3C020002 */ lui $v0, 2 +/* EB728C 8024005C 0809001D */ j .L80240074 +/* EB7290 80240060 00621021 */ addu $v0, $v1, $v0 +.L80240064: +/* EB7294 80240064 3C040002 */ lui $a0, 2 +/* EB7298 80240068 0083102A */ slt $v0, $a0, $v1 +/* EB729C 8024006C 10400002 */ beqz $v0, .L80240078 +/* EB72A0 80240070 00641023 */ subu $v0, $v1, $a0 +.L80240074: +/* EB72A4 80240074 AE0200AC */ sw $v0, 0xac($s0) +.L80240078: +/* EB72A8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) +/* EB72AC 8024007C 8E020090 */ lw $v0, 0x90($s0) +/* EB72B0 80240080 00621821 */ addu $v1, $v1, $v0 +/* EB72B4 80240084 04610004 */ bgez $v1, .L80240098 +/* EB72B8 80240088 AE0300B0 */ sw $v1, 0xb0($s0) +/* EB72BC 8024008C 3C020002 */ lui $v0, 2 +/* EB72C0 80240090 0809002A */ j .L802400A8 +/* EB72C4 80240094 00621021 */ addu $v0, $v1, $v0 +.L80240098: +/* EB72C8 80240098 3C040002 */ lui $a0, 2 +/* EB72CC 8024009C 0083102A */ slt $v0, $a0, $v1 +/* EB72D0 802400A0 10400002 */ beqz $v0, .L802400AC +/* EB72D4 802400A4 00641023 */ subu $v0, $v1, $a0 +.L802400A8: +/* EB72D8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802400AC: +/* EB72DC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) +/* EB72E0 802400B0 8E020094 */ lw $v0, 0x94($s0) +/* EB72E4 802400B4 00621821 */ addu $v1, $v1, $v0 +/* EB72E8 802400B8 04610004 */ bgez $v1, .L802400CC +/* EB72EC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) +/* EB72F0 802400C0 3C020002 */ lui $v0, 2 +/* EB72F4 802400C4 08090037 */ j .L802400DC +/* EB72F8 802400C8 00621021 */ addu $v0, $v1, $v0 +.L802400CC: +/* EB72FC 802400CC 3C040002 */ lui $a0, 2 +/* EB7300 802400D0 0083102A */ slt $v0, $a0, $v1 +/* EB7304 802400D4 10400002 */ beqz $v0, .L802400E0 +/* EB7308 802400D8 00641023 */ subu $v0, $v1, $a0 +.L802400DC: +/* EB730C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) +.L802400E0: +/* EB7310 802400E0 8E040084 */ lw $a0, 0x84($s0) +/* EB7314 802400E4 0C049819 */ jal func_80126064 +/* EB7318 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) +/* EB731C 802400EC 8E040084 */ lw $a0, 0x84($s0) +/* EB7320 802400F0 0C04981F */ jal func_8012607C +/* EB7324 802400F4 8E0500AC */ lw $a1, 0xac($s0) +/* EB7328 802400F8 8E040084 */ lw $a0, 0x84($s0) +/* EB732C 802400FC 0C049825 */ jal func_80126094 +/* EB7330 80240100 8E0500B0 */ lw $a1, 0xb0($s0) +/* EB7334 80240104 8E040084 */ lw $a0, 0x84($s0) +/* EB7338 80240108 0C04982B */ jal func_801260AC +/* EB733C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) +/* EB7340 80240110 8FBF0014 */ lw $ra, 0x14($sp) +/* EB7344 80240114 8FB00010 */ lw $s0, 0x10($sp) +/* EB7348 80240118 0000102D */ daddu $v0, $zero, $zero +/* EB734C 8024011C 03E00008 */ jr $ra +/* EB7350 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB7230/func_80240124_EB7354.s b/asm/nonmatchings/code_EB7230/func_80240124_EB7354.s new file mode 100644 index 0000000000..c43776a2b6 --- /dev/null +++ b/asm/nonmatchings/code_EB7230/func_80240124_EB7354.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240124_EB7354 +/* EB7354 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB7358 80240128 AFB00010 */ sw $s0, 0x10($sp) +/* EB735C 8024012C 0080802D */ daddu $s0, $a0, $zero +/* EB7360 80240130 10A00005 */ beqz $a1, .L80240148 +/* EB7364 80240134 AFBF0014 */ sw $ra, 0x14($sp) +/* EB7368 80240138 AE000070 */ sw $zero, 0x70($s0) +/* EB736C 8024013C AE000074 */ sw $zero, 0x74($s0) +/* EB7370 80240140 AE000078 */ sw $zero, 0x78($s0) +/* EB7374 80240144 AE00007C */ sw $zero, 0x7c($s0) +.L80240148: +/* EB7378 80240148 8E020070 */ lw $v0, 0x70($s0) +/* EB737C 8024014C 1440000E */ bnez $v0, .L80240188 +/* EB7380 80240150 00000000 */ nop +/* EB7384 80240154 8E0300A8 */ lw $v1, 0xa8($s0) +/* EB7388 80240158 8E020088 */ lw $v0, 0x88($s0) +/* EB738C 8024015C 00621821 */ addu $v1, $v1, $v0 +/* EB7390 80240160 04610004 */ bgez $v1, .L80240174 +/* EB7394 80240164 AE0300A8 */ sw $v1, 0xa8($s0) +/* EB7398 80240168 3C020002 */ lui $v0, 2 +/* EB739C 8024016C 08090061 */ j .L80240184 +/* EB73A0 80240170 00621021 */ addu $v0, $v1, $v0 +.L80240174: +/* EB73A4 80240174 3C040002 */ lui $a0, 2 +/* EB73A8 80240178 0083102A */ slt $v0, $a0, $v1 +/* EB73AC 8024017C 10400002 */ beqz $v0, .L80240188 +/* EB73B0 80240180 00641023 */ subu $v0, $v1, $a0 +.L80240184: +/* EB73B4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240188: +/* EB73B8 80240188 8E020074 */ lw $v0, 0x74($s0) +/* EB73BC 8024018C 1440000E */ bnez $v0, .L802401C8 +/* EB73C0 80240190 00000000 */ nop +/* EB73C4 80240194 8E0300AC */ lw $v1, 0xac($s0) +/* EB73C8 80240198 8E02008C */ lw $v0, 0x8c($s0) +/* EB73CC 8024019C 00621821 */ addu $v1, $v1, $v0 +/* EB73D0 802401A0 04610004 */ bgez $v1, .L802401B4 +/* EB73D4 802401A4 AE0300AC */ sw $v1, 0xac($s0) +/* EB73D8 802401A8 3C020002 */ lui $v0, 2 +/* EB73DC 802401AC 08090071 */ j .L802401C4 +/* EB73E0 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* EB73E4 802401B4 3C040002 */ lui $a0, 2 +/* EB73E8 802401B8 0083102A */ slt $v0, $a0, $v1 +/* EB73EC 802401BC 10400002 */ beqz $v0, .L802401C8 +/* EB73F0 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* EB73F4 802401C4 AE0200AC */ sw $v0, 0xac($s0) +.L802401C8: +/* EB73F8 802401C8 8E020078 */ lw $v0, 0x78($s0) +/* EB73FC 802401CC 1440000E */ bnez $v0, .L80240208 +/* EB7400 802401D0 00000000 */ nop +/* EB7404 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) +/* EB7408 802401D8 8E020090 */ lw $v0, 0x90($s0) +/* EB740C 802401DC 00621821 */ addu $v1, $v1, $v0 +/* EB7410 802401E0 04610004 */ bgez $v1, .L802401F4 +/* EB7414 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) +/* EB7418 802401E8 3C020002 */ lui $v0, 2 +/* EB741C 802401EC 08090081 */ j .L80240204 +/* EB7420 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* EB7424 802401F4 3C040002 */ lui $a0, 2 +/* EB7428 802401F8 0083102A */ slt $v0, $a0, $v1 +/* EB742C 802401FC 10400002 */ beqz $v0, .L80240208 +/* EB7430 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* EB7434 80240204 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240208: +/* EB7438 80240208 8E02007C */ lw $v0, 0x7c($s0) +/* EB743C 8024020C 1440000E */ bnez $v0, .L80240248 +/* EB7440 80240210 00000000 */ nop +/* EB7444 80240214 8E0300B4 */ lw $v1, 0xb4($s0) +/* EB7448 80240218 8E020094 */ lw $v0, 0x94($s0) +/* EB744C 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EB7450 80240220 04610004 */ bgez $v1, .L80240234 +/* EB7454 80240224 AE0300B4 */ sw $v1, 0xb4($s0) +/* EB7458 80240228 3C020002 */ lui $v0, 2 +/* EB745C 8024022C 08090091 */ j .L80240244 +/* EB7460 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* EB7464 80240234 3C040002 */ lui $a0, 2 +/* EB7468 80240238 0083102A */ slt $v0, $a0, $v1 +/* EB746C 8024023C 10400002 */ beqz $v0, .L80240248 +/* EB7470 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* EB7474 80240244 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240248: +/* EB7478 80240248 8E040084 */ lw $a0, 0x84($s0) +/* EB747C 8024024C 0C049819 */ jal func_80126064 +/* EB7480 80240250 8E0500A8 */ lw $a1, 0xa8($s0) +/* EB7484 80240254 8E040084 */ lw $a0, 0x84($s0) +/* EB7488 80240258 0C04981F */ jal func_8012607C +/* EB748C 8024025C 8E0500AC */ lw $a1, 0xac($s0) +/* EB7490 80240260 8E040084 */ lw $a0, 0x84($s0) +/* EB7494 80240264 0C049825 */ jal func_80126094 +/* EB7498 80240268 8E0500B0 */ lw $a1, 0xb0($s0) +/* EB749C 8024026C 8E040084 */ lw $a0, 0x84($s0) +/* EB74A0 80240270 0C04982B */ jal func_801260AC +/* EB74A4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) +/* EB74A8 80240278 8E020070 */ lw $v0, 0x70($s0) +/* EB74AC 8024027C 8E030078 */ lw $v1, 0x78($s0) +/* EB74B0 80240280 8E040098 */ lw $a0, 0x98($s0) +/* EB74B4 80240284 24420001 */ addiu $v0, $v0, 1 +/* EB74B8 80240288 AE020070 */ sw $v0, 0x70($s0) +/* EB74BC 8024028C 8E020074 */ lw $v0, 0x74($s0) +/* EB74C0 80240290 24630001 */ addiu $v1, $v1, 1 +/* EB74C4 80240294 AE030078 */ sw $v1, 0x78($s0) +/* EB74C8 80240298 8E030070 */ lw $v1, 0x70($s0) +/* EB74CC 8024029C 24420001 */ addiu $v0, $v0, 1 +/* EB74D0 802402A0 AE020074 */ sw $v0, 0x74($s0) +/* EB74D4 802402A4 8E02007C */ lw $v0, 0x7c($s0) +/* EB74D8 802402A8 0064182A */ slt $v1, $v1, $a0 +/* EB74DC 802402AC 24420001 */ addiu $v0, $v0, 1 +/* EB74E0 802402B0 14600002 */ bnez $v1, .L802402BC +/* EB74E4 802402B4 AE02007C */ sw $v0, 0x7c($s0) +/* EB74E8 802402B8 AE000070 */ sw $zero, 0x70($s0) +.L802402BC: +/* EB74EC 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* EB74F0 802402C0 8E03009C */ lw $v1, 0x9c($s0) +/* EB74F4 802402C4 0043102A */ slt $v0, $v0, $v1 +/* EB74F8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 +/* EB74FC 802402CC AE000074 */ sw $zero, 0x74($s0) +.L802402D0: +/* EB7500 802402D0 8E020078 */ lw $v0, 0x78($s0) +/* EB7504 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) +/* EB7508 802402D8 0043102A */ slt $v0, $v0, $v1 +/* EB750C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* EB7510 802402E0 AE000078 */ sw $zero, 0x78($s0) +.L802402E4: +/* EB7514 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* EB7518 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) +/* EB751C 802402EC 0043102A */ slt $v0, $v0, $v1 +/* EB7520 802402F0 50400001 */ beql $v0, $zero, .L802402F8 +/* EB7524 802402F4 AE00007C */ sw $zero, 0x7c($s0) +.L802402F8: +/* EB7528 802402F8 8FBF0014 */ lw $ra, 0x14($sp) +/* EB752C 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* EB7530 80240300 0000102D */ daddu $v0, $zero, $zero +/* EB7534 80240304 03E00008 */ jr $ra +/* EB7538 80240308 27BD0018 */ addiu $sp, $sp, 0x18 +/* EB753C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB7540/func_80240310_EB7540.s b/asm/nonmatchings/code_EB7540/func_80240310_EB7540.s new file mode 100644 index 0000000000..eb2e819d94 --- /dev/null +++ b/asm/nonmatchings/code_EB7540/func_80240310_EB7540.s @@ -0,0 +1,54 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240310_EB7540 +/* EB7540 80240310 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EB7544 80240314 AFB10014 */ sw $s1, 0x14($sp) +/* EB7548 80240318 0080882D */ daddu $s1, $a0, $zero +/* EB754C 8024031C AFBF001C */ sw $ra, 0x1c($sp) +/* EB7550 80240320 AFB20018 */ sw $s2, 0x18($sp) +/* EB7554 80240324 AFB00010 */ sw $s0, 0x10($sp) +/* EB7558 80240328 F7B80030 */ sdc1 $f24, 0x30($sp) +/* EB755C 8024032C F7B60028 */ sdc1 $f22, 0x28($sp) +/* EB7560 80240330 F7B40020 */ sdc1 $f20, 0x20($sp) +/* EB7564 80240334 8E30000C */ lw $s0, 0xc($s1) +/* EB7568 80240338 8E050000 */ lw $a1, ($s0) +/* EB756C 8024033C 0C0B53A3 */ jal func_802D4E8C +/* EB7570 80240340 26100004 */ addiu $s0, $s0, 4 +/* EB7574 80240344 8E050000 */ lw $a1, ($s0) +/* EB7578 80240348 26100004 */ addiu $s0, $s0, 4 +/* EB757C 8024034C 0220202D */ daddu $a0, $s1, $zero +/* EB7580 80240350 0C0B53A3 */ jal func_802D4E8C +/* EB7584 80240354 0040902D */ daddu $s2, $v0, $zero +/* EB7588 80240358 8E050000 */ lw $a1, ($s0) +/* EB758C 8024035C 26100004 */ addiu $s0, $s0, 4 +/* EB7590 80240360 4482C000 */ mtc1 $v0, $f24 +/* EB7594 80240364 00000000 */ nop +/* EB7598 80240368 4680C620 */ cvt.s.w $f24, $f24 +/* EB759C 8024036C 0C0B53A3 */ jal func_802D4E8C +/* EB75A0 80240370 0220202D */ daddu $a0, $s1, $zero +/* EB75A4 80240374 8E050000 */ lw $a1, ($s0) +/* EB75A8 80240378 4482B000 */ mtc1 $v0, $f22 +/* EB75AC 8024037C 00000000 */ nop +/* EB75B0 80240380 4680B5A0 */ cvt.s.w $f22, $f22 +/* EB75B4 80240384 0C0B53A3 */ jal func_802D4E8C +/* EB75B8 80240388 0220202D */ daddu $a0, $s1, $zero +/* EB75BC 8024038C 4482A000 */ mtc1 $v0, $f20 +/* EB75C0 80240390 00000000 */ nop +/* EB75C4 80240394 4680A520 */ cvt.s.w $f20, $f20 +/* EB75C8 80240398 0C0462EC */ jal func_80118BB0 +/* EB75CC 8024039C 0240202D */ daddu $a0, $s2, $zero +/* EB75D0 802403A0 0040182D */ daddu $v1, $v0, $zero +/* EB75D4 802403A4 E4780048 */ swc1 $f24, 0x48($v1) +/* EB75D8 802403A8 E476004C */ swc1 $f22, 0x4c($v1) +/* EB75DC 802403AC E4740050 */ swc1 $f20, 0x50($v1) +/* EB75E0 802403B0 8FBF001C */ lw $ra, 0x1c($sp) +/* EB75E4 802403B4 8FB20018 */ lw $s2, 0x18($sp) +/* EB75E8 802403B8 8FB10014 */ lw $s1, 0x14($sp) +/* EB75EC 802403BC 8FB00010 */ lw $s0, 0x10($sp) +/* EB75F0 802403C0 D7B80030 */ ldc1 $f24, 0x30($sp) +/* EB75F4 802403C4 D7B60028 */ ldc1 $f22, 0x28($sp) +/* EB75F8 802403C8 D7B40020 */ ldc1 $f20, 0x20($sp) +/* EB75FC 802403CC 24020002 */ addiu $v0, $zero, 2 +/* EB7600 802403D0 03E00008 */ jr $ra +/* EB7604 802403D4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EB7540/func_802403D8_EB7608.s b/asm/nonmatchings/code_EB7540/func_802403D8_EB7608.s new file mode 100644 index 0000000000..df9c3ea302 --- /dev/null +++ b/asm/nonmatchings/code_EB7540/func_802403D8_EB7608.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403D8_EB7608 +/* EB7608 802403D8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB760C 802403DC AFB20018 */ sw $s2, 0x18($sp) +/* EB7610 802403E0 0080902D */ daddu $s2, $a0, $zero +/* EB7614 802403E4 AFBF001C */ sw $ra, 0x1c($sp) +/* EB7618 802403E8 AFB10014 */ sw $s1, 0x14($sp) +/* EB761C 802403EC AFB00010 */ sw $s0, 0x10($sp) +/* EB7620 802403F0 8E50000C */ lw $s0, 0xc($s2) +/* EB7624 802403F4 8E050000 */ lw $a1, ($s0) +/* EB7628 802403F8 0C0B53A3 */ jal func_802D4E8C +/* EB762C 802403FC 26100004 */ addiu $s0, $s0, 4 +/* EB7630 80240400 0C0462EC */ jal func_80118BB0 +/* EB7634 80240404 0040202D */ daddu $a0, $v0, $zero +/* EB7638 80240408 8E050000 */ lw $a1, ($s0) +/* EB763C 8024040C 26100004 */ addiu $s0, $s0, 4 +/* EB7640 80240410 0040882D */ daddu $s1, $v0, $zero +/* EB7644 80240414 C6200048 */ lwc1 $f0, 0x48($s1) +/* EB7648 80240418 4600008D */ trunc.w.s $f2, $f0 +/* EB764C 8024041C 44061000 */ mfc1 $a2, $f2 +/* EB7650 80240420 0C0B551A */ jal func_802D5468 +/* EB7654 80240424 0240202D */ daddu $a0, $s2, $zero +/* EB7658 80240428 8E050000 */ lw $a1, ($s0) +/* EB765C 8024042C 26100004 */ addiu $s0, $s0, 4 +/* EB7660 80240430 C620004C */ lwc1 $f0, 0x4c($s1) +/* EB7664 80240434 4600008D */ trunc.w.s $f2, $f0 +/* EB7668 80240438 44061000 */ mfc1 $a2, $f2 +/* EB766C 8024043C 0C0B551A */ jal func_802D5468 +/* EB7670 80240440 0240202D */ daddu $a0, $s2, $zero +/* EB7674 80240444 C6200050 */ lwc1 $f0, 0x50($s1) +/* EB7678 80240448 8E050000 */ lw $a1, ($s0) +/* EB767C 8024044C 4600008D */ trunc.w.s $f2, $f0 +/* EB7680 80240450 44061000 */ mfc1 $a2, $f2 +/* EB7684 80240454 0C0B551A */ jal func_802D5468 +/* EB7688 80240458 0240202D */ daddu $a0, $s2, $zero +/* EB768C 8024045C 8FBF001C */ lw $ra, 0x1c($sp) +/* EB7690 80240460 8FB20018 */ lw $s2, 0x18($sp) +/* EB7694 80240464 8FB10014 */ lw $s1, 0x14($sp) +/* EB7698 80240468 8FB00010 */ lw $s0, 0x10($sp) +/* EB769C 8024046C 24020002 */ addiu $v0, $zero, 2 +/* EB76A0 80240470 03E00008 */ jr $ra +/* EB76A4 80240474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EB7540/func_80240478_EB76A8.s b/asm/nonmatchings/code_EB7540/func_80240478_EB76A8.s new file mode 100644 index 0000000000..6f8846da97 --- /dev/null +++ b/asm/nonmatchings/code_EB7540/func_80240478_EB76A8.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240478_EB76A8 +/* EB76A8 80240478 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EB76AC 8024047C AFB10014 */ sw $s1, 0x14($sp) +/* EB76B0 80240480 0080882D */ daddu $s1, $a0, $zero +/* EB76B4 80240484 AFBF0018 */ sw $ra, 0x18($sp) +/* EB76B8 80240488 AFB00010 */ sw $s0, 0x10($sp) +/* EB76BC 8024048C F7B60028 */ sdc1 $f22, 0x28($sp) +/* EB76C0 80240490 F7B40020 */ sdc1 $f20, 0x20($sp) +/* EB76C4 80240494 8E30000C */ lw $s0, 0xc($s1) +/* EB76C8 80240498 8E050000 */ lw $a1, ($s0) +/* EB76CC 8024049C 0C0B55FF */ jal func_802D57FC +/* EB76D0 802404A0 26100004 */ addiu $s0, $s0, 4 +/* EB76D4 802404A4 8E050000 */ lw $a1, ($s0) +/* EB76D8 802404A8 26100004 */ addiu $s0, $s0, 4 +/* EB76DC 802404AC 0220202D */ daddu $a0, $s1, $zero +/* EB76E0 802404B0 0C0B55FF */ jal func_802D57FC +/* EB76E4 802404B4 46000586 */ mov.s $f22, $f0 +/* EB76E8 802404B8 0220202D */ daddu $a0, $s1, $zero +/* EB76EC 802404BC 8E050000 */ lw $a1, ($s0) +/* EB76F0 802404C0 0C0B55FF */ jal func_802D57FC +/* EB76F4 802404C4 46000506 */ mov.s $f20, $f0 +/* EB76F8 802404C8 8E2300BC */ lw $v1, 0xbc($s1) +/* EB76FC 802404CC 8C62000C */ lw $v0, 0xc($v1) +/* EB7700 802404D0 E4560038 */ swc1 $f22, 0x38($v0) +/* EB7704 802404D4 8C62000C */ lw $v0, 0xc($v1) +/* EB7708 802404D8 E454003C */ swc1 $f20, 0x3c($v0) +/* EB770C 802404DC 8C62000C */ lw $v0, 0xc($v1) +/* EB7710 802404E0 E4400040 */ swc1 $f0, 0x40($v0) +/* EB7714 802404E4 8FBF0018 */ lw $ra, 0x18($sp) +/* EB7718 802404E8 8FB10014 */ lw $s1, 0x14($sp) +/* EB771C 802404EC 8FB00010 */ lw $s0, 0x10($sp) +/* EB7720 802404F0 D7B60028 */ ldc1 $f22, 0x28($sp) +/* EB7724 802404F4 D7B40020 */ ldc1 $f20, 0x20($sp) +/* EB7728 802404F8 24020002 */ addiu $v0, $zero, 2 +/* EB772C 802404FC 03E00008 */ jr $ra +/* EB7730 80240500 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EB7540/func_80240504_EB7734.s b/asm/nonmatchings/code_EB7540/func_80240504_EB7734.s new file mode 100644 index 0000000000..5d059bde3a --- /dev/null +++ b/asm/nonmatchings/code_EB7540/func_80240504_EB7734.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240504_EB7734 +/* EB7734 80240504 3C03800C */ lui $v1, %hi(D_800B8D80) +/* EB7738 80240508 24638D80 */ addiu $v1, $v1, %lo(D_800B8D80) +/* EB773C 8024050C 94620002 */ lhu $v0, 2($v1) +/* EB7740 80240510 3042FFFE */ andi $v0, $v0, 0xfffe +/* EB7744 80240514 A4620002 */ sh $v0, 2($v1) +/* EB7748 80240518 03E00008 */ jr $ra +/* EB774C 8024051C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EB7540/func_80240520_EB7750.s b/asm/nonmatchings/code_EB7540/func_80240520_EB7750.s new file mode 100644 index 0000000000..47f65441c5 --- /dev/null +++ b/asm/nonmatchings/code_EB7540/func_80240520_EB7750.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240520_EB7750 +/* EB7750 80240520 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB7754 80240524 AFB20018 */ sw $s2, 0x18($sp) +/* EB7758 80240528 0080902D */ daddu $s2, $a0, $zero +/* EB775C 8024052C AFBF001C */ sw $ra, 0x1c($sp) +/* EB7760 80240530 AFB10014 */ sw $s1, 0x14($sp) +/* EB7764 80240534 AFB00010 */ sw $s0, 0x10($sp) +/* EB7768 80240538 8E4400AC */ lw $a0, 0xac($s2) +/* EB776C 8024053C 0C0462EC */ jal func_80118BB0 +/* EB7770 80240540 00A0802D */ daddu $s0, $a1, $zero +/* EB7774 80240544 12000004 */ beqz $s0, .L80240558 +/* EB7778 80240548 0040882D */ daddu $s1, $v0, $zero +/* EB777C 8024054C 2402003C */ addiu $v0, $zero, 0x3c +/* EB7780 80240550 AE400070 */ sw $zero, 0x70($s2) +/* EB7784 80240554 AE420074 */ sw $v0, 0x74($s2) +.L80240558: +/* EB7788 80240558 C6400074 */ lwc1 $f0, 0x74($s2) +/* EB778C 8024055C 46800020 */ cvt.s.w $f0, $f0 +/* EB7790 80240560 3C014270 */ lui $at, 0x4270 +/* EB7794 80240564 44811000 */ mtc1 $at, $f2 +/* EB7798 80240568 3C014049 */ lui $at, 0x4049 +/* EB779C 8024056C 34210FD8 */ ori $at, $at, 0xfd8 +/* EB77A0 80240570 44816000 */ mtc1 $at, $f12 +/* EB77A4 80240574 46020003 */ div.s $f0, $f0, $f2 +/* EB77A8 80240578 E6200054 */ swc1 $f0, 0x54($s1) +/* EB77AC 8024057C C6400074 */ lwc1 $f0, 0x74($s2) +/* EB77B0 80240580 46800020 */ cvt.s.w $f0, $f0 +/* EB77B4 80240584 46020003 */ div.s $f0, $f0, $f2 +/* EB77B8 80240588 460C0302 */ mul.s $f12, $f0, $f12 +/* EB77BC 8024058C 00000000 */ nop +/* EB77C0 80240590 E6200058 */ swc1 $f0, 0x58($s1) +/* EB77C4 80240594 C6400074 */ lwc1 $f0, 0x74($s2) +/* EB77C8 80240598 46800020 */ cvt.s.w $f0, $f0 +/* EB77CC 8024059C 46020003 */ div.s $f0, $f0, $f2 +/* EB77D0 802405A0 0C00AD30 */ jal func_8002B4C0 +/* EB77D4 802405A4 E620005C */ swc1 $f0, 0x5c($s1) +/* EB77D8 802405A8 3C013F80 */ lui $at, 0x3f80 +/* EB77DC 802405AC 44811000 */ mtc1 $at, $f2 +/* EB77E0 802405B0 00000000 */ nop +/* EB77E4 802405B4 46001081 */ sub.s $f2, $f2, $f0 +/* EB77E8 802405B8 3C018024 */ lui $at, %hi(D_80241C10) +/* EB77EC 802405BC D4201C10 */ ldc1 $f0, %lo(D_80241C10)($at) +/* EB77F0 802405C0 460010A1 */ cvt.d.s $f2, $f2 +/* EB77F4 802405C4 46201082 */ mul.d $f2, $f2, $f0 +/* EB77F8 802405C8 00000000 */ nop +/* EB77FC 802405CC 3C013FE0 */ lui $at, 0x3fe0 +/* EB7800 802405D0 44810800 */ mtc1 $at, $f1 +/* EB7804 802405D4 44800000 */ mtc1 $zero, $f0 +/* EB7808 802405D8 00000000 */ nop +/* EB780C 802405DC 46201082 */ mul.d $f2, $f2, $f0 +/* EB7810 802405E0 00000000 */ nop +/* EB7814 802405E4 462010A0 */ cvt.s.d $f2, $f2 +/* EB7818 802405E8 E6220064 */ swc1 $f2, 0x64($s1) +/* EB781C 802405EC 8E430074 */ lw $v1, 0x74($s2) +/* EB7820 802405F0 2463FFFF */ addiu $v1, $v1, -1 +/* EB7824 802405F4 00031027 */ nor $v0, $zero, $v1 +/* EB7828 802405F8 2C420001 */ sltiu $v0, $v0, 1 +/* EB782C 802405FC AE430074 */ sw $v1, 0x74($s2) +/* EB7830 80240600 8FBF001C */ lw $ra, 0x1c($sp) +/* EB7834 80240604 8FB20018 */ lw $s2, 0x18($sp) +/* EB7838 80240608 8FB10014 */ lw $s1, 0x14($sp) +/* EB783C 8024060C 8FB00010 */ lw $s0, 0x10($sp) +/* EB7840 80240610 00021040 */ sll $v0, $v0, 1 +/* EB7844 80240614 03E00008 */ jr $ra +/* EB7848 80240618 27BD0020 */ addiu $sp, $sp, 0x20 +/* EB784C 8024061C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB8E50/func_80240000_EB8E50.s b/asm/nonmatchings/code_EB8E50/func_80240000_EB8E50.s new file mode 100644 index 0000000000..5b521e69ea --- /dev/null +++ b/asm/nonmatchings/code_EB8E50/func_80240000_EB8E50.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EB8E50 +/* EB8E50 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB8E54 80240004 0000202D */ daddu $a0, $zero, $zero +/* EB8E58 80240008 0080282D */ daddu $a1, $a0, $zero +/* EB8E5C 8024000C 0080302D */ daddu $a2, $a0, $zero +/* EB8E60 80240010 0080382D */ daddu $a3, $a0, $zero +/* EB8E64 80240014 AFBF0018 */ sw $ra, 0x18($sp) +/* EB8E68 80240018 AFA00010 */ sw $zero, 0x10($sp) +/* EB8E6C 8024001C 0C01DEF4 */ jal func_80077BD0 +/* EB8E70 80240020 AFA00014 */ sw $zero, 0x14($sp) +/* EB8E74 80240024 8FBF0018 */ lw $ra, 0x18($sp) +/* EB8E78 80240028 24020002 */ addiu $v0, $zero, 2 +/* EB8E7C 8024002C 03E00008 */ jr $ra +/* EB8E80 80240030 27BD0020 */ addiu $sp, $sp, 0x20 +/* EB8E84 80240034 00000000 */ nop +/* EB8E88 80240038 00000000 */ nop +/* EB8E8C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB8E90/func_80240040_EB8E90.s b/asm/nonmatchings/code_EB8E90/func_80240040_EB8E90.s new file mode 100644 index 0000000000..089d752c24 --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_80240040_EB8E90.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240040_EB8E90 +/* EB8E90 80240040 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EB8E94 80240044 AFB50024 */ sw $s5, 0x24($sp) +/* EB8E98 80240048 0080A82D */ daddu $s5, $a0, $zero +/* EB8E9C 8024004C AFBF002C */ sw $ra, 0x2c($sp) +/* EB8EA0 80240050 AFB60028 */ sw $s6, 0x28($sp) +/* EB8EA4 80240054 AFB40020 */ sw $s4, 0x20($sp) +/* EB8EA8 80240058 AFB3001C */ sw $s3, 0x1c($sp) +/* EB8EAC 8024005C AFB20018 */ sw $s2, 0x18($sp) +/* EB8EB0 80240060 AFB10014 */ sw $s1, 0x14($sp) +/* EB8EB4 80240064 AFB00010 */ sw $s0, 0x10($sp) +/* EB8EB8 80240068 F7B80040 */ sdc1 $f24, 0x40($sp) +/* EB8EBC 8024006C F7B60038 */ sdc1 $f22, 0x38($sp) +/* EB8EC0 80240070 F7B40030 */ sdc1 $f20, 0x30($sp) +/* EB8EC4 80240074 8EB30148 */ lw $s3, 0x148($s5) +/* EB8EC8 80240078 86640008 */ lh $a0, 8($s3) +/* EB8ECC 8024007C 0C00F92F */ jal func_8003E4BC +/* EB8ED0 80240080 00A0B02D */ daddu $s6, $a1, $zero +/* EB8ED4 80240084 0040A02D */ daddu $s4, $v0, $zero +/* EB8ED8 80240088 AEA00074 */ sw $zero, 0x74($s5) +/* EB8EDC 8024008C C6980038 */ lwc1 $f24, 0x38($s4) +/* EB8EE0 80240090 C6960040 */ lwc1 $f22, 0x40($s4) +/* EB8EE4 80240094 0000902D */ daddu $s2, $zero, $zero +/* EB8EE8 80240098 AEA00078 */ sw $zero, 0x78($s5) +/* EB8EEC 8024009C 8E6300D0 */ lw $v1, 0xd0($s3) +/* EB8EF0 802400A0 8C620000 */ lw $v0, ($v1) +/* EB8EF4 802400A4 3C0146FF */ lui $at, 0x46ff +/* EB8EF8 802400A8 3421FE00 */ ori $at, $at, 0xfe00 +/* EB8EFC 802400AC 4481A000 */ mtc1 $at, $f20 +/* EB8F00 802400B0 18400018 */ blez $v0, .L80240114 +/* EB8F04 802400B4 0240802D */ daddu $s0, $s2, $zero +/* EB8F08 802400B8 0240882D */ daddu $s1, $s2, $zero +.L802400BC: +/* EB8F0C 802400BC 02231021 */ addu $v0, $s1, $v1 +/* EB8F10 802400C0 4600C306 */ mov.s $f12, $f24 +/* EB8F14 802400C4 C4440004 */ lwc1 $f4, 4($v0) +/* EB8F18 802400C8 46802120 */ cvt.s.w $f4, $f4 +/* EB8F1C 802400CC 44062000 */ mfc1 $a2, $f4 +/* EB8F20 802400D0 C444000C */ lwc1 $f4, 0xc($v0) +/* EB8F24 802400D4 46802120 */ cvt.s.w $f4, $f4 +/* EB8F28 802400D8 44072000 */ mfc1 $a3, $f4 +/* EB8F2C 802400DC 0C00AC71 */ jal func_8002B1C4 +/* EB8F30 802400E0 4600B386 */ mov.s $f14, $f22 +/* EB8F34 802400E4 4614003C */ c.lt.s $f0, $f20 +/* EB8F38 802400E8 00000000 */ nop +/* EB8F3C 802400EC 45000003 */ bc1f .L802400FC +/* EB8F40 802400F0 2631000C */ addiu $s1, $s1, 0xc +/* EB8F44 802400F4 46000506 */ mov.s $f20, $f0 +/* EB8F48 802400F8 AEB20078 */ sw $s2, 0x78($s5) +.L802400FC: +/* EB8F4C 802400FC 8E6300D0 */ lw $v1, 0xd0($s3) +/* EB8F50 80240100 26100001 */ addiu $s0, $s0, 1 +/* EB8F54 80240104 8C620000 */ lw $v0, ($v1) +/* EB8F58 80240108 0202102A */ slt $v0, $s0, $v0 +/* EB8F5C 8024010C 1440FFEB */ bnez $v0, .L802400BC +/* EB8F60 80240110 26520001 */ addiu $s2, $s2, 1 +.L80240114: +/* EB8F64 80240114 8E6200CC */ lw $v0, 0xcc($s3) +/* EB8F68 80240118 8C420004 */ lw $v0, 4($v0) +/* EB8F6C 8024011C AE820028 */ sw $v0, 0x28($s4) +/* EB8F70 80240120 8E6200D0 */ lw $v0, 0xd0($s3) +/* EB8F74 80240124 8C42007C */ lw $v0, 0x7c($v0) +/* EB8F78 80240128 04410004 */ bgez $v0, .L8024013C +/* EB8F7C 8024012C 00000000 */ nop +/* EB8F80 80240130 C6C00000 */ lwc1 $f0, ($s6) +/* EB8F84 80240134 08090057 */ j .L8024015C +/* EB8F88 80240138 E6800018 */ swc1 $f0, 0x18($s4) +.L8024013C: +/* EB8F8C 8024013C 3C018025 */ lui $at, %hi(D_802491F0) +/* EB8F90 80240140 D42291F0 */ ldc1 $f2, %lo(D_802491F0)($at) +/* EB8F94 80240144 44820000 */ mtc1 $v0, $f0 +/* EB8F98 80240148 00000000 */ nop +/* EB8F9C 8024014C 46800021 */ cvt.d.w $f0, $f0 +/* EB8FA0 80240150 46220003 */ div.d $f0, $f0, $f2 +/* EB8FA4 80240154 46200020 */ cvt.s.d $f0, $f0 +/* EB8FA8 80240158 E6800018 */ swc1 $f0, 0x18($s4) +.L8024015C: +/* EB8FAC 8024015C 24020001 */ addiu $v0, $zero, 1 +/* EB8FB0 80240160 AEA20070 */ sw $v0, 0x70($s5) +/* EB8FB4 80240164 8FBF002C */ lw $ra, 0x2c($sp) +/* EB8FB8 80240168 8FB60028 */ lw $s6, 0x28($sp) +/* EB8FBC 8024016C 8FB50024 */ lw $s5, 0x24($sp) +/* EB8FC0 80240170 8FB40020 */ lw $s4, 0x20($sp) +/* EB8FC4 80240174 8FB3001C */ lw $s3, 0x1c($sp) +/* EB8FC8 80240178 8FB20018 */ lw $s2, 0x18($sp) +/* EB8FCC 8024017C 8FB10014 */ lw $s1, 0x14($sp) +/* EB8FD0 80240180 8FB00010 */ lw $s0, 0x10($sp) +/* EB8FD4 80240184 D7B80040 */ ldc1 $f24, 0x40($sp) +/* EB8FD8 80240188 D7B60038 */ ldc1 $f22, 0x38($sp) +/* EB8FDC 8024018C D7B40030 */ ldc1 $f20, 0x30($sp) +/* EB8FE0 80240190 03E00008 */ jr $ra +/* EB8FE4 80240194 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EB8E90/func_80240198_EB8FE8.s b/asm/nonmatchings/code_EB8E90/func_80240198_EB8FE8.s new file mode 100644 index 0000000000..a000f487af --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_80240198_EB8FE8.s @@ -0,0 +1,183 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240198_EB8FE8 +/* EB8FE8 80240198 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* EB8FEC 8024019C AFB20038 */ sw $s2, 0x38($sp) +/* EB8FF0 802401A0 0080902D */ daddu $s2, $a0, $zero +/* EB8FF4 802401A4 AFBF0044 */ sw $ra, 0x44($sp) +/* EB8FF8 802401A8 AFB40040 */ sw $s4, 0x40($sp) +/* EB8FFC 802401AC AFB3003C */ sw $s3, 0x3c($sp) +/* EB9000 802401B0 AFB10034 */ sw $s1, 0x34($sp) +/* EB9004 802401B4 AFB00030 */ sw $s0, 0x30($sp) +/* EB9008 802401B8 F7B60050 */ sdc1 $f22, 0x50($sp) +/* EB900C 802401BC F7B40048 */ sdc1 $f20, 0x48($sp) +/* EB9010 802401C0 8E510148 */ lw $s1, 0x148($s2) +/* EB9014 802401C4 00A0982D */ daddu $s3, $a1, $zero +/* EB9018 802401C8 86240008 */ lh $a0, 8($s1) +/* EB901C 802401CC 0C00F92F */ jal func_8003E4BC +/* EB9020 802401D0 00C0A02D */ daddu $s4, $a2, $zero +/* EB9024 802401D4 8E630014 */ lw $v1, 0x14($s3) +/* EB9028 802401D8 04600030 */ bltz $v1, .L8024029C +/* EB902C 802401DC 0040802D */ daddu $s0, $v0, $zero +/* EB9030 802401E0 8E420074 */ lw $v0, 0x74($s2) +/* EB9034 802401E4 1C40002C */ bgtz $v0, .L80240298 +/* EB9038 802401E8 2442FFFF */ addiu $v0, $v0, -1 +/* EB903C 802401EC 0280202D */ daddu $a0, $s4, $zero +/* EB9040 802401F0 AE430074 */ sw $v1, 0x74($s2) +/* EB9044 802401F4 AFA00010 */ sw $zero, 0x10($sp) +/* EB9048 802401F8 8E66000C */ lw $a2, 0xc($s3) +/* EB904C 802401FC 8E670010 */ lw $a3, 0x10($s3) +/* EB9050 80240200 0C013469 */ jal func_8004D1A4 +/* EB9054 80240204 0220282D */ daddu $a1, $s1, $zero +/* EB9058 80240208 10400021 */ beqz $v0, .L80240290 +/* EB905C 8024020C 0000202D */ daddu $a0, $zero, $zero +/* EB9060 80240210 0200282D */ daddu $a1, $s0, $zero +/* EB9064 80240214 0000302D */ daddu $a2, $zero, $zero +/* EB9068 80240218 860300A8 */ lh $v1, 0xa8($s0) +/* EB906C 8024021C 3C013F80 */ lui $at, 0x3f80 +/* EB9070 80240220 44810000 */ mtc1 $at, $f0 +/* EB9074 80240224 3C014000 */ lui $at, 0x4000 +/* EB9078 80240228 44811000 */ mtc1 $at, $f2 +/* EB907C 8024022C 3C01C1A0 */ lui $at, 0xc1a0 +/* EB9080 80240230 44812000 */ mtc1 $at, $f4 +/* EB9084 80240234 2402000F */ addiu $v0, $zero, 0xf +/* EB9088 80240238 AFA2001C */ sw $v0, 0x1c($sp) +/* EB908C 8024023C 44833000 */ mtc1 $v1, $f6 +/* EB9090 80240240 00000000 */ nop +/* EB9094 80240244 468031A0 */ cvt.s.w $f6, $f6 +/* EB9098 80240248 44073000 */ mfc1 $a3, $f6 +/* EB909C 8024024C 27A20028 */ addiu $v0, $sp, 0x28 +/* EB90A0 80240250 AFA20020 */ sw $v0, 0x20($sp) +/* EB90A4 80240254 E7A00010 */ swc1 $f0, 0x10($sp) +/* EB90A8 80240258 E7A20014 */ swc1 $f2, 0x14($sp) +/* EB90AC 8024025C 0C01D444 */ jal func_80075110 +/* EB90B0 80240260 E7A40018 */ swc1 $f4, 0x18($sp) +/* EB90B4 80240264 0200202D */ daddu $a0, $s0, $zero +/* EB90B8 80240268 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EB90BC 8024026C 0C013600 */ jal func_8004D800 +/* EB90C0 80240270 3C060020 */ lui $a2, 0x20 +/* EB90C4 80240274 8E220018 */ lw $v0, 0x18($s1) +/* EB90C8 80240278 9442002A */ lhu $v0, 0x2a($v0) +/* EB90CC 8024027C 30420001 */ andi $v0, $v0, 1 +/* EB90D0 80240280 14400064 */ bnez $v0, .L80240414 +/* EB90D4 80240284 2402000A */ addiu $v0, $zero, 0xa +/* EB90D8 80240288 08090105 */ j .L80240414 +/* EB90DC 8024028C 2402000C */ addiu $v0, $zero, 0xc +.L80240290: +/* EB90E0 80240290 8E420074 */ lw $v0, 0x74($s2) +/* EB90E4 80240294 2442FFFF */ addiu $v0, $v0, -1 +.L80240298: +/* EB90E8 80240298 AE420074 */ sw $v0, 0x74($s2) +.L8024029C: +/* EB90EC 8024029C 8602008C */ lh $v0, 0x8c($s0) +/* EB90F0 802402A0 1440005D */ bnez $v0, .L80240418 +/* EB90F4 802402A4 00000000 */ nop +/* EB90F8 802402A8 C6000018 */ lwc1 $f0, 0x18($s0) +/* EB90FC 802402AC 3C014010 */ lui $at, 0x4010 +/* EB9100 802402B0 44811800 */ mtc1 $at, $f3 +/* EB9104 802402B4 44801000 */ mtc1 $zero, $f2 +/* EB9108 802402B8 46000021 */ cvt.d.s $f0, $f0 +/* EB910C 802402BC 4622003C */ c.lt.d $f0, $f2 +/* EB9110 802402C0 00000000 */ nop +/* EB9114 802402C4 45000003 */ bc1f .L802402D4 +/* EB9118 802402C8 0200202D */ daddu $a0, $s0, $zero +/* EB911C 802402CC 080900B6 */ j .L802402D8 +/* EB9120 802402D0 0000282D */ daddu $a1, $zero, $zero +.L802402D4: +/* EB9124 802402D4 24050001 */ addiu $a1, $zero, 1 +.L802402D8: +/* EB9128 802402D8 0C010420 */ jal func_80041080 +/* EB912C 802402DC 00000000 */ nop +/* EB9130 802402E0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EB9134 802402E4 8E430078 */ lw $v1, 0x78($s2) +/* EB9138 802402E8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EB913C 802402EC 00031040 */ sll $v0, $v1, 1 +/* EB9140 802402F0 00431021 */ addu $v0, $v0, $v1 +/* EB9144 802402F4 8E2300D0 */ lw $v1, 0xd0($s1) +/* EB9148 802402F8 00021080 */ sll $v0, $v0, 2 +/* EB914C 802402FC 00431021 */ addu $v0, $v0, $v1 +/* EB9150 80240300 C4560004 */ lwc1 $f22, 4($v0) +/* EB9154 80240304 4680B5A0 */ cvt.s.w $f22, $f22 +/* EB9158 80240308 C454000C */ lwc1 $f20, 0xc($v0) +/* EB915C 8024030C 4680A520 */ cvt.s.w $f20, $f20 +/* EB9160 80240310 4406B000 */ mfc1 $a2, $f22 +/* EB9164 80240314 4407A000 */ mfc1 $a3, $f20 +/* EB9168 80240318 0C00ABDC */ jal fio_validate_header_checksums +/* EB916C 8024031C 00000000 */ nop +/* EB9170 80240320 8E050018 */ lw $a1, 0x18($s0) +/* EB9174 80240324 44060000 */ mfc1 $a2, $f0 +/* EB9178 80240328 0200202D */ daddu $a0, $s0, $zero +/* EB917C 8024032C 0C00F909 */ jal func_8003E424 +/* EB9180 80240330 AE06000C */ sw $a2, 0xc($s0) +/* EB9184 80240334 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EB9188 80240338 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EB918C 8024033C 4406B000 */ mfc1 $a2, $f22 +/* EB9190 80240340 4407A000 */ mfc1 $a3, $f20 +/* EB9194 80240344 0C00AC71 */ jal func_8002B1C4 +/* EB9198 80240348 00000000 */ nop +/* EB919C 8024034C C6020018 */ lwc1 $f2, 0x18($s0) +/* EB91A0 80240350 4602003E */ c.le.s $f0, $f2 +/* EB91A4 80240354 00000000 */ nop +/* EB91A8 80240358 4500002F */ bc1f .L80240418 +/* EB91AC 8024035C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EB91B0 80240360 24020002 */ addiu $v0, $zero, 2 +/* EB91B4 80240364 0C00AB3B */ jal func_8002ACEC +/* EB91B8 80240368 AE420070 */ sw $v0, 0x70($s2) +/* EB91BC 8024036C 3C035555 */ lui $v1, 0x5555 +/* EB91C0 80240370 34635556 */ ori $v1, $v1, 0x5556 +/* EB91C4 80240374 00430018 */ mult $v0, $v1 +/* EB91C8 80240378 000227C3 */ sra $a0, $v0, 0x1f +/* EB91CC 8024037C 00004010 */ mfhi $t0 +/* EB91D0 80240380 01042023 */ subu $a0, $t0, $a0 +/* EB91D4 80240384 00041840 */ sll $v1, $a0, 1 +/* EB91D8 80240388 00641821 */ addu $v1, $v1, $a0 +/* EB91DC 8024038C 00431023 */ subu $v0, $v0, $v1 +/* EB91E0 80240390 24430002 */ addiu $v1, $v0, 2 +/* EB91E4 80240394 AE430074 */ sw $v1, 0x74($s2) +/* EB91E8 80240398 8E62002C */ lw $v0, 0x2c($s3) +/* EB91EC 8024039C 18400009 */ blez $v0, .L802403C4 +/* EB91F0 802403A0 24020004 */ addiu $v0, $zero, 4 +/* EB91F4 802403A4 8E620004 */ lw $v0, 4($s3) +/* EB91F8 802403A8 18400006 */ blez $v0, .L802403C4 +/* EB91FC 802403AC 24020004 */ addiu $v0, $zero, 4 +/* EB9200 802403B0 8E620008 */ lw $v0, 8($s3) +/* EB9204 802403B4 18400003 */ blez $v0, .L802403C4 +/* EB9208 802403B8 24020004 */ addiu $v0, $zero, 4 +/* EB920C 802403BC 14600002 */ bnez $v1, .L802403C8 +/* EB9210 802403C0 00000000 */ nop +.L802403C4: +/* EB9214 802403C4 AE420070 */ sw $v0, 0x70($s2) +.L802403C8: +/* EB9218 802403C8 0C00AB3B */ jal func_8002ACEC +/* EB921C 802403CC 24042710 */ addiu $a0, $zero, 0x2710 +/* EB9220 802403D0 3C0351EB */ lui $v1, 0x51eb +/* EB9224 802403D4 3463851F */ ori $v1, $v1, 0x851f +/* EB9228 802403D8 00430018 */ mult $v0, $v1 +/* EB922C 802403DC 00021FC3 */ sra $v1, $v0, 0x1f +/* EB9230 802403E0 00004010 */ mfhi $t0 +/* EB9234 802403E4 00082143 */ sra $a0, $t0, 5 +/* EB9238 802403E8 00832023 */ subu $a0, $a0, $v1 +/* EB923C 802403EC 00041840 */ sll $v1, $a0, 1 +/* EB9240 802403F0 00641821 */ addu $v1, $v1, $a0 +/* EB9244 802403F4 000318C0 */ sll $v1, $v1, 3 +/* EB9248 802403F8 00641821 */ addu $v1, $v1, $a0 +/* EB924C 802403FC 00031880 */ sll $v1, $v1, 2 +/* EB9250 80240400 8E640004 */ lw $a0, 4($s3) +/* EB9254 80240404 00431023 */ subu $v0, $v0, $v1 +/* EB9258 80240408 0044102A */ slt $v0, $v0, $a0 +/* EB925C 8024040C 10400002 */ beqz $v0, .L80240418 +/* EB9260 80240410 24020004 */ addiu $v0, $zero, 4 +.L80240414: +/* EB9264 80240414 AE420070 */ sw $v0, 0x70($s2) +.L80240418: +/* EB9268 80240418 8FBF0044 */ lw $ra, 0x44($sp) +/* EB926C 8024041C 8FB40040 */ lw $s4, 0x40($sp) +/* EB9270 80240420 8FB3003C */ lw $s3, 0x3c($sp) +/* EB9274 80240424 8FB20038 */ lw $s2, 0x38($sp) +/* EB9278 80240428 8FB10034 */ lw $s1, 0x34($sp) +/* EB927C 8024042C 8FB00030 */ lw $s0, 0x30($sp) +/* EB9280 80240430 D7B60050 */ ldc1 $f22, 0x50($sp) +/* EB9284 80240434 D7B40048 */ ldc1 $f20, 0x48($sp) +/* EB9288 80240438 03E00008 */ jr $ra +/* EB928C 8024043C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/code_EB8E90/func_80240440_EB9290.s b/asm/nonmatchings/code_EB8E90/func_80240440_EB9290.s new file mode 100644 index 0000000000..1f5db35ee2 --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_80240440_EB9290.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240440_EB9290 +/* EB9290 80240440 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EB9294 80240444 AFB3001C */ sw $s3, 0x1c($sp) +/* EB9298 80240448 0080982D */ daddu $s3, $a0, $zero +/* EB929C 8024044C AFBF0020 */ sw $ra, 0x20($sp) +/* EB92A0 80240450 AFB20018 */ sw $s2, 0x18($sp) +/* EB92A4 80240454 AFB10014 */ sw $s1, 0x14($sp) +/* EB92A8 80240458 AFB00010 */ sw $s0, 0x10($sp) +/* EB92AC 8024045C 8E720148 */ lw $s2, 0x148($s3) +/* EB92B0 80240460 86440008 */ lh $a0, 8($s2) +/* EB92B4 80240464 0C00F92F */ jal func_8003E4BC +/* EB92B8 80240468 00A0882D */ daddu $s1, $a1, $zero +/* EB92BC 8024046C 8E240008 */ lw $a0, 8($s1) +/* EB92C0 80240470 0040802D */ daddu $s0, $v0, $zero +/* EB92C4 80240474 00041FC2 */ srl $v1, $a0, 0x1f +/* EB92C8 80240478 00832021 */ addu $a0, $a0, $v1 +/* EB92CC 8024047C 00042043 */ sra $a0, $a0, 1 +/* EB92D0 80240480 0C00AB3B */ jal func_8002ACEC +/* EB92D4 80240484 24840001 */ addiu $a0, $a0, 1 +/* EB92D8 80240488 8E230008 */ lw $v1, 8($s1) +/* EB92DC 8024048C 240400B4 */ addiu $a0, $zero, 0xb4 +/* EB92E0 80240490 00032FC2 */ srl $a1, $v1, 0x1f +/* EB92E4 80240494 00651821 */ addu $v1, $v1, $a1 +/* EB92E8 80240498 00031843 */ sra $v1, $v1, 1 +/* EB92EC 8024049C 00621821 */ addu $v1, $v1, $v0 +/* EB92F0 802404A0 0C00AB3B */ jal func_8002ACEC +/* EB92F4 802404A4 A603008E */ sh $v1, 0x8e($s0) +/* EB92F8 802404A8 C60C000C */ lwc1 $f12, 0xc($s0) +/* EB92FC 802404AC 44820000 */ mtc1 $v0, $f0 +/* EB9300 802404B0 00000000 */ nop +/* EB9304 802404B4 46800020 */ cvt.s.w $f0, $f0 +/* EB9308 802404B8 46006300 */ add.s $f12, $f12, $f0 +/* EB930C 802404BC 3C0142B4 */ lui $at, 0x42b4 +/* EB9310 802404C0 44810000 */ mtc1 $at, $f0 +/* EB9314 802404C4 0C00AB85 */ jal func_8002AE14 +/* EB9318 802404C8 46006301 */ sub.s $f12, $f12, $f0 +/* EB931C 802404CC E600000C */ swc1 $f0, 0xc($s0) +/* EB9320 802404D0 8E4200CC */ lw $v0, 0xcc($s2) +/* EB9324 802404D4 8C420000 */ lw $v0, ($v0) +/* EB9328 802404D8 AE020028 */ sw $v0, 0x28($s0) +/* EB932C 802404DC 24020003 */ addiu $v0, $zero, 3 +/* EB9330 802404E0 AE620070 */ sw $v0, 0x70($s3) +/* EB9334 802404E4 8FBF0020 */ lw $ra, 0x20($sp) +/* EB9338 802404E8 8FB3001C */ lw $s3, 0x1c($sp) +/* EB933C 802404EC 8FB20018 */ lw $s2, 0x18($sp) +/* EB9340 802404F0 8FB10014 */ lw $s1, 0x14($sp) +/* EB9344 802404F4 8FB00010 */ lw $s0, 0x10($sp) +/* EB9348 802404F8 03E00008 */ jr $ra +/* EB934C 802404FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EB8E90/func_80240500_EB9350.s b/asm/nonmatchings/code_EB8E90/func_80240500_EB9350.s new file mode 100644 index 0000000000..7008719bb0 --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_80240500_EB9350.s @@ -0,0 +1,120 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240500_EB9350 +/* EB9350 80240500 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EB9354 80240504 AFB40040 */ sw $s4, 0x40($sp) +/* EB9358 80240508 0080A02D */ daddu $s4, $a0, $zero +/* EB935C 8024050C AFBF0044 */ sw $ra, 0x44($sp) +/* EB9360 80240510 AFB3003C */ sw $s3, 0x3c($sp) +/* EB9364 80240514 AFB20038 */ sw $s2, 0x38($sp) +/* EB9368 80240518 AFB10034 */ sw $s1, 0x34($sp) +/* EB936C 8024051C AFB00030 */ sw $s0, 0x30($sp) +/* EB9370 80240520 8E910148 */ lw $s1, 0x148($s4) +/* EB9374 80240524 00A0902D */ daddu $s2, $a1, $zero +/* EB9378 80240528 86240008 */ lh $a0, 8($s1) +/* EB937C 8024052C 0C00F92F */ jal func_8003E4BC +/* EB9380 80240530 00C0982D */ daddu $s3, $a2, $zero +/* EB9384 80240534 8E430014 */ lw $v1, 0x14($s2) +/* EB9388 80240538 04600031 */ bltz $v1, .L80240600 +/* EB938C 8024053C 0040802D */ daddu $s0, $v0, $zero +/* EB9390 80240540 0260202D */ daddu $a0, $s3, $zero +/* EB9394 80240544 AFA00010 */ sw $zero, 0x10($sp) +/* EB9398 80240548 8E460024 */ lw $a2, 0x24($s2) +/* EB939C 8024054C 8E470028 */ lw $a3, 0x28($s2) +/* EB93A0 80240550 0C013469 */ jal func_8004D1A4 +/* EB93A4 80240554 0220282D */ daddu $a1, $s1, $zero +/* EB93A8 80240558 10400029 */ beqz $v0, .L80240600 +/* EB93AC 8024055C 0000202D */ daddu $a0, $zero, $zero +/* EB93B0 80240560 0200282D */ daddu $a1, $s0, $zero +/* EB93B4 80240564 0000302D */ daddu $a2, $zero, $zero +/* EB93B8 80240568 860300A8 */ lh $v1, 0xa8($s0) +/* EB93BC 8024056C 3C013F80 */ lui $at, 0x3f80 +/* EB93C0 80240570 44810000 */ mtc1 $at, $f0 +/* EB93C4 80240574 3C014000 */ lui $at, 0x4000 +/* EB93C8 80240578 44811000 */ mtc1 $at, $f2 +/* EB93CC 8024057C 3C01C1A0 */ lui $at, 0xc1a0 +/* EB93D0 80240580 44812000 */ mtc1 $at, $f4 +/* EB93D4 80240584 2402000F */ addiu $v0, $zero, 0xf +/* EB93D8 80240588 AFA2001C */ sw $v0, 0x1c($sp) +/* EB93DC 8024058C 44833000 */ mtc1 $v1, $f6 +/* EB93E0 80240590 00000000 */ nop +/* EB93E4 80240594 468031A0 */ cvt.s.w $f6, $f6 +/* EB93E8 80240598 44073000 */ mfc1 $a3, $f6 +/* EB93EC 8024059C 27A20028 */ addiu $v0, $sp, 0x28 +/* EB93F0 802405A0 AFA20020 */ sw $v0, 0x20($sp) +/* EB93F4 802405A4 E7A00010 */ swc1 $f0, 0x10($sp) +/* EB93F8 802405A8 E7A20014 */ swc1 $f2, 0x14($sp) +/* EB93FC 802405AC 0C01D444 */ jal func_80075110 +/* EB9400 802405B0 E7A40018 */ swc1 $f4, 0x18($sp) +/* EB9404 802405B4 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EB9408 802405B8 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EB940C 802405BC C60C0038 */ lwc1 $f12, 0x38($s0) +/* EB9410 802405C0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EB9414 802405C4 8C460028 */ lw $a2, 0x28($v0) +/* EB9418 802405C8 0C00ABDC */ jal fio_validate_header_checksums +/* EB941C 802405CC 8C470030 */ lw $a3, 0x30($v0) +/* EB9420 802405D0 0200202D */ daddu $a0, $s0, $zero +/* EB9424 802405D4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EB9428 802405D8 3C060020 */ lui $a2, 0x20 +/* EB942C 802405DC 0C013600 */ jal func_8004D800 +/* EB9430 802405E0 E480000C */ swc1 $f0, 0xc($a0) +/* EB9434 802405E4 8E220018 */ lw $v0, 0x18($s1) +/* EB9438 802405E8 9442002A */ lhu $v0, 0x2a($v0) +/* EB943C 802405EC 30420001 */ andi $v0, $v0, 1 +/* EB9440 802405F0 14400029 */ bnez $v0, .L80240698 +/* EB9444 802405F4 2402000A */ addiu $v0, $zero, 0xa +/* EB9448 802405F8 080901A6 */ j .L80240698 +/* EB944C 802405FC 2402000C */ addiu $v0, $zero, 0xc +.L80240600: +/* EB9450 80240600 8602008C */ lh $v0, 0x8c($s0) +/* EB9454 80240604 14400025 */ bnez $v0, .L8024069C +/* EB9458 80240608 00000000 */ nop +/* EB945C 8024060C 9602008E */ lhu $v0, 0x8e($s0) +/* EB9460 80240610 2442FFFF */ addiu $v0, $v0, -1 +/* EB9464 80240614 A602008E */ sh $v0, 0x8e($s0) +/* EB9468 80240618 00021400 */ sll $v0, $v0, 0x10 +/* EB946C 8024061C 1440001F */ bnez $v0, .L8024069C +/* EB9470 80240620 00000000 */ nop +/* EB9474 80240624 8E820074 */ lw $v0, 0x74($s4) +/* EB9478 80240628 2442FFFF */ addiu $v0, $v0, -1 +/* EB947C 8024062C 10400019 */ beqz $v0, .L80240694 +/* EB9480 80240630 AE820074 */ sw $v0, 0x74($s4) +/* EB9484 80240634 8E220018 */ lw $v0, 0x18($s1) +/* EB9488 80240638 9442002A */ lhu $v0, 0x2a($v0) +/* EB948C 8024063C 30420010 */ andi $v0, $v0, 0x10 +/* EB9490 80240640 14400007 */ bnez $v0, .L80240660 +/* EB9494 80240644 00000000 */ nop +/* EB9498 80240648 C600000C */ lwc1 $f0, 0xc($s0) +/* EB949C 8024064C 3C014334 */ lui $at, 0x4334 +/* EB94A0 80240650 44816000 */ mtc1 $at, $f12 +/* EB94A4 80240654 0C00AB85 */ jal func_8002AE14 +/* EB94A8 80240658 460C0300 */ add.s $f12, $f0, $f12 +/* EB94AC 8024065C E600000C */ swc1 $f0, 0xc($s0) +.L80240660: +/* EB94B0 80240660 8E440008 */ lw $a0, 8($s2) +/* EB94B4 80240664 000417C2 */ srl $v0, $a0, 0x1f +/* EB94B8 80240668 00822021 */ addu $a0, $a0, $v0 +/* EB94BC 8024066C 00042043 */ sra $a0, $a0, 1 +/* EB94C0 80240670 0C00AB3B */ jal func_8002ACEC +/* EB94C4 80240674 24840001 */ addiu $a0, $a0, 1 +/* EB94C8 80240678 8E430008 */ lw $v1, 8($s2) +/* EB94CC 8024067C 000327C2 */ srl $a0, $v1, 0x1f +/* EB94D0 80240680 00641821 */ addu $v1, $v1, $a0 +/* EB94D4 80240684 00031843 */ sra $v1, $v1, 1 +/* EB94D8 80240688 00621821 */ addu $v1, $v1, $v0 +/* EB94DC 8024068C 080901A7 */ j .L8024069C +/* EB94E0 80240690 A603008E */ sh $v1, 0x8e($s0) +.L80240694: +/* EB94E4 80240694 24020004 */ addiu $v0, $zero, 4 +.L80240698: +/* EB94E8 80240698 AE820070 */ sw $v0, 0x70($s4) +.L8024069C: +/* EB94EC 8024069C 8FBF0044 */ lw $ra, 0x44($sp) +/* EB94F0 802406A0 8FB40040 */ lw $s4, 0x40($sp) +/* EB94F4 802406A4 8FB3003C */ lw $s3, 0x3c($sp) +/* EB94F8 802406A8 8FB20038 */ lw $s2, 0x38($sp) +/* EB94FC 802406AC 8FB10034 */ lw $s1, 0x34($sp) +/* EB9500 802406B0 8FB00030 */ lw $s0, 0x30($sp) +/* EB9504 802406B4 03E00008 */ jr $ra +/* EB9508 802406B8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EB8E90/func_802406BC_EB950C.s b/asm/nonmatchings/code_EB8E90/func_802406BC_EB950C.s new file mode 100644 index 0000000000..71e752e427 --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_802406BC_EB950C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406BC_EB950C +/* EB950C 802406BC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB9510 802406C0 AFB10014 */ sw $s1, 0x14($sp) +/* EB9514 802406C4 0080882D */ daddu $s1, $a0, $zero +/* EB9518 802406C8 AFBF001C */ sw $ra, 0x1c($sp) +/* EB951C 802406CC AFB20018 */ sw $s2, 0x18($sp) +/* EB9520 802406D0 AFB00010 */ sw $s0, 0x10($sp) +/* EB9524 802406D4 8E300148 */ lw $s0, 0x148($s1) +/* EB9528 802406D8 86040008 */ lh $a0, 8($s0) +/* EB952C 802406DC 0C00F92F */ jal func_8003E4BC +/* EB9530 802406E0 00A0902D */ daddu $s2, $a1, $zero +/* EB9534 802406E4 8E230078 */ lw $v1, 0x78($s1) +/* EB9538 802406E8 24630001 */ addiu $v1, $v1, 1 +/* EB953C 802406EC AE230078 */ sw $v1, 0x78($s1) +/* EB9540 802406F0 8E0400D0 */ lw $a0, 0xd0($s0) +/* EB9544 802406F4 8C840000 */ lw $a0, ($a0) +/* EB9548 802406F8 0064182A */ slt $v1, $v1, $a0 +/* EB954C 802406FC 14600002 */ bnez $v1, .L80240708 +/* EB9550 80240700 0040282D */ daddu $a1, $v0, $zero +/* EB9554 80240704 AE200078 */ sw $zero, 0x78($s1) +.L80240708: +/* EB9558 80240708 8E0200CC */ lw $v0, 0xcc($s0) +/* EB955C 8024070C 8C420004 */ lw $v0, 4($v0) +/* EB9560 80240710 ACA20028 */ sw $v0, 0x28($a1) +/* EB9564 80240714 8E0200D0 */ lw $v0, 0xd0($s0) +/* EB9568 80240718 8C42007C */ lw $v0, 0x7c($v0) +/* EB956C 8024071C 04410004 */ bgez $v0, .L80240730 +/* EB9570 80240720 00000000 */ nop +/* EB9574 80240724 C6400000 */ lwc1 $f0, ($s2) +/* EB9578 80240728 080901D4 */ j .L80240750 +/* EB957C 8024072C E4A00018 */ swc1 $f0, 0x18($a1) +.L80240730: +/* EB9580 80240730 3C018025 */ lui $at, %hi(D_802491F8) +/* EB9584 80240734 D42291F8 */ ldc1 $f2, %lo(D_802491F8)($at) +/* EB9588 80240738 44820000 */ mtc1 $v0, $f0 +/* EB958C 8024073C 00000000 */ nop +/* EB9590 80240740 46800021 */ cvt.d.w $f0, $f0 +/* EB9594 80240744 46220003 */ div.d $f0, $f0, $f2 +/* EB9598 80240748 46200020 */ cvt.s.d $f0, $f0 +/* EB959C 8024074C E4A00018 */ swc1 $f0, 0x18($a1) +.L80240750: +/* EB95A0 80240750 24020001 */ addiu $v0, $zero, 1 +/* EB95A4 80240754 AE220070 */ sw $v0, 0x70($s1) +/* EB95A8 80240758 8FBF001C */ lw $ra, 0x1c($sp) +/* EB95AC 8024075C 8FB20018 */ lw $s2, 0x18($sp) +/* EB95B0 80240760 8FB10014 */ lw $s1, 0x14($sp) +/* EB95B4 80240764 8FB00010 */ lw $s0, 0x10($sp) +/* EB95B8 80240768 03E00008 */ jr $ra +/* EB95BC 8024076C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EB8E90/func_80240770_EB95C0.s b/asm/nonmatchings/code_EB8E90/func_80240770_EB95C0.s new file mode 100644 index 0000000000..cb575e94ca --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_80240770_EB95C0.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240770_EB95C0 +/* EB95C0 80240770 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB95C4 80240774 AFB10014 */ sw $s1, 0x14($sp) +/* EB95C8 80240778 0080882D */ daddu $s1, $a0, $zero +/* EB95CC 8024077C AFBF0018 */ sw $ra, 0x18($sp) +/* EB95D0 80240780 AFB00010 */ sw $s0, 0x10($sp) +/* EB95D4 80240784 8E300148 */ lw $s0, 0x148($s1) +/* EB95D8 80240788 0C00F92F */ jal func_8003E4BC +/* EB95DC 8024078C 86040008 */ lh $a0, 8($s0) +/* EB95E0 80240790 8E0300CC */ lw $v1, 0xcc($s0) +/* EB95E4 80240794 3C014120 */ lui $at, 0x4120 +/* EB95E8 80240798 44812000 */ mtc1 $at, $f4 +/* EB95EC 8024079C 3C014000 */ lui $at, 0x4000 +/* EB95F0 802407A0 44810000 */ mtc1 $at, $f0 +/* EB95F4 802407A4 C442003C */ lwc1 $f2, 0x3c($v0) +/* EB95F8 802407A8 8C640010 */ lw $a0, 0x10($v1) +/* EB95FC 802407AC 8C430000 */ lw $v1, ($v0) +/* EB9600 802407B0 E444001C */ swc1 $f4, 0x1c($v0) +/* EB9604 802407B4 E4400014 */ swc1 $f0, 0x14($v0) +/* EB9608 802407B8 E4420064 */ swc1 $f2, 0x64($v0) +/* EB960C 802407BC 34630800 */ ori $v1, $v1, 0x800 +/* EB9610 802407C0 AC430000 */ sw $v1, ($v0) +/* EB9614 802407C4 AC440028 */ sw $a0, 0x28($v0) +/* EB9618 802407C8 2402000B */ addiu $v0, $zero, 0xb +/* EB961C 802407CC AE220070 */ sw $v0, 0x70($s1) +/* EB9620 802407D0 8FBF0018 */ lw $ra, 0x18($sp) +/* EB9624 802407D4 8FB10014 */ lw $s1, 0x14($sp) +/* EB9628 802407D8 8FB00010 */ lw $s0, 0x10($sp) +/* EB962C 802407DC 03E00008 */ jr $ra +/* EB9630 802407E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EB8E90/func_802407E4_EB9634.s b/asm/nonmatchings/code_EB8E90/func_802407E4_EB9634.s new file mode 100644 index 0000000000..88ccb736f7 --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_802407E4_EB9634.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407E4_EB9634 +/* EB9634 802407E4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB9638 802407E8 AFB00010 */ sw $s0, 0x10($sp) +/* EB963C 802407EC 0080802D */ daddu $s0, $a0, $zero +/* EB9640 802407F0 AFBF0014 */ sw $ra, 0x14($sp) +/* EB9644 802407F4 8E020148 */ lw $v0, 0x148($s0) +/* EB9648 802407F8 0C00F92F */ jal func_8003E4BC +/* EB964C 802407FC 84440008 */ lh $a0, 8($v0) +/* EB9650 80240800 0040202D */ daddu $a0, $v0, $zero +/* EB9654 80240804 C482003C */ lwc1 $f2, 0x3c($a0) +/* EB9658 80240808 C480001C */ lwc1 $f0, 0x1c($a0) +/* EB965C 8024080C 46001080 */ add.s $f2, $f2, $f0 +/* EB9660 80240810 C4840014 */ lwc1 $f4, 0x14($a0) +/* EB9664 80240814 46040001 */ sub.s $f0, $f0, $f4 +/* EB9668 80240818 C4840064 */ lwc1 $f4, 0x64($a0) +/* EB966C 8024081C 4602203C */ c.lt.s $f4, $f2 +/* EB9670 80240820 E482003C */ swc1 $f2, 0x3c($a0) +/* EB9674 80240824 45010009 */ bc1t .L8024084C +/* EB9678 80240828 E480001C */ swc1 $f0, 0x1c($a0) +/* EB967C 8024082C 8C820000 */ lw $v0, ($a0) +/* EB9680 80240830 2403F7FF */ addiu $v1, $zero, -0x801 +/* EB9684 80240834 E484003C */ swc1 $f4, 0x3c($a0) +/* EB9688 80240838 AC80001C */ sw $zero, 0x1c($a0) +/* EB968C 8024083C 00431024 */ and $v0, $v0, $v1 +/* EB9690 80240840 AC820000 */ sw $v0, ($a0) +/* EB9694 80240844 2402000C */ addiu $v0, $zero, 0xc +/* EB9698 80240848 AE020070 */ sw $v0, 0x70($s0) +.L8024084C: +/* EB969C 8024084C 8FBF0014 */ lw $ra, 0x14($sp) +/* EB96A0 80240850 8FB00010 */ lw $s0, 0x10($sp) +/* EB96A4 80240854 03E00008 */ jr $ra +/* EB96A8 80240858 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB8E90/func_8024085C_EB96AC.s b/asm/nonmatchings/code_EB8E90/func_8024085C_EB96AC.s new file mode 100644 index 0000000000..cdfcb2605f --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_8024085C_EB96AC.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024085C_EB96AC +/* EB96AC 8024085C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EB96B0 80240860 AFB3001C */ sw $s3, 0x1c($sp) +/* EB96B4 80240864 0080982D */ daddu $s3, $a0, $zero +/* EB96B8 80240868 AFBF0020 */ sw $ra, 0x20($sp) +/* EB96BC 8024086C AFB20018 */ sw $s2, 0x18($sp) +/* EB96C0 80240870 AFB10014 */ sw $s1, 0x14($sp) +/* EB96C4 80240874 AFB00010 */ sw $s0, 0x10($sp) +/* EB96C8 80240878 F7B40028 */ sdc1 $f20, 0x28($sp) +/* EB96CC 8024087C 8E710148 */ lw $s1, 0x148($s3) +/* EB96D0 80240880 86240008 */ lh $a0, 8($s1) +/* EB96D4 80240884 0C00F92F */ jal func_8003E4BC +/* EB96D8 80240888 00A0802D */ daddu $s0, $a1, $zero +/* EB96DC 8024088C 8E040020 */ lw $a0, 0x20($s0) +/* EB96E0 80240890 0040902D */ daddu $s2, $v0, $zero +/* EB96E4 80240894 00041FC2 */ srl $v1, $a0, 0x1f +/* EB96E8 80240898 00832021 */ addu $a0, $a0, $v1 +/* EB96EC 8024089C 00042043 */ sra $a0, $a0, 1 +/* EB96F0 802408A0 0C00AB3B */ jal func_8002ACEC +/* EB96F4 802408A4 24840001 */ addiu $a0, $a0, 1 +/* EB96F8 802408A8 8E030020 */ lw $v1, 0x20($s0) +/* EB96FC 802408AC C64C0038 */ lwc1 $f12, 0x38($s2) +/* EB9700 802408B0 000327C2 */ srl $a0, $v1, 0x1f +/* EB9704 802408B4 00641821 */ addu $v1, $v1, $a0 +/* EB9708 802408B8 00031843 */ sra $v1, $v1, 1 +/* EB970C 802408BC 00621821 */ addu $v1, $v1, $v0 +/* EB9710 802408C0 A643008E */ sh $v1, 0x8e($s2) +/* EB9714 802408C4 8E2200CC */ lw $v0, 0xcc($s1) +/* EB9718 802408C8 C64E0040 */ lwc1 $f14, 0x40($s2) +/* EB971C 802408CC 8C42000C */ lw $v0, 0xc($v0) +/* EB9720 802408D0 AE420028 */ sw $v0, 0x28($s2) +/* EB9724 802408D4 C6000018 */ lwc1 $f0, 0x18($s0) +/* EB9728 802408D8 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EB972C 802408DC 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EB9730 802408E0 E6400018 */ swc1 $f0, 0x18($s2) +/* EB9734 802408E4 8C460028 */ lw $a2, 0x28($v0) +/* EB9738 802408E8 0C00ABDC */ jal fio_validate_header_checksums +/* EB973C 802408EC 8C470030 */ lw $a3, 0x30($v0) +/* EB9740 802408F0 46000506 */ mov.s $f20, $f0 +/* EB9744 802408F4 C64C000C */ lwc1 $f12, 0xc($s2) +/* EB9748 802408F8 0C00ABC6 */ jal func_8002AF18 +/* EB974C 802408FC 4600A386 */ mov.s $f14, $f20 +/* EB9750 80240900 46000086 */ mov.s $f2, $f0 +/* EB9754 80240904 8E02001C */ lw $v0, 0x1c($s0) +/* EB9758 80240908 46001005 */ abs.s $f0, $f2 +/* EB975C 8024090C 44822000 */ mtc1 $v0, $f4 +/* EB9760 80240910 00000000 */ nop +/* EB9764 80240914 46802120 */ cvt.s.w $f4, $f4 +/* EB9768 80240918 4600203C */ c.lt.s $f4, $f0 +/* EB976C 8024091C 00000000 */ nop +/* EB9770 80240920 4500000D */ bc1f .L80240958 +/* EB9774 80240924 00000000 */ nop +/* EB9778 80240928 44800000 */ mtc1 $zero, $f0 +/* EB977C 8024092C C654000C */ lwc1 $f20, 0xc($s2) +/* EB9780 80240930 4600103C */ c.lt.s $f2, $f0 +/* EB9784 80240934 00000000 */ nop +/* EB9788 80240938 45000006 */ bc1f .L80240954 +/* EB978C 8024093C 00021023 */ negu $v0, $v0 +/* EB9790 80240940 44820000 */ mtc1 $v0, $f0 +/* EB9794 80240944 00000000 */ nop +/* EB9798 80240948 46800020 */ cvt.s.w $f0, $f0 +/* EB979C 8024094C 08090256 */ j .L80240958 +/* EB97A0 80240950 4600A500 */ add.s $f20, $f20, $f0 +.L80240954: +/* EB97A4 80240954 4604A500 */ add.s $f20, $f20, $f4 +.L80240958: +/* EB97A8 80240958 0C00AB85 */ jal func_8002AE14 +/* EB97AC 8024095C 4600A306 */ mov.s $f12, $f20 +/* EB97B0 80240960 2402000D */ addiu $v0, $zero, 0xd +/* EB97B4 80240964 E640000C */ swc1 $f0, 0xc($s2) +/* EB97B8 80240968 AE620070 */ sw $v0, 0x70($s3) +/* EB97BC 8024096C 8FBF0020 */ lw $ra, 0x20($sp) +/* EB97C0 80240970 8FB3001C */ lw $s3, 0x1c($sp) +/* EB97C4 80240974 8FB20018 */ lw $s2, 0x18($sp) +/* EB97C8 80240978 8FB10014 */ lw $s1, 0x14($sp) +/* EB97CC 8024097C 8FB00010 */ lw $s0, 0x10($sp) +/* EB97D0 80240980 D7B40028 */ ldc1 $f20, 0x28($sp) +/* EB97D4 80240984 03E00008 */ jr $ra +/* EB97D8 80240988 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EB8E90/func_8024098C_EB97DC.s b/asm/nonmatchings/code_EB8E90/func_8024098C_EB97DC.s new file mode 100644 index 0000000000..4bd2280d43 --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_8024098C_EB97DC.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024098C_EB97DC +/* EB97DC 8024098C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EB97E0 80240990 AFB3003C */ sw $s3, 0x3c($sp) +/* EB97E4 80240994 0080982D */ daddu $s3, $a0, $zero +/* EB97E8 80240998 AFBF0040 */ sw $ra, 0x40($sp) +/* EB97EC 8024099C AFB20038 */ sw $s2, 0x38($sp) +/* EB97F0 802409A0 AFB10034 */ sw $s1, 0x34($sp) +/* EB97F4 802409A4 AFB00030 */ sw $s0, 0x30($sp) +/* EB97F8 802409A8 8E720148 */ lw $s2, 0x148($s3) +/* EB97FC 802409AC 00A0882D */ daddu $s1, $a1, $zero +/* EB9800 802409B0 86440008 */ lh $a0, 8($s2) +/* EB9804 802409B4 0C00F92F */ jal func_8003E4BC +/* EB9808 802409B8 00C0802D */ daddu $s0, $a2, $zero +/* EB980C 802409BC 0200202D */ daddu $a0, $s0, $zero +/* EB9810 802409C0 0240282D */ daddu $a1, $s2, $zero +/* EB9814 802409C4 24030001 */ addiu $v1, $zero, 1 +/* EB9818 802409C8 AFA30010 */ sw $v1, 0x10($sp) +/* EB981C 802409CC 8E260024 */ lw $a2, 0x24($s1) +/* EB9820 802409D0 8E270028 */ lw $a3, 0x28($s1) +/* EB9824 802409D4 0C013469 */ jal func_8004D1A4 +/* EB9828 802409D8 0040802D */ daddu $s0, $v0, $zero +/* EB982C 802409DC 1440001E */ bnez $v0, .L80240A58 +/* EB9830 802409E0 0200202D */ daddu $a0, $s0, $zero +/* EB9834 802409E4 24040002 */ addiu $a0, $zero, 2 +/* EB9838 802409E8 0200282D */ daddu $a1, $s0, $zero +/* EB983C 802409EC 0000302D */ daddu $a2, $zero, $zero +/* EB9840 802409F0 860300A8 */ lh $v1, 0xa8($s0) +/* EB9844 802409F4 3C013F80 */ lui $at, 0x3f80 +/* EB9848 802409F8 44810000 */ mtc1 $at, $f0 +/* EB984C 802409FC 3C014000 */ lui $at, 0x4000 +/* EB9850 80240A00 44811000 */ mtc1 $at, $f2 +/* EB9854 80240A04 3C01C1A0 */ lui $at, 0xc1a0 +/* EB9858 80240A08 44812000 */ mtc1 $at, $f4 +/* EB985C 80240A0C 2402000F */ addiu $v0, $zero, 0xf +/* EB9860 80240A10 AFA2001C */ sw $v0, 0x1c($sp) +/* EB9864 80240A14 44833000 */ mtc1 $v1, $f6 +/* EB9868 80240A18 00000000 */ nop +/* EB986C 80240A1C 468031A0 */ cvt.s.w $f6, $f6 +/* EB9870 80240A20 44073000 */ mfc1 $a3, $f6 +/* EB9874 80240A24 27A20028 */ addiu $v0, $sp, 0x28 +/* EB9878 80240A28 AFA20020 */ sw $v0, 0x20($sp) +/* EB987C 80240A2C E7A00010 */ swc1 $f0, 0x10($sp) +/* EB9880 80240A30 E7A20014 */ swc1 $f2, 0x14($sp) +/* EB9884 80240A34 0C01D444 */ jal func_80075110 +/* EB9888 80240A38 E7A40018 */ swc1 $f4, 0x18($sp) +/* EB988C 80240A3C 8E4200CC */ lw $v0, 0xcc($s2) +/* EB9890 80240A40 8C430000 */ lw $v1, ($v0) +/* EB9894 80240A44 24020019 */ addiu $v0, $zero, 0x19 +/* EB9898 80240A48 A602008E */ sh $v0, 0x8e($s0) +/* EB989C 80240A4C 2402000E */ addiu $v0, $zero, 0xe +/* EB98A0 80240A50 080902A3 */ j .L80240A8C +/* EB98A4 80240A54 AE030028 */ sw $v1, 0x28($s0) +.L80240A58: +/* EB98A8 80240A58 0C010420 */ jal func_80041080 +/* EB98AC 80240A5C 24050001 */ addiu $a1, $zero, 1 +/* EB98B0 80240A60 8E050018 */ lw $a1, 0x18($s0) +/* EB98B4 80240A64 8E06000C */ lw $a2, 0xc($s0) +/* EB98B8 80240A68 0C00F909 */ jal func_8003E424 +/* EB98BC 80240A6C 0200202D */ daddu $a0, $s0, $zero +/* EB98C0 80240A70 8602008E */ lh $v0, 0x8e($s0) +/* EB98C4 80240A74 9603008E */ lhu $v1, 0x8e($s0) +/* EB98C8 80240A78 18400003 */ blez $v0, .L80240A88 +/* EB98CC 80240A7C 2462FFFF */ addiu $v0, $v1, -1 +/* EB98D0 80240A80 080902A4 */ j .L80240A90 +/* EB98D4 80240A84 A602008E */ sh $v0, 0x8e($s0) +.L80240A88: +/* EB98D8 80240A88 2402000C */ addiu $v0, $zero, 0xc +.L80240A8C: +/* EB98DC 80240A8C AE620070 */ sw $v0, 0x70($s3) +.L80240A90: +/* EB98E0 80240A90 8FBF0040 */ lw $ra, 0x40($sp) +/* EB98E4 80240A94 8FB3003C */ lw $s3, 0x3c($sp) +/* EB98E8 80240A98 8FB20038 */ lw $s2, 0x38($sp) +/* EB98EC 80240A9C 8FB10034 */ lw $s1, 0x34($sp) +/* EB98F0 80240AA0 8FB00030 */ lw $s0, 0x30($sp) +/* EB98F4 80240AA4 03E00008 */ jr $ra +/* EB98F8 80240AA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EB8E90/func_80240AAC_EB98FC.s b/asm/nonmatchings/code_EB8E90/func_80240AAC_EB98FC.s new file mode 100644 index 0000000000..dc95b7425f --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_80240AAC_EB98FC.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AAC_EB98FC +/* EB98FC 80240AAC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB9900 80240AB0 AFB10014 */ sw $s1, 0x14($sp) +/* EB9904 80240AB4 0080882D */ daddu $s1, $a0, $zero +/* EB9908 80240AB8 AFBF0018 */ sw $ra, 0x18($sp) +/* EB990C 80240ABC AFB00010 */ sw $s0, 0x10($sp) +/* EB9910 80240AC0 8E300148 */ lw $s0, 0x148($s1) +/* EB9914 80240AC4 0C00F92F */ jal func_8003E4BC +/* EB9918 80240AC8 86040008 */ lh $a0, 8($s0) +/* EB991C 80240ACC 9443008E */ lhu $v1, 0x8e($v0) +/* EB9920 80240AD0 2463FFFF */ addiu $v1, $v1, -1 +/* EB9924 80240AD4 A443008E */ sh $v1, 0x8e($v0) +/* EB9928 80240AD8 00031C00 */ sll $v1, $v1, 0x10 +/* EB992C 80240ADC 14600008 */ bnez $v1, .L80240B00 +/* EB9930 80240AE0 00000000 */ nop +/* EB9934 80240AE4 8E0200B0 */ lw $v0, 0xb0($s0) +/* EB9938 80240AE8 30420080 */ andi $v0, $v0, 0x80 +/* EB993C 80240AEC 10400003 */ beqz $v0, .L80240AFC +/* EB9940 80240AF0 2402000F */ addiu $v0, $zero, 0xf +/* EB9944 80240AF4 080902C0 */ j .L80240B00 +/* EB9948 80240AF8 AE220070 */ sw $v0, 0x70($s1) +.L80240AFC: +/* EB994C 80240AFC AE200070 */ sw $zero, 0x70($s1) +.L80240B00: +/* EB9950 80240B00 8FBF0018 */ lw $ra, 0x18($sp) +/* EB9954 80240B04 8FB10014 */ lw $s1, 0x14($sp) +/* EB9958 80240B08 8FB00010 */ lw $s0, 0x10($sp) +/* EB995C 80240B0C 03E00008 */ jr $ra +/* EB9960 80240B10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EB8E90/func_80240B14_EB9964.s b/asm/nonmatchings/code_EB8E90/func_80240B14_EB9964.s new file mode 100644 index 0000000000..ee5063a24e --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_80240B14_EB9964.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B14_EB9964 +/* EB9964 80240B14 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB9968 80240B18 AFB10014 */ sw $s1, 0x14($sp) +/* EB996C 80240B1C 0080882D */ daddu $s1, $a0, $zero +/* EB9970 80240B20 AFBF001C */ sw $ra, 0x1c($sp) +/* EB9974 80240B24 AFB20018 */ sw $s2, 0x18($sp) +/* EB9978 80240B28 AFB00010 */ sw $s0, 0x10($sp) +/* EB997C 80240B2C 8E300148 */ lw $s0, 0x148($s1) +/* EB9980 80240B30 86040008 */ lh $a0, 8($s0) +/* EB9984 80240B34 0C00F92F */ jal func_8003E4BC +/* EB9988 80240B38 00A0902D */ daddu $s2, $a1, $zero +/* EB998C 80240B3C 8E0300D0 */ lw $v1, 0xd0($s0) +/* EB9990 80240B40 8E240078 */ lw $a0, 0x78($s1) +/* EB9994 80240B44 8C630000 */ lw $v1, ($v1) +/* EB9998 80240B48 0083182A */ slt $v1, $a0, $v1 +/* EB999C 80240B4C 10600013 */ beqz $v1, .L80240B9C +/* EB99A0 80240B50 0040302D */ daddu $a2, $v0, $zero +/* EB99A4 80240B54 00041040 */ sll $v0, $a0, 1 +/* EB99A8 80240B58 00441021 */ addu $v0, $v0, $a0 +/* EB99AC 80240B5C 00022880 */ sll $a1, $v0, 2 +.L80240B60: +/* EB99B0 80240B60 8E0300D0 */ lw $v1, 0xd0($s0) +/* EB99B4 80240B64 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* EB99B8 80240B68 00A31021 */ addu $v0, $a1, $v1 +/* EB99BC 80240B6C C4400008 */ lwc1 $f0, 8($v0) +/* EB99C0 80240B70 46800020 */ cvt.s.w $f0, $f0 +/* EB99C4 80240B74 4602003E */ c.le.s $f0, $f2 +/* EB99C8 80240B78 00000000 */ nop +/* EB99CC 80240B7C 45020003 */ bc1fl .L80240B8C +/* EB99D0 80240B80 24840001 */ addiu $a0, $a0, 1 +/* EB99D4 80240B84 080902E7 */ j .L80240B9C +/* EB99D8 80240B88 AE240078 */ sw $a0, 0x78($s1) +.L80240B8C: +/* EB99DC 80240B8C 8C620000 */ lw $v0, ($v1) +/* EB99E0 80240B90 0082102A */ slt $v0, $a0, $v0 +/* EB99E4 80240B94 1440FFF2 */ bnez $v0, .L80240B60 +/* EB99E8 80240B98 24A5000C */ addiu $a1, $a1, 0xc +.L80240B9C: +/* EB99EC 80240B9C C6400000 */ lwc1 $f0, ($s2) +/* EB99F0 80240BA0 E4C00018 */ swc1 $f0, 0x18($a2) +/* EB99F4 80240BA4 8E0200CC */ lw $v0, 0xcc($s0) +/* EB99F8 80240BA8 8C420004 */ lw $v0, 4($v0) +/* EB99FC 80240BAC ACC20028 */ sw $v0, 0x28($a2) +/* EB9A00 80240BB0 24020001 */ addiu $v0, $zero, 1 +/* EB9A04 80240BB4 AE200074 */ sw $zero, 0x74($s1) +/* EB9A08 80240BB8 AE220070 */ sw $v0, 0x70($s1) +/* EB9A0C 80240BBC 8FBF001C */ lw $ra, 0x1c($sp) +/* EB9A10 80240BC0 8FB20018 */ lw $s2, 0x18($sp) +/* EB9A14 80240BC4 8FB10014 */ lw $s1, 0x14($sp) +/* EB9A18 80240BC8 8FB00010 */ lw $s0, 0x10($sp) +/* EB9A1C 80240BCC 03E00008 */ jr $ra +/* EB9A20 80240BD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s b/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s new file mode 100644 index 0000000000..92dfaaf572 --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s @@ -0,0 +1,213 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BD4_EB9A24 +/* EB9A24 80240BD4 27BDFF98 */ addiu $sp, $sp, -0x68 +/* EB9A28 80240BD8 AFB5005C */ sw $s5, 0x5c($sp) +/* EB9A2C 80240BDC 0080A82D */ daddu $s5, $a0, $zero +/* EB9A30 80240BE0 AFBF0060 */ sw $ra, 0x60($sp) +/* EB9A34 80240BE4 AFB40058 */ sw $s4, 0x58($sp) +/* EB9A38 80240BE8 AFB30054 */ sw $s3, 0x54($sp) +/* EB9A3C 80240BEC AFB20050 */ sw $s2, 0x50($sp) +/* EB9A40 80240BF0 AFB1004C */ sw $s1, 0x4c($sp) +/* EB9A44 80240BF4 AFB00048 */ sw $s0, 0x48($sp) +/* EB9A48 80240BF8 8EB10148 */ lw $s1, 0x148($s5) +/* EB9A4C 80240BFC 86240008 */ lh $a0, 8($s1) +/* EB9A50 80240C00 0C00F92F */ jal func_8003E4BC +/* EB9A54 80240C04 00A0802D */ daddu $s0, $a1, $zero +/* EB9A58 80240C08 8EA3000C */ lw $v1, 0xc($s5) +/* EB9A5C 80240C0C 02A0202D */ daddu $a0, $s5, $zero +/* EB9A60 80240C10 8C650000 */ lw $a1, ($v1) +/* EB9A64 80240C14 0C0B53A3 */ jal func_802D4E8C +/* EB9A68 80240C18 0040902D */ daddu $s2, $v0, $zero +/* EB9A6C 80240C1C AFA00018 */ sw $zero, 0x18($sp) +/* EB9A70 80240C20 8E2300D0 */ lw $v1, 0xd0($s1) +/* EB9A74 80240C24 8C630094 */ lw $v1, 0x94($v1) +/* EB9A78 80240C28 AFA3001C */ sw $v1, 0x1c($sp) +/* EB9A7C 80240C2C 8E2300D0 */ lw $v1, 0xd0($s1) +/* EB9A80 80240C30 8C630080 */ lw $v1, 0x80($v1) +/* EB9A84 80240C34 AFA30020 */ sw $v1, 0x20($sp) +/* EB9A88 80240C38 8E2300D0 */ lw $v1, 0xd0($s1) +/* EB9A8C 80240C3C 8C630088 */ lw $v1, 0x88($v1) +/* EB9A90 80240C40 AFA30024 */ sw $v1, 0x24($sp) +/* EB9A94 80240C44 8E2300D0 */ lw $v1, 0xd0($s1) +/* EB9A98 80240C48 8C63008C */ lw $v1, 0x8c($v1) +/* EB9A9C 80240C4C AFA30028 */ sw $v1, 0x28($sp) +/* EB9AA0 80240C50 8E2300D0 */ lw $v1, 0xd0($s1) +/* EB9AA4 80240C54 3C014282 */ lui $at, 0x4282 +/* EB9AA8 80240C58 44810000 */ mtc1 $at, $f0 +/* EB9AAC 80240C5C 8C630090 */ lw $v1, 0x90($v1) +/* EB9AB0 80240C60 E7A00030 */ swc1 $f0, 0x30($sp) +/* EB9AB4 80240C64 A7A00034 */ sh $zero, 0x34($sp) +/* EB9AB8 80240C68 AFA3002C */ sw $v1, 0x2c($sp) +/* EB9ABC 80240C6C C6400038 */ lwc1 $f0, 0x38($s2) +/* EB9AC0 80240C70 E6200108 */ swc1 $f0, 0x108($s1) +/* EB9AC4 80240C74 C640003C */ lwc1 $f0, 0x3c($s2) +/* EB9AC8 80240C78 27B40018 */ addiu $s4, $sp, 0x18 +/* EB9ACC 80240C7C E620010C */ swc1 $f0, 0x10c($s1) +/* EB9AD0 80240C80 3C0138D1 */ lui $at, 0x38d1 +/* EB9AD4 80240C84 3421B717 */ ori $at, $at, 0xb717 +/* EB9AD8 80240C88 44810000 */ mtc1 $at, $f0 +/* EB9ADC 80240C8C C6420040 */ lwc1 $f2, 0x40($s2) +/* EB9AE0 80240C90 0040982D */ daddu $s3, $v0, $zero +/* EB9AE4 80240C94 E6200114 */ swc1 $f0, 0x114($s1) +/* EB9AE8 80240C98 E6200118 */ swc1 $f0, 0x118($s1) +/* EB9AEC 80240C9C 16000005 */ bnez $s0, .L80240CB4 +/* EB9AF0 80240CA0 E6220110 */ swc1 $f2, 0x110($s1) +/* EB9AF4 80240CA4 8E2200B0 */ lw $v0, 0xb0($s1) +/* EB9AF8 80240CA8 30420004 */ andi $v0, $v0, 4 +/* EB9AFC 80240CAC 10400044 */ beqz $v0, .L80240DC0 +/* EB9B00 80240CB0 00000000 */ nop +.L80240CB4: +/* EB9B04 80240CB4 2404F7FF */ addiu $a0, $zero, -0x801 +/* EB9B08 80240CB8 AEA00070 */ sw $zero, 0x70($s5) +/* EB9B0C 80240CBC A640008E */ sh $zero, 0x8e($s2) +/* EB9B10 80240CC0 8E2200CC */ lw $v0, 0xcc($s1) +/* EB9B14 80240CC4 8E430000 */ lw $v1, ($s2) +/* EB9B18 80240CC8 8C420000 */ lw $v0, ($v0) +/* EB9B1C 80240CCC 00641824 */ and $v1, $v1, $a0 +/* EB9B20 80240CD0 AE430000 */ sw $v1, ($s2) +/* EB9B24 80240CD4 AE420028 */ sw $v0, 0x28($s2) +/* EB9B28 80240CD8 8E2200D0 */ lw $v0, 0xd0($s1) +/* EB9B2C 80240CDC 8C420098 */ lw $v0, 0x98($v0) +/* EB9B30 80240CE0 54400005 */ bnel $v0, $zero, .L80240CF8 +/* EB9B34 80240CE4 2402FDFF */ addiu $v0, $zero, -0x201 +/* EB9B38 80240CE8 34620200 */ ori $v0, $v1, 0x200 +/* EB9B3C 80240CEC 2403FFF7 */ addiu $v1, $zero, -9 +/* EB9B40 80240CF0 08090340 */ j .L80240D00 +/* EB9B44 80240CF4 00431024 */ and $v0, $v0, $v1 +.L80240CF8: +/* EB9B48 80240CF8 00621024 */ and $v0, $v1, $v0 +/* EB9B4C 80240CFC 34420008 */ ori $v0, $v0, 8 +.L80240D00: +/* EB9B50 80240D00 AE420000 */ sw $v0, ($s2) +/* EB9B54 80240D04 8E2200B0 */ lw $v0, 0xb0($s1) +/* EB9B58 80240D08 30420004 */ andi $v0, $v0, 4 +/* EB9B5C 80240D0C 10400008 */ beqz $v0, .L80240D30 +/* EB9B60 80240D10 24020063 */ addiu $v0, $zero, 0x63 +/* EB9B64 80240D14 AEA20070 */ sw $v0, 0x70($s5) +/* EB9B68 80240D18 AEA00074 */ sw $zero, 0x74($s5) +/* EB9B6C 80240D1C 8E2200B0 */ lw $v0, 0xb0($s1) +/* EB9B70 80240D20 2403FFFB */ addiu $v1, $zero, -5 +/* EB9B74 80240D24 00431024 */ and $v0, $v0, $v1 +/* EB9B78 80240D28 08090357 */ j .L80240D5C +/* EB9B7C 80240D2C AE2200B0 */ sw $v0, 0xb0($s1) +.L80240D30: +/* EB9B80 80240D30 8E220000 */ lw $v0, ($s1) +/* EB9B84 80240D34 3C034000 */ lui $v1, 0x4000 +/* EB9B88 80240D38 00431024 */ and $v0, $v0, $v1 +/* EB9B8C 80240D3C 10400007 */ beqz $v0, .L80240D5C +/* EB9B90 80240D40 3C03BFFF */ lui $v1, 0xbfff +/* EB9B94 80240D44 2402000C */ addiu $v0, $zero, 0xc +/* EB9B98 80240D48 AEA20070 */ sw $v0, 0x70($s5) +/* EB9B9C 80240D4C 8E220000 */ lw $v0, ($s1) +/* EB9BA0 80240D50 3463FFFF */ ori $v1, $v1, 0xffff +/* EB9BA4 80240D54 00431024 */ and $v0, $v0, $v1 +/* EB9BA8 80240D58 AE220000 */ sw $v0, ($s1) +.L80240D5C: +/* EB9BAC 80240D5C 27A50038 */ addiu $a1, $sp, 0x38 +/* EB9BB0 80240D60 27A6003C */ addiu $a2, $sp, 0x3c +/* EB9BB4 80240D64 C6400038 */ lwc1 $f0, 0x38($s2) +/* EB9BB8 80240D68 864200A8 */ lh $v0, 0xa8($s2) +/* EB9BBC 80240D6C 3C0142C8 */ lui $at, 0x42c8 +/* EB9BC0 80240D70 44812000 */ mtc1 $at, $f4 +/* EB9BC4 80240D74 44823000 */ mtc1 $v0, $f6 +/* EB9BC8 80240D78 00000000 */ nop +/* EB9BCC 80240D7C 468031A0 */ cvt.s.w $f6, $f6 +/* EB9BD0 80240D80 27A20044 */ addiu $v0, $sp, 0x44 +/* EB9BD4 80240D84 E7A00038 */ swc1 $f0, 0x38($sp) +/* EB9BD8 80240D88 C640003C */ lwc1 $f0, 0x3c($s2) +/* EB9BDC 80240D8C C6420040 */ lwc1 $f2, 0x40($s2) +/* EB9BE0 80240D90 46060000 */ add.s $f0, $f0, $f6 +/* EB9BE4 80240D94 E7A40044 */ swc1 $f4, 0x44($sp) +/* EB9BE8 80240D98 E7A20040 */ swc1 $f2, 0x40($sp) +/* EB9BEC 80240D9C E7A0003C */ swc1 $f0, 0x3c($sp) +/* EB9BF0 80240DA0 AFA20010 */ sw $v0, 0x10($sp) +/* EB9BF4 80240DA4 8E440080 */ lw $a0, 0x80($s2) +/* EB9BF8 80240DA8 0C03908F */ jal func_800E423C +/* EB9BFC 80240DAC 27A70040 */ addiu $a3, $sp, 0x40 +/* EB9C00 80240DB0 10400003 */ beqz $v0, .L80240DC0 +/* EB9C04 80240DB4 00000000 */ nop +/* EB9C08 80240DB8 C7A0003C */ lwc1 $f0, 0x3c($sp) +/* EB9C0C 80240DBC E640003C */ swc1 $f0, 0x3c($s2) +.L80240DC0: +/* EB9C10 80240DC0 8EA30070 */ lw $v1, 0x70($s5) +/* EB9C14 80240DC4 2C620064 */ sltiu $v0, $v1, 0x64 +/* EB9C18 80240DC8 10400042 */ beqz $v0, .L80240ED4 +/* EB9C1C 80240DCC 00031080 */ sll $v0, $v1, 2 +/* EB9C20 80240DD0 3C018025 */ lui $at, %hi(D_80249200) +/* EB9C24 80240DD4 00220821 */ addu $at, $at, $v0 +/* EB9C28 80240DD8 8C229200 */ lw $v0, %lo(D_80249200)($at) +/* EB9C2C 80240DDC 00400008 */ jr $v0 +/* EB9C30 80240DE0 00000000 */ nop +/* EB9C34 80240DE4 02A0202D */ daddu $a0, $s5, $zero +/* EB9C38 80240DE8 0260282D */ daddu $a1, $s3, $zero +/* EB9C3C 80240DEC 0C090010 */ jal func_80240040_EB8E90 +/* EB9C40 80240DF0 0280302D */ daddu $a2, $s4, $zero +/* EB9C44 80240DF4 02A0202D */ daddu $a0, $s5, $zero +/* EB9C48 80240DF8 0260282D */ daddu $a1, $s3, $zero +/* EB9C4C 80240DFC 0C090066 */ jal func_80240198_EB8FE8 +/* EB9C50 80240E00 0280302D */ daddu $a2, $s4, $zero +/* EB9C54 80240E04 080903B5 */ j .L80240ED4 +/* EB9C58 80240E08 00000000 */ nop +/* EB9C5C 80240E0C 02A0202D */ daddu $a0, $s5, $zero +/* EB9C60 80240E10 0260282D */ daddu $a1, $s3, $zero +/* EB9C64 80240E14 0C090110 */ jal func_80240440_EB9290 +/* EB9C68 80240E18 0280302D */ daddu $a2, $s4, $zero +/* EB9C6C 80240E1C 02A0202D */ daddu $a0, $s5, $zero +/* EB9C70 80240E20 0260282D */ daddu $a1, $s3, $zero +/* EB9C74 80240E24 0C090140 */ jal func_80240500_EB9350 +/* EB9C78 80240E28 0280302D */ daddu $a2, $s4, $zero +/* EB9C7C 80240E2C 080903B5 */ j .L80240ED4 +/* EB9C80 80240E30 00000000 */ nop +/* EB9C84 80240E34 02A0202D */ daddu $a0, $s5, $zero +/* EB9C88 80240E38 0260282D */ daddu $a1, $s3, $zero +/* EB9C8C 80240E3C 0C0901AF */ jal func_802406BC_EB950C +/* EB9C90 80240E40 0280302D */ daddu $a2, $s4, $zero +/* EB9C94 80240E44 080903B5 */ j .L80240ED4 +/* EB9C98 80240E48 00000000 */ nop +/* EB9C9C 80240E4C 02A0202D */ daddu $a0, $s5, $zero +/* EB9CA0 80240E50 0260282D */ daddu $a1, $s3, $zero +/* EB9CA4 80240E54 0C0901DC */ jal func_80240770_EB95C0 +/* EB9CA8 80240E58 0280302D */ daddu $a2, $s4, $zero +/* EB9CAC 80240E5C 02A0202D */ daddu $a0, $s5, $zero +/* EB9CB0 80240E60 0260282D */ daddu $a1, $s3, $zero +/* EB9CB4 80240E64 0C0901F9 */ jal func_802407E4_EB9634 +/* EB9CB8 80240E68 0280302D */ daddu $a2, $s4, $zero +/* EB9CBC 80240E6C 080903B5 */ j .L80240ED4 +/* EB9CC0 80240E70 00000000 */ nop +/* EB9CC4 80240E74 02A0202D */ daddu $a0, $s5, $zero +/* EB9CC8 80240E78 0260282D */ daddu $a1, $s3, $zero +/* EB9CCC 80240E7C 0C090217 */ jal func_8024085C_EB96AC +/* EB9CD0 80240E80 0280302D */ daddu $a2, $s4, $zero +/* EB9CD4 80240E84 02A0202D */ daddu $a0, $s5, $zero +/* EB9CD8 80240E88 0260282D */ daddu $a1, $s3, $zero +/* EB9CDC 80240E8C 0C090263 */ jal func_8024098C_EB97DC +/* EB9CE0 80240E90 0280302D */ daddu $a2, $s4, $zero +/* EB9CE4 80240E94 080903B5 */ j .L80240ED4 +/* EB9CE8 80240E98 00000000 */ nop +/* EB9CEC 80240E9C 02A0202D */ daddu $a0, $s5, $zero +/* EB9CF0 80240EA0 0260282D */ daddu $a1, $s3, $zero +/* EB9CF4 80240EA4 0C0902AB */ jal func_80240AAC_EB98FC +/* EB9CF8 80240EA8 0280302D */ daddu $a2, $s4, $zero +/* EB9CFC 80240EAC 080903B5 */ j .L80240ED4 +/* EB9D00 80240EB0 00000000 */ nop +/* EB9D04 80240EB4 02A0202D */ daddu $a0, $s5, $zero +/* EB9D08 80240EB8 0260282D */ daddu $a1, $s3, $zero +/* EB9D0C 80240EBC 0C0902C5 */ jal func_80240B14_EB9964 +/* EB9D10 80240EC0 0280302D */ daddu $a2, $s4, $zero +/* EB9D14 80240EC4 080903B5 */ j .L80240ED4 +/* EB9D18 80240EC8 00000000 */ nop +/* EB9D1C 80240ECC 0C013AE3 */ jal func_8004EB8C +/* EB9D20 80240ED0 02A0202D */ daddu $a0, $s5, $zero +.L80240ED4: +/* EB9D24 80240ED4 8FBF0060 */ lw $ra, 0x60($sp) +/* EB9D28 80240ED8 8FB5005C */ lw $s5, 0x5c($sp) +/* EB9D2C 80240EDC 8FB40058 */ lw $s4, 0x58($sp) +/* EB9D30 80240EE0 8FB30054 */ lw $s3, 0x54($sp) +/* EB9D34 80240EE4 8FB20050 */ lw $s2, 0x50($sp) +/* EB9D38 80240EE8 8FB1004C */ lw $s1, 0x4c($sp) +/* EB9D3C 80240EEC 8FB00048 */ lw $s0, 0x48($sp) +/* EB9D40 80240EF0 0000102D */ daddu $v0, $zero, $zero +/* EB9D44 80240EF4 03E00008 */ jr $ra +/* EB9D48 80240EF8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/code_EB8E90/func_80240EFC_EB9D4C.s b/asm/nonmatchings/code_EB8E90/func_80240EFC_EB9D4C.s new file mode 100644 index 0000000000..5df9367987 --- /dev/null +++ b/asm/nonmatchings/code_EB8E90/func_80240EFC_EB9D4C.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EFC_EB9D4C +/* EB9D4C 80240EFC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EB9D50 80240F00 AFBF0010 */ sw $ra, 0x10($sp) +/* EB9D54 80240F04 0C03C767 */ jal func_800F1D9C +/* EB9D58 80240F08 24040006 */ addiu $a0, $zero, 6 +/* EB9D5C 80240F0C 3C028011 */ lui $v0, %hi(D_80117840) +/* EB9D60 80240F10 24427840 */ addiu $v0, $v0, %lo(D_80117840) +/* EB9D64 80240F14 90430003 */ lbu $v1, 3($v0) +/* EB9D68 80240F18 90440006 */ lbu $a0, 6($v0) +/* EB9D6C 80240F1C A0430002 */ sb $v1, 2($v0) +/* EB9D70 80240F20 0C03C5CC */ jal func_800F1730 +/* EB9D74 80240F24 A0440005 */ sb $a0, 5($v0) +/* EB9D78 80240F28 8FBF0010 */ lw $ra, 0x10($sp) +/* EB9D7C 80240F2C 24020002 */ addiu $v0, $zero, 2 +/* EB9D80 80240F30 03E00008 */ jr $ra +/* EB9D84 80240F34 27BD0018 */ addiu $sp, $sp, 0x18 +/* EB9D88 80240F38 00000000 */ nop +/* EB9D8C 80240F3C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB9D90/func_80240F40_EB9D90.s b/asm/nonmatchings/code_EB9D90/func_80240F40_EB9D90.s new file mode 100644 index 0000000000..01eb264b81 --- /dev/null +++ b/asm/nonmatchings/code_EB9D90/func_80240F40_EB9D90.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F40_EB9D90 +/* EB9D90 80240F40 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EB9D94 80240F44 AFB00010 */ sw $s0, 0x10($sp) +/* EB9D98 80240F48 0080802D */ daddu $s0, $a0, $zero +/* EB9D9C 80240F4C AFB20018 */ sw $s2, 0x18($sp) +/* EB9DA0 80240F50 3C128011 */ lui $s2, %hi(D_80117578) +/* EB9DA4 80240F54 26527578 */ addiu $s2, $s2, %lo(D_80117578) +/* EB9DA8 80240F58 AFBF001C */ sw $ra, 0x1c($sp) +/* EB9DAC 80240F5C AFB10014 */ sw $s1, 0x14($sp) +/* EB9DB0 80240F60 C64000A8 */ lwc1 $f0, 0xa8($s2) +/* EB9DB4 80240F64 8E02000C */ lw $v0, 0xc($s0) +/* EB9DB8 80240F68 4600008D */ trunc.w.s $f2, $f0 +/* EB9DBC 80240F6C 44061000 */ mfc1 $a2, $f2 +/* EB9DC0 80240F70 8C450000 */ lw $a1, ($v0) +/* EB9DC4 80240F74 0C0B551A */ jal func_802D5468 +/* EB9DC8 80240F78 8C510004 */ lw $s1, 4($v0) +/* EB9DCC 80240F7C 0200202D */ daddu $a0, $s0, $zero +/* EB9DD0 80240F80 C6400080 */ lwc1 $f0, 0x80($s2) +/* EB9DD4 80240F84 4600008D */ trunc.w.s $f2, $f0 +/* EB9DD8 80240F88 44061000 */ mfc1 $a2, $f2 +/* EB9DDC 80240F8C 0C0B551A */ jal func_802D5468 +/* EB9DE0 80240F90 0220282D */ daddu $a1, $s1, $zero +/* EB9DE4 80240F94 8FBF001C */ lw $ra, 0x1c($sp) +/* EB9DE8 80240F98 8FB20018 */ lw $s2, 0x18($sp) +/* EB9DEC 80240F9C 8FB10014 */ lw $s1, 0x14($sp) +/* EB9DF0 80240FA0 8FB00010 */ lw $s0, 0x10($sp) +/* EB9DF4 80240FA4 24020002 */ addiu $v0, $zero, 2 +/* EB9DF8 80240FA8 03E00008 */ jr $ra +/* EB9DFC 80240FAC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EB9D90/func_80240FB0_EB9E00.s b/asm/nonmatchings/code_EB9D90/func_80240FB0_EB9E00.s new file mode 100644 index 0000000000..d7643dbc3b --- /dev/null +++ b/asm/nonmatchings/code_EB9D90/func_80240FB0_EB9E00.s @@ -0,0 +1,81 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FB0_EB9E00 +/* EB9E00 80240FB0 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* EB9E04 80240FB4 AFB00010 */ sw $s0, 0x10($sp) +/* EB9E08 80240FB8 0080802D */ daddu $s0, $a0, $zero +/* EB9E0C 80240FBC AFBF0018 */ sw $ra, 0x18($sp) +/* EB9E10 80240FC0 AFB10014 */ sw $s1, 0x14($sp) +/* EB9E14 80240FC4 F7BA0038 */ sdc1 $f26, 0x38($sp) +/* EB9E18 80240FC8 F7B80030 */ sdc1 $f24, 0x30($sp) +/* EB9E1C 80240FCC F7B60028 */ sdc1 $f22, 0x28($sp) +/* EB9E20 80240FD0 F7B40020 */ sdc1 $f20, 0x20($sp) +/* EB9E24 80240FD4 8E05008C */ lw $a1, 0x8c($s0) +/* EB9E28 80240FD8 0C0B53A3 */ jal func_802D4E8C +/* EB9E2C 80240FDC 0000202D */ daddu $a0, $zero, $zero +/* EB9E30 80240FE0 C60200A8 */ lwc1 $f2, 0xa8($s0) +/* EB9E34 80240FE4 468010A0 */ cvt.s.w $f2, $f2 +/* EB9E38 80240FE8 44061000 */ mfc1 $a2, $f2 +/* EB9E3C 80240FEC C60200B0 */ lwc1 $f2, 0xb0($s0) +/* EB9E40 80240FF0 468010A0 */ cvt.s.w $f2, $f2 +/* EB9E44 80240FF4 4482A000 */ mtc1 $v0, $f20 +/* EB9E48 80240FF8 00000000 */ nop +/* EB9E4C 80240FFC 4680A520 */ cvt.s.w $f20, $f20 +/* EB9E50 80241000 3C01C2A6 */ lui $at, 0xc2a6 +/* EB9E54 80241004 4481C000 */ mtc1 $at, $f24 +/* EB9E58 80241008 3C0142AE */ lui $at, 0x42ae +/* EB9E5C 8024100C 4481D000 */ mtc1 $at, $f26 +/* EB9E60 80241010 44071000 */ mfc1 $a3, $f2 +/* EB9E64 80241014 4600C306 */ mov.s $f12, $f24 +/* EB9E68 80241018 0C00AC71 */ jal func_8002B1C4 +/* EB9E6C 8024101C 4600D386 */ mov.s $f14, $f26 +/* EB9E70 80241020 4600C306 */ mov.s $f12, $f24 +/* EB9E74 80241024 4600D386 */ mov.s $f14, $f26 +/* EB9E78 80241028 C60200A8 */ lwc1 $f2, 0xa8($s0) +/* EB9E7C 8024102C 468010A0 */ cvt.s.w $f2, $f2 +/* EB9E80 80241030 44061000 */ mfc1 $a2, $f2 +/* EB9E84 80241034 C60200B0 */ lwc1 $f2, 0xb0($s0) +/* EB9E88 80241038 468010A0 */ cvt.s.w $f2, $f2 +/* EB9E8C 8024103C 44071000 */ mfc1 $a3, $f2 +/* EB9E90 80241040 0C00ABDC */ jal fio_validate_header_checksums +/* EB9E94 80241044 46000586 */ mov.s $f22, $f0 +/* EB9E98 80241048 0C00AB85 */ jal func_8002AE14 +/* EB9E9C 8024104C 46140301 */ sub.s $f12, $f0, $f20 +/* EB9EA0 80241050 46000506 */ mov.s $f20, $f0 +/* EB9EA4 80241054 0C00AD77 */ jal func_8002B5DC +/* EB9EA8 80241058 4600A306 */ mov.s $f12, $f20 +/* EB9EAC 8024105C 4600B002 */ mul.s $f0, $f22, $f0 +/* EB9EB0 80241060 00000000 */ nop +/* EB9EB4 80241064 46180000 */ add.s $f0, $f0, $f24 +/* EB9EB8 80241068 3C118011 */ lui $s1, %hi(D_80117578) +/* EB9EBC 8024106C 26317578 */ addiu $s1, $s1, %lo(D_80117578) +/* EB9EC0 80241070 E6200028 */ swc1 $f0, 0x28($s1) +/* EB9EC4 80241074 8E0500AC */ lw $a1, 0xac($s0) +/* EB9EC8 80241078 0C0B53A3 */ jal func_802D4E8C +/* EB9ECC 8024107C 0000202D */ daddu $a0, $zero, $zero +/* EB9ED0 80241080 0000202D */ daddu $a0, $zero, $zero +/* EB9ED4 80241084 8E050090 */ lw $a1, 0x90($s0) +/* EB9ED8 80241088 0C0B53A3 */ jal func_802D4E8C +/* EB9EDC 8024108C 0040802D */ daddu $s0, $v0, $zero +/* EB9EE0 80241090 4600A306 */ mov.s $f12, $f20 +/* EB9EE4 80241094 02028021 */ addu $s0, $s0, $v0 +/* EB9EE8 80241098 44900000 */ mtc1 $s0, $f0 +/* EB9EEC 8024109C 00000000 */ nop +/* EB9EF0 802410A0 46800020 */ cvt.s.w $f0, $f0 +/* EB9EF4 802410A4 0C00AD90 */ jal func_8002B640 +/* EB9EF8 802410A8 E620002C */ swc1 $f0, 0x2c($s1) +/* EB9EFC 802410AC 4600B582 */ mul.s $f22, $f22, $f0 +/* EB9F00 802410B0 00000000 */ nop +/* EB9F04 802410B4 4616D681 */ sub.s $f26, $f26, $f22 +/* EB9F08 802410B8 E63A0030 */ swc1 $f26, 0x30($s1) +/* EB9F0C 802410BC 8FBF0018 */ lw $ra, 0x18($sp) +/* EB9F10 802410C0 8FB10014 */ lw $s1, 0x14($sp) +/* EB9F14 802410C4 8FB00010 */ lw $s0, 0x10($sp) +/* EB9F18 802410C8 D7BA0038 */ ldc1 $f26, 0x38($sp) +/* EB9F1C 802410CC D7B80030 */ ldc1 $f24, 0x30($sp) +/* EB9F20 802410D0 D7B60028 */ ldc1 $f22, 0x28($sp) +/* EB9F24 802410D4 D7B40020 */ ldc1 $f20, 0x20($sp) +/* EB9F28 802410D8 24020002 */ addiu $v0, $zero, 2 +/* EB9F2C 802410DC 03E00008 */ jr $ra +/* EB9F30 802410E0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_EB9D90/func_802410E4_EB9F34.s b/asm/nonmatchings/code_EB9D90/func_802410E4_EB9F34.s new file mode 100644 index 0000000000..793aefd153 --- /dev/null +++ b/asm/nonmatchings/code_EB9D90/func_802410E4_EB9F34.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410E4_EB9F34 +/* EB9F34 802410E4 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* EB9F38 802410E8 AFB00010 */ sw $s0, 0x10($sp) +/* EB9F3C 802410EC 0080802D */ daddu $s0, $a0, $zero +/* EB9F40 802410F0 AFBF0018 */ sw $ra, 0x18($sp) +/* EB9F44 802410F4 AFB10014 */ sw $s1, 0x14($sp) +/* EB9F48 802410F8 F7BA0038 */ sdc1 $f26, 0x38($sp) +/* EB9F4C 802410FC F7B80030 */ sdc1 $f24, 0x30($sp) +/* EB9F50 80241100 F7B60028 */ sdc1 $f22, 0x28($sp) +/* EB9F54 80241104 F7B40020 */ sdc1 $f20, 0x20($sp) +/* EB9F58 80241108 0C00F10F */ jal func_8003C43C +/* EB9F5C 8024110C 0000202D */ daddu $a0, $zero, $zero +/* EB9F60 80241110 0000202D */ daddu $a0, $zero, $zero +/* EB9F64 80241114 8E05008C */ lw $a1, 0x8c($s0) +/* EB9F68 80241118 0C0B53A3 */ jal func_802D4E8C +/* EB9F6C 8024111C 0040882D */ daddu $s1, $v0, $zero +/* EB9F70 80241120 C60200B4 */ lwc1 $f2, 0xb4($s0) +/* EB9F74 80241124 468010A0 */ cvt.s.w $f2, $f2 +/* EB9F78 80241128 44061000 */ mfc1 $a2, $f2 +/* EB9F7C 8024112C C60200BC */ lwc1 $f2, 0xbc($s0) +/* EB9F80 80241130 468010A0 */ cvt.s.w $f2, $f2 +/* EB9F84 80241134 4482A000 */ mtc1 $v0, $f20 +/* EB9F88 80241138 00000000 */ nop +/* EB9F8C 8024113C 4680A520 */ cvt.s.w $f20, $f20 +/* EB9F90 80241140 3C01C2A6 */ lui $at, 0xc2a6 +/* EB9F94 80241144 4481C000 */ mtc1 $at, $f24 +/* EB9F98 80241148 3C0142AE */ lui $at, 0x42ae +/* EB9F9C 8024114C 4481D000 */ mtc1 $at, $f26 +/* EB9FA0 80241150 44071000 */ mfc1 $a3, $f2 +/* EB9FA4 80241154 4600C306 */ mov.s $f12, $f24 +/* EB9FA8 80241158 0C00AC71 */ jal func_8002B1C4 +/* EB9FAC 8024115C 4600D386 */ mov.s $f14, $f26 +/* EB9FB0 80241160 4600C306 */ mov.s $f12, $f24 +/* EB9FB4 80241164 4600D386 */ mov.s $f14, $f26 +/* EB9FB8 80241168 C60200B4 */ lwc1 $f2, 0xb4($s0) +/* EB9FBC 8024116C 468010A0 */ cvt.s.w $f2, $f2 +/* EB9FC0 80241170 44061000 */ mfc1 $a2, $f2 +/* EB9FC4 80241174 C60200BC */ lwc1 $f2, 0xbc($s0) +/* EB9FC8 80241178 468010A0 */ cvt.s.w $f2, $f2 +/* EB9FCC 8024117C 44071000 */ mfc1 $a3, $f2 +/* EB9FD0 80241180 0C00ABDC */ jal fio_validate_header_checksums +/* EB9FD4 80241184 46000586 */ mov.s $f22, $f0 +/* EB9FD8 80241188 0C00AB85 */ jal func_8002AE14 +/* EB9FDC 8024118C 46140301 */ sub.s $f12, $f0, $f20 +/* EB9FE0 80241190 46000506 */ mov.s $f20, $f0 +/* EB9FE4 80241194 0C00AD77 */ jal func_8002B5DC +/* EB9FE8 80241198 4600A306 */ mov.s $f12, $f20 +/* EB9FEC 8024119C 4600B002 */ mul.s $f0, $f22, $f0 +/* EB9FF0 802411A0 00000000 */ nop +/* EB9FF4 802411A4 46180000 */ add.s $f0, $f0, $f24 +/* EB9FF8 802411A8 E6200038 */ swc1 $f0, 0x38($s1) +/* EB9FFC 802411AC 8E0500B8 */ lw $a1, 0xb8($s0) +/* EBA000 802411B0 0C0B53A3 */ jal func_802D4E8C +/* EBA004 802411B4 0000202D */ daddu $a0, $zero, $zero +/* EBA008 802411B8 0000202D */ daddu $a0, $zero, $zero +/* EBA00C 802411BC 8E050090 */ lw $a1, 0x90($s0) +/* EBA010 802411C0 0C0B53A3 */ jal func_802D4E8C +/* EBA014 802411C4 0040802D */ daddu $s0, $v0, $zero +/* EBA018 802411C8 4600A306 */ mov.s $f12, $f20 +/* EBA01C 802411CC 02028021 */ addu $s0, $s0, $v0 +/* EBA020 802411D0 44900000 */ mtc1 $s0, $f0 +/* EBA024 802411D4 00000000 */ nop +/* EBA028 802411D8 46800020 */ cvt.s.w $f0, $f0 +/* EBA02C 802411DC 0C00AD90 */ jal func_8002B640 +/* EBA030 802411E0 E620003C */ swc1 $f0, 0x3c($s1) +/* EBA034 802411E4 4600B582 */ mul.s $f22, $f22, $f0 +/* EBA038 802411E8 00000000 */ nop +/* EBA03C 802411EC 4616D681 */ sub.s $f26, $f26, $f22 +/* EBA040 802411F0 E63A0040 */ swc1 $f26, 0x40($s1) +/* EBA044 802411F4 8FBF0018 */ lw $ra, 0x18($sp) +/* EBA048 802411F8 8FB10014 */ lw $s1, 0x14($sp) +/* EBA04C 802411FC 8FB00010 */ lw $s0, 0x10($sp) +/* EBA050 80241200 D7BA0038 */ ldc1 $f26, 0x38($sp) +/* EBA054 80241204 D7B80030 */ ldc1 $f24, 0x30($sp) +/* EBA058 80241208 D7B60028 */ ldc1 $f22, 0x28($sp) +/* EBA05C 8024120C D7B40020 */ ldc1 $f20, 0x20($sp) +/* EBA060 80241210 24020002 */ addiu $v0, $zero, 2 +/* EBA064 80241214 03E00008 */ jr $ra +/* EBA068 80241218 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_EB9D90/func_8024121C_EBA06C.s b/asm/nonmatchings/code_EB9D90/func_8024121C_EBA06C.s new file mode 100644 index 0000000000..dcab90b2c3 --- /dev/null +++ b/asm/nonmatchings/code_EB9D90/func_8024121C_EBA06C.s @@ -0,0 +1,105 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024121C_EBA06C +/* EBA06C 8024121C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EBA070 80241220 AFB20018 */ sw $s2, 0x18($sp) +/* EBA074 80241224 0080902D */ daddu $s2, $a0, $zero +/* EBA078 80241228 AFBF0028 */ sw $ra, 0x28($sp) +/* EBA07C 8024122C AFB50024 */ sw $s5, 0x24($sp) +/* EBA080 80241230 AFB40020 */ sw $s4, 0x20($sp) +/* EBA084 80241234 AFB3001C */ sw $s3, 0x1c($sp) +/* EBA088 80241238 AFB10014 */ sw $s1, 0x14($sp) +/* EBA08C 8024123C AFB00010 */ sw $s0, 0x10($sp) +/* EBA090 80241240 F7B80040 */ sdc1 $f24, 0x40($sp) +/* EBA094 80241244 F7B60038 */ sdc1 $f22, 0x38($sp) +/* EBA098 80241248 F7B40030 */ sdc1 $f20, 0x30($sp) +/* EBA09C 8024124C 8E50000C */ lw $s0, 0xc($s2) +/* EBA0A0 80241250 8E140000 */ lw $s4, ($s0) +/* EBA0A4 80241254 26100004 */ addiu $s0, $s0, 4 +/* EBA0A8 80241258 0C0B53A3 */ jal func_802D4E8C +/* EBA0AC 8024125C 0280282D */ daddu $a1, $s4, $zero +/* EBA0B0 80241260 0040982D */ daddu $s3, $v0, $zero +/* EBA0B4 80241264 8E150000 */ lw $s5, ($s0) +/* EBA0B8 80241268 26100004 */ addiu $s0, $s0, 4 +/* EBA0BC 8024126C 8E050000 */ lw $a1, ($s0) +/* EBA0C0 80241270 26100004 */ addiu $s0, $s0, 4 +/* EBA0C4 80241274 0C0B55FF */ jal func_802D57FC +/* EBA0C8 80241278 0240202D */ daddu $a0, $s2, $zero +/* EBA0CC 8024127C 8E050000 */ lw $a1, ($s0) +/* EBA0D0 80241280 26100004 */ addiu $s0, $s0, 4 +/* EBA0D4 80241284 0240202D */ daddu $a0, $s2, $zero +/* EBA0D8 80241288 0C0B55FF */ jal func_802D57FC +/* EBA0DC 8024128C 46000606 */ mov.s $f24, $f0 +/* EBA0E0 80241290 8E050000 */ lw $a1, ($s0) +/* EBA0E4 80241294 26100004 */ addiu $s0, $s0, 4 +/* EBA0E8 80241298 0240202D */ daddu $a0, $s2, $zero +/* EBA0EC 8024129C 0C0B53A3 */ jal func_802D4E8C +/* EBA0F0 802412A0 46000506 */ mov.s $f20, $f0 +/* EBA0F4 802412A4 8E050000 */ lw $a1, ($s0) +/* EBA0F8 802412A8 26100004 */ addiu $s0, $s0, 4 +/* EBA0FC 802412AC 0240202D */ daddu $a0, $s2, $zero +/* EBA100 802412B0 0C0B53A3 */ jal func_802D4E8C +/* EBA104 802412B4 0040882D */ daddu $s1, $v0, $zero +/* EBA108 802412B8 0240202D */ daddu $a0, $s2, $zero +/* EBA10C 802412BC 8E050000 */ lw $a1, ($s0) +/* EBA110 802412C0 0C0B55FF */ jal func_802D57FC +/* EBA114 802412C4 0040802D */ daddu $s0, $v0, $zero +/* EBA118 802412C8 3C014334 */ lui $at, 0x4334 +/* EBA11C 802412CC 44811000 */ mtc1 $at, $f2 +/* EBA120 802412D0 3C014049 */ lui $at, 0x4049 +/* EBA124 802412D4 34210FD8 */ ori $at, $at, 0xfd8 +/* EBA128 802412D8 44812000 */ mtc1 $at, $f4 +/* EBA12C 802412DC 46020003 */ div.s $f0, $f0, $f2 +/* EBA130 802412E0 46040582 */ mul.s $f22, $f0, $f4 +/* EBA134 802412E4 00000000 */ nop +/* EBA138 802412E8 4618A501 */ sub.s $f20, $f20, $f24 +/* EBA13C 802412EC 3C013F00 */ lui $at, 0x3f00 +/* EBA140 802412F0 44810000 */ mtc1 $at, $f0 +/* EBA144 802412F4 00000000 */ nop +/* EBA148 802412F8 4600A502 */ mul.s $f20, $f20, $f0 +/* EBA14C 802412FC 00000000 */ nop +/* EBA150 80241300 12000007 */ beqz $s0, .L80241320 +/* EBA154 80241304 0233102A */ slt $v0, $s1, $s3 +/* EBA158 80241308 10400005 */ beqz $v0, .L80241320 +/* EBA15C 8024130C 0240202D */ daddu $a0, $s2, $zero +/* EBA160 80241310 0220982D */ daddu $s3, $s1, $zero +/* EBA164 80241314 0280282D */ daddu $a1, $s4, $zero +/* EBA168 80241318 0C0B551A */ jal func_802D5468 +/* EBA16C 8024131C 0220302D */ daddu $a2, $s1, $zero +.L80241320: +/* EBA170 80241320 3C014049 */ lui $at, 0x4049 +/* EBA174 80241324 34210FD8 */ ori $at, $at, 0xfd8 +/* EBA178 80241328 44810000 */ mtc1 $at, $f0 +/* EBA17C 8024132C 44936000 */ mtc1 $s3, $f12 +/* EBA180 80241330 00000000 */ nop +/* EBA184 80241334 46806320 */ cvt.s.w $f12, $f12 +/* EBA188 80241338 46006302 */ mul.s $f12, $f12, $f0 +/* EBA18C 8024133C 00000000 */ nop +/* EBA190 80241340 44910000 */ mtc1 $s1, $f0 +/* EBA194 80241344 00000000 */ nop +/* EBA198 80241348 46800020 */ cvt.s.w $f0, $f0 +/* EBA19C 8024134C 46006303 */ div.s $f12, $f12, $f0 +/* EBA1A0 80241350 0C00AD30 */ jal func_8002B4C0 +/* EBA1A4 80241354 46166300 */ add.s $f12, $f12, $f22 +/* EBA1A8 80241358 4600A002 */ mul.s $f0, $f20, $f0 +/* EBA1AC 8024135C 00000000 */ nop +/* EBA1B0 80241360 4614C080 */ add.s $f2, $f24, $f20 +/* EBA1B4 80241364 46001081 */ sub.s $f2, $f2, $f0 +/* EBA1B8 80241368 0240202D */ daddu $a0, $s2, $zero +/* EBA1BC 8024136C 44061000 */ mfc1 $a2, $f2 +/* EBA1C0 80241370 0C0B5684 */ jal func_802D5A10 +/* EBA1C4 80241374 02A0282D */ daddu $a1, $s5, $zero +/* EBA1C8 80241378 8FBF0028 */ lw $ra, 0x28($sp) +/* EBA1CC 8024137C 8FB50024 */ lw $s5, 0x24($sp) +/* EBA1D0 80241380 8FB40020 */ lw $s4, 0x20($sp) +/* EBA1D4 80241384 8FB3001C */ lw $s3, 0x1c($sp) +/* EBA1D8 80241388 8FB20018 */ lw $s2, 0x18($sp) +/* EBA1DC 8024138C 8FB10014 */ lw $s1, 0x14($sp) +/* EBA1E0 80241390 8FB00010 */ lw $s0, 0x10($sp) +/* EBA1E4 80241394 D7B80040 */ ldc1 $f24, 0x40($sp) +/* EBA1E8 80241398 D7B60038 */ ldc1 $f22, 0x38($sp) +/* EBA1EC 8024139C D7B40030 */ ldc1 $f20, 0x30($sp) +/* EBA1F0 802413A0 24020002 */ addiu $v0, $zero, 2 +/* EBA1F4 802413A4 03E00008 */ jr $ra +/* EBA1F8 802413A8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EB9D90/func_802413AC_EBA1FC.s b/asm/nonmatchings/code_EB9D90/func_802413AC_EBA1FC.s new file mode 100644 index 0000000000..5ddb988fb5 --- /dev/null +++ b/asm/nonmatchings/code_EB9D90/func_802413AC_EBA1FC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413AC_EBA1FC +/* EBA1FC 802413AC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EBA200 802413B0 AFBF0010 */ sw $ra, 0x10($sp) +/* EBA204 802413B4 0C03C5CC */ jal func_800F1730 +/* EBA208 802413B8 00000000 */ nop +/* EBA20C 802413BC 8FBF0010 */ lw $ra, 0x10($sp) +/* EBA210 802413C0 24020002 */ addiu $v0, $zero, 2 +/* EBA214 802413C4 03E00008 */ jr $ra +/* EBA218 802413C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB9D90/func_802413CC_EBA21C.s b/asm/nonmatchings/code_EB9D90/func_802413CC_EBA21C.s new file mode 100644 index 0000000000..e428d8c90f --- /dev/null +++ b/asm/nonmatchings/code_EB9D90/func_802413CC_EBA21C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413CC_EBA21C +/* EBA21C 802413CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EBA220 802413D0 AFBF0010 */ sw $ra, 0x10($sp) +/* EBA224 802413D4 0C03C5C6 */ jal func_800F1718 +/* EBA228 802413D8 00000000 */ nop +/* EBA22C 802413DC 8FBF0010 */ lw $ra, 0x10($sp) +/* EBA230 802413E0 24020002 */ addiu $v0, $zero, 2 +/* EBA234 802413E4 03E00008 */ jr $ra +/* EBA238 802413E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EB9D90/func_802413EC_EBA23C.s b/asm/nonmatchings/code_EB9D90/func_802413EC_EBA23C.s new file mode 100644 index 0000000000..6844ce9c2f --- /dev/null +++ b/asm/nonmatchings/code_EB9D90/func_802413EC_EBA23C.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413EC_EBA23C +/* EBA23C 802413EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EBA240 802413F0 AFBF0010 */ sw $ra, 0x10($sp) +/* EBA244 802413F4 0C03C5BD */ jal func_800F16F4 +/* EBA248 802413F8 00000000 */ nop +/* EBA24C 802413FC 8FBF0010 */ lw $ra, 0x10($sp) +/* EBA250 80241400 24020002 */ addiu $v0, $zero, 2 +/* EBA254 80241404 03E00008 */ jr $ra +/* EBA258 80241408 27BD0018 */ addiu $sp, $sp, 0x18 +/* EBA25C 8024140C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC2200/func_80240000_EC2200.s b/asm/nonmatchings/code_EC2200/func_80240000_EC2200.s new file mode 100644 index 0000000000..d828fead3b --- /dev/null +++ b/asm/nonmatchings/code_EC2200/func_80240000_EC2200.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EC2200 +/* EC2200 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EC2204 80240004 24040001 */ addiu $a0, $zero, 1 +/* EC2208 80240008 0000282D */ daddu $a1, $zero, $zero +/* EC220C 8024000C 00A0302D */ daddu $a2, $a1, $zero +/* EC2210 80240010 00A0382D */ daddu $a3, $a1, $zero +/* EC2214 80240014 AFBF0018 */ sw $ra, 0x18($sp) +/* EC2218 80240018 AFA00010 */ sw $zero, 0x10($sp) +/* EC221C 8024001C 0C01DEF4 */ jal func_80077BD0 +/* EC2220 80240020 AFA00014 */ sw $zero, 0x14($sp) +/* EC2224 80240024 8FBF0018 */ lw $ra, 0x18($sp) +/* EC2228 80240028 24020002 */ addiu $v0, $zero, 2 +/* EC222C 8024002C 03E00008 */ jr $ra +/* EC2230 80240030 27BD0020 */ addiu $sp, $sp, 0x20 +/* EC2234 80240034 00000000 */ nop +/* EC2238 80240038 00000000 */ nop +/* EC223C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC2240/func_80240040_EC2240.s b/asm/nonmatchings/code_EC2240/func_80240040_EC2240.s new file mode 100644 index 0000000000..18e43008a1 --- /dev/null +++ b/asm/nonmatchings/code_EC2240/func_80240040_EC2240.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240040_EC2240 +/* EC2240 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EC2244 80240044 AFB00010 */ sw $s0, 0x10($sp) +/* EC2248 80240048 3C108024 */ lui $s0, %hi(D_80240F28) +/* EC224C 8024004C 26100F28 */ addiu $s0, $s0, %lo(D_80240F28) +/* EC2250 80240050 AFBF0018 */ sw $ra, 0x18($sp) +/* EC2254 80240054 AFB10014 */ sw $s1, 0x14($sp) +/* EC2258 80240058 8E020000 */ lw $v0, ($s0) +/* EC225C 8024005C 14400010 */ bnez $v0, .L802400A0 +/* EC2260 80240060 0080882D */ daddu $s1, $a0, $zero +/* EC2264 80240064 0C00AFF5 */ jal func_8002BFD4 +/* EC2268 80240068 24040040 */ addiu $a0, $zero, 0x40 +/* EC226C 8024006C AE020000 */ sw $v0, ($s0) +/* EC2270 80240070 0000182D */ daddu $v1, $zero, $zero +/* EC2274 80240074 0040282D */ daddu $a1, $v0, $zero +/* EC2278 80240078 0220202D */ daddu $a0, $s1, $zero +.L8024007C: +/* EC227C 8024007C 8C820084 */ lw $v0, 0x84($a0) +/* EC2280 80240080 24840004 */ addiu $a0, $a0, 4 +/* EC2284 80240084 24630001 */ addiu $v1, $v1, 1 +/* EC2288 80240088 ACA20000 */ sw $v0, ($a1) +/* EC228C 8024008C 28620010 */ slti $v0, $v1, 0x10 +/* EC2290 80240090 1440FFFA */ bnez $v0, .L8024007C +/* EC2294 80240094 24A50004 */ addiu $a1, $a1, 4 +/* EC2298 80240098 08090037 */ j .L802400DC +/* EC229C 8024009C 00000000 */ nop +.L802400A0: +/* EC22A0 802400A0 0000182D */ daddu $v1, $zero, $zero +/* EC22A4 802400A4 0040282D */ daddu $a1, $v0, $zero +/* EC22A8 802400A8 0220202D */ daddu $a0, $s1, $zero +.L802400AC: +/* EC22AC 802400AC 8CA20000 */ lw $v0, ($a1) +/* EC22B0 802400B0 24A50004 */ addiu $a1, $a1, 4 +/* EC22B4 802400B4 24630001 */ addiu $v1, $v1, 1 +/* EC22B8 802400B8 AC820084 */ sw $v0, 0x84($a0) +/* EC22BC 802400BC 28620010 */ slti $v0, $v1, 0x10 +/* EC22C0 802400C0 1440FFFA */ bnez $v0, .L802400AC +/* EC22C4 802400C4 24840004 */ addiu $a0, $a0, 4 +/* EC22C8 802400C8 3C108024 */ lui $s0, %hi(D_80240F28) +/* EC22CC 802400CC 26100F28 */ addiu $s0, $s0, %lo(D_80240F28) +/* EC22D0 802400D0 0C00B007 */ jal func_8002C01C +/* EC22D4 802400D4 8E040000 */ lw $a0, ($s0) +/* EC22D8 802400D8 AE000000 */ sw $zero, ($s0) +.L802400DC: +/* EC22DC 802400DC 8FBF0018 */ lw $ra, 0x18($sp) +/* EC22E0 802400E0 8FB10014 */ lw $s1, 0x14($sp) +/* EC22E4 802400E4 8FB00010 */ lw $s0, 0x10($sp) +/* EC22E8 802400E8 24020002 */ addiu $v0, $zero, 2 +/* EC22EC 802400EC 03E00008 */ jr $ra +/* EC22F0 802400F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC2240/func_802400F4_EC22F4.s b/asm/nonmatchings/code_EC2240/func_802400F4_EC22F4.s new file mode 100644 index 0000000000..880ec5c595 --- /dev/null +++ b/asm/nonmatchings/code_EC2240/func_802400F4_EC22F4.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400F4_EC22F4 +/* EC22F4 802400F4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EC22F8 802400F8 AFB00010 */ sw $s0, 0x10($sp) +/* EC22FC 802400FC 0080802D */ daddu $s0, $a0, $zero +/* EC2300 80240100 AFBF0018 */ sw $ra, 0x18($sp) +/* EC2304 80240104 AFB10014 */ sw $s1, 0x14($sp) +/* EC2308 80240108 8E02000C */ lw $v0, 0xc($s0) +/* EC230C 8024010C 8C510000 */ lw $s1, ($v0) +/* EC2310 80240110 0C0B53A3 */ jal func_802D4E8C +/* EC2314 80240114 0220282D */ daddu $a1, $s1, $zero +/* EC2318 80240118 3C03FFF0 */ lui $v1, 0xfff0 +/* EC231C 8024011C 3463FFFF */ ori $v1, $v1, 0xffff +/* EC2320 80240120 0200202D */ daddu $a0, $s0, $zero +/* EC2324 80240124 00431024 */ and $v0, $v0, $v1 +/* EC2328 80240128 00021140 */ sll $v0, $v0, 5 +/* EC232C 8024012C 3C068009 */ lui $a2, %hi(D_8008D2C0) +/* EC2330 80240130 00C23021 */ addu $a2, $a2, $v0 +/* EC2334 80240134 8CC6D2C0 */ lw $a2, %lo(D_8008D2C0)($a2) +/* EC2338 80240138 0C0B551A */ jal func_802D5468 +/* EC233C 8024013C 0220282D */ daddu $a1, $s1, $zero +/* EC2340 80240140 8FBF0018 */ lw $ra, 0x18($sp) +/* EC2344 80240144 8FB10014 */ lw $s1, 0x14($sp) +/* EC2348 80240148 8FB00010 */ lw $s0, 0x10($sp) +/* EC234C 8024014C 24020002 */ addiu $v0, $zero, 2 +/* EC2350 80240150 03E00008 */ jr $ra +/* EC2354 80240154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC2240/func_80240158_EC2358.s b/asm/nonmatchings/code_EC2240/func_80240158_EC2358.s new file mode 100644 index 0000000000..8c13cfab9c --- /dev/null +++ b/asm/nonmatchings/code_EC2240/func_80240158_EC2358.s @@ -0,0 +1,188 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240158_EC2358 +/* EC2358 80240158 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EC235C 8024015C AFBF0020 */ sw $ra, 0x20($sp) +/* EC2360 80240160 AFB1001C */ sw $s1, 0x1c($sp) +/* EC2364 80240164 AFB00018 */ sw $s0, 0x18($sp) +/* EC2368 80240168 F7BA0040 */ sdc1 $f26, 0x40($sp) +/* EC236C 8024016C F7B80038 */ sdc1 $f24, 0x38($sp) +/* EC2370 80240170 F7B60030 */ sdc1 $f22, 0x30($sp) +/* EC2374 80240174 F7B40028 */ sdc1 $f20, 0x28($sp) +/* EC2378 80240178 8C910148 */ lw $s1, 0x148($a0) +/* EC237C 8024017C 0C00F92F */ jal func_8003E4BC +/* EC2380 80240180 86240008 */ lh $a0, 8($s1) +/* EC2384 80240184 3C038011 */ lui $v1, %hi(D_80117578) +/* EC2388 80240188 24637578 */ addiu $v1, $v1, %lo(D_80117578) +/* EC238C 8024018C 0040802D */ daddu $s0, $v0, $zero +/* EC2390 80240190 3C01C352 */ lui $at, 0xc352 +/* EC2394 80240194 4481B000 */ mtc1 $at, $f22 +/* EC2398 80240198 3C01C337 */ lui $at, 0xc337 +/* EC239C 8024019C 4481C000 */ mtc1 $at, $f24 +/* EC23A0 802401A0 8C660028 */ lw $a2, 0x28($v1) +/* EC23A4 802401A4 8C670030 */ lw $a3, 0x30($v1) +/* EC23A8 802401A8 3C014334 */ lui $at, 0x4334 +/* EC23AC 802401AC 4481D000 */ mtc1 $at, $f26 +/* EC23B0 802401B0 4600B306 */ mov.s $f12, $f22 +/* EC23B4 802401B4 0C00ABDC */ jal fio_validate_header_checksums +/* EC23B8 802401B8 4600C386 */ mov.s $f14, $f24 +/* EC23BC 802401BC 0C00AB85 */ jal func_8002AE14 +/* EC23C0 802401C0 461A0300 */ add.s $f12, $f0, $f26 +/* EC23C4 802401C4 27A40010 */ addiu $a0, $sp, 0x10 +/* EC23C8 802401C8 3C064238 */ lui $a2, 0x4238 +/* EC23CC 802401CC 44070000 */ mfc1 $a3, $f0 +/* EC23D0 802401D0 27A50014 */ addiu $a1, $sp, 0x14 +/* EC23D4 802401D4 E7B60010 */ swc1 $f22, 0x10($sp) +/* EC23D8 802401D8 0C00ACA3 */ jal func_8002B28C +/* EC23DC 802401DC E7B80014 */ swc1 $f24, 0x14($sp) +/* EC23E0 802401E0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EC23E4 802401E4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EC23E8 802401E8 8FA60010 */ lw $a2, 0x10($sp) +/* EC23EC 802401EC 0C00AC71 */ jal func_8002B1C4 +/* EC23F0 802401F0 8FA70014 */ lw $a3, 0x14($sp) +/* EC23F4 802401F4 3C014000 */ lui $at, 0x4000 +/* EC23F8 802401F8 44811800 */ mtc1 $at, $f3 +/* EC23FC 802401FC 44801000 */ mtc1 $zero, $f2 +/* EC2400 80240200 46000121 */ cvt.d.s $f4, $f0 +/* EC2404 80240204 4624103C */ c.lt.d $f2, $f4 +/* EC2408 80240208 00000000 */ nop +/* EC240C 8024020C 45000058 */ bc1f .L80240370 +/* EC2410 80240210 4600B306 */ mov.s $f12, $f22 +/* EC2414 80240214 8E060038 */ lw $a2, 0x38($s0) +/* EC2418 80240218 8E070040 */ lw $a3, 0x40($s0) +/* EC241C 8024021C 0C00ABDC */ jal fio_validate_header_checksums +/* EC2420 80240220 4600C386 */ mov.s $f14, $f24 +/* EC2424 80240224 0C00AB85 */ jal func_8002AE14 +/* EC2428 80240228 46000306 */ mov.s $f12, $f0 +/* EC242C 8024022C 4600B306 */ mov.s $f12, $f22 +/* EC2430 80240230 4600C386 */ mov.s $f14, $f24 +/* EC2434 80240234 8FA60010 */ lw $a2, 0x10($sp) +/* EC2438 80240238 8FA70014 */ lw $a3, 0x14($sp) +/* EC243C 8024023C 0C00ABDC */ jal fio_validate_header_checksums +/* EC2440 80240240 46000506 */ mov.s $f20, $f0 +/* EC2444 80240244 0C00AB85 */ jal func_8002AE14 +/* EC2448 80240248 46000306 */ mov.s $f12, $f0 +/* EC244C 8024024C 4600A101 */ sub.s $f4, $f20, $f0 +/* EC2450 80240250 4600218D */ trunc.w.s $f6, $f4 +/* EC2454 80240254 44023000 */ mfc1 $v0, $f6 +/* EC2458 80240258 00000000 */ nop +/* EC245C 8024025C 04420001 */ bltzl $v0, .L80240264 +/* EC2460 80240260 00021023 */ negu $v0, $v0 +.L80240264: +/* EC2464 80240264 28420015 */ slti $v0, $v0, 0x15 +/* EC2468 80240268 14400032 */ bnez $v0, .L80240334 +/* EC246C 8024026C 00000000 */ nop +/* EC2470 80240270 4604D03E */ c.le.s $f26, $f4 +/* EC2474 80240274 00000000 */ nop +/* EC2478 80240278 45000005 */ bc1f .L80240290 +/* EC247C 8024027C 46002086 */ mov.s $f2, $f4 +/* EC2480 80240280 3C0143B4 */ lui $at, 0x43b4 +/* EC2484 80240284 44810000 */ mtc1 $at, $f0 +/* EC2488 80240288 00000000 */ nop +/* EC248C 8024028C 46002081 */ sub.s $f2, $f4, $f0 +.L80240290: +/* EC2490 80240290 3C01C334 */ lui $at, 0xc334 +/* EC2494 80240294 44810000 */ mtc1 $at, $f0 +/* EC2498 80240298 00000000 */ nop +/* EC249C 8024029C 4600103E */ c.le.s $f2, $f0 +/* EC24A0 802402A0 00000000 */ nop +/* EC24A4 802402A4 45000005 */ bc1f .L802402BC +/* EC24A8 802402A8 00000000 */ nop +/* EC24AC 802402AC 3C0143B4 */ lui $at, 0x43b4 +/* EC24B0 802402B0 44810000 */ mtc1 $at, $f0 +/* EC24B4 802402B4 00000000 */ nop +/* EC24B8 802402B8 46001080 */ add.s $f2, $f2, $f0 +.L802402BC: +/* EC24BC 802402BC 46022032 */ c.eq.s $f4, $f2 +/* EC24C0 802402C0 00000000 */ nop +/* EC24C4 802402C4 45000018 */ bc1f .L80240328 +/* EC24C8 802402C8 00000000 */ nop +/* EC24CC 802402CC 44800000 */ mtc1 $zero, $f0 +/* EC24D0 802402D0 E7B60010 */ swc1 $f22, 0x10($sp) +/* EC24D4 802402D4 4604003E */ c.le.s $f0, $f4 +/* EC24D8 802402D8 00000000 */ nop +/* EC24DC 802402DC 45000005 */ bc1f .L802402F4 +/* EC24E0 802402E0 E7B80014 */ swc1 $f24, 0x14($sp) +/* EC24E4 802402E4 3C0141A0 */ lui $at, 0x41a0 +/* EC24E8 802402E8 44816000 */ mtc1 $at, $f12 +/* EC24EC 802402EC 080900C1 */ j .L80240304 +/* EC24F0 802402F0 460CA301 */ sub.s $f12, $f20, $f12 +.L802402F4: +/* EC24F4 802402F4 3C0141A0 */ lui $at, 0x41a0 +/* EC24F8 802402F8 44816000 */ mtc1 $at, $f12 +/* EC24FC 802402FC 00000000 */ nop +/* EC2500 80240300 460CA300 */ add.s $f12, $f20, $f12 +.L80240304: +/* EC2504 80240304 0C00AB85 */ jal func_8002AE14 +/* EC2508 80240308 00000000 */ nop +/* EC250C 8024030C 27A40010 */ addiu $a0, $sp, 0x10 +/* EC2510 80240310 3C064238 */ lui $a2, 0x4238 +/* EC2514 80240314 44070000 */ mfc1 $a3, $f0 +/* EC2518 80240318 0C00ACA3 */ jal func_8002B28C +/* EC251C 8024031C 27A50014 */ addiu $a1, $sp, 0x14 +/* EC2520 80240320 080900CD */ j .L80240334 +/* EC2524 80240324 00000000 */ nop +.L80240328: +/* EC2528 80240328 3C048024 */ lui $a0, %hi(D_80244F88) +/* EC252C 8024032C 0C00973F */ jal func_80025CFC +/* EC2530 80240330 24844F88 */ addiu $a0, $a0, %lo(D_80244F88) +.L80240334: +/* EC2534 80240334 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EC2538 80240338 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EC253C 8024033C 8FA60010 */ lw $a2, 0x10($sp) +/* EC2540 80240340 8E2200CC */ lw $v0, 0xcc($s1) +/* EC2544 80240344 8FA70014 */ lw $a3, 0x14($sp) +/* EC2548 80240348 8C420008 */ lw $v0, 8($v0) +/* EC254C 8024034C 0C00ABDC */ jal fio_validate_header_checksums +/* EC2550 80240350 AE020028 */ sw $v0, 0x28($s0) +/* EC2554 80240354 3C054000 */ lui $a1, 0x4000 +/* EC2558 80240358 44060000 */ mfc1 $a2, $f0 +/* EC255C 8024035C 0200202D */ daddu $a0, $s0, $zero +/* EC2560 80240360 0C00F909 */ jal func_8003E424 +/* EC2564 80240364 AC86000C */ sw $a2, 0xc($a0) +/* EC2568 80240368 080900F7 */ j .L802403DC +/* EC256C 8024036C 00000000 */ nop +.L80240370: +/* EC2570 80240370 3C018024 */ lui $at, %hi(D_80244F90) +/* EC2574 80240374 D4204F90 */ ldc1 $f0, %lo(D_80244F90)($at) +/* EC2578 80240378 4624003C */ c.lt.d $f0, $f4 +/* EC257C 8024037C 00000000 */ nop +/* EC2580 80240380 4500000F */ bc1f .L802403C0 +/* EC2584 80240384 00000000 */ nop +/* EC2588 80240388 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EC258C 8024038C C60E0040 */ lwc1 $f14, 0x40($s0) +/* EC2590 80240390 8FA60010 */ lw $a2, 0x10($sp) +/* EC2594 80240394 0C00ABDC */ jal fio_validate_header_checksums +/* EC2598 80240398 8FA70014 */ lw $a3, 0x14($sp) +/* EC259C 8024039C C7A20010 */ lwc1 $f2, 0x10($sp) +/* EC25A0 802403A0 C7A40014 */ lwc1 $f4, 0x14($sp) +/* EC25A4 802403A4 E600000C */ swc1 $f0, 0xc($s0) +/* EC25A8 802403A8 E6020038 */ swc1 $f2, 0x38($s0) +/* EC25AC 802403AC E6040040 */ swc1 $f4, 0x40($s0) +/* EC25B0 802403B0 8E2200CC */ lw $v0, 0xcc($s1) +/* EC25B4 802403B4 8C420004 */ lw $v0, 4($v0) +/* EC25B8 802403B8 080900F7 */ j .L802403DC +/* EC25BC 802403BC AE020028 */ sw $v0, 0x28($s0) +.L802403C0: +/* EC25C0 802403C0 C7A00010 */ lwc1 $f0, 0x10($sp) +/* EC25C4 802403C4 C7A20014 */ lwc1 $f2, 0x14($sp) +/* EC25C8 802403C8 E6000038 */ swc1 $f0, 0x38($s0) +/* EC25CC 802403CC E6020040 */ swc1 $f2, 0x40($s0) +/* EC25D0 802403D0 8E2200CC */ lw $v0, 0xcc($s1) +/* EC25D4 802403D4 8C420000 */ lw $v0, ($v0) +/* EC25D8 802403D8 AE020028 */ sw $v0, 0x28($s0) +.L802403DC: +/* EC25DC 802403DC 8FBF0020 */ lw $ra, 0x20($sp) +/* EC25E0 802403E0 8FB1001C */ lw $s1, 0x1c($sp) +/* EC25E4 802403E4 8FB00018 */ lw $s0, 0x18($sp) +/* EC25E8 802403E8 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* EC25EC 802403EC D7B80038 */ ldc1 $f24, 0x38($sp) +/* EC25F0 802403F0 D7B60030 */ ldc1 $f22, 0x30($sp) +/* EC25F4 802403F4 D7B40028 */ ldc1 $f20, 0x28($sp) +/* EC25F8 802403F8 0000102D */ daddu $v0, $zero, $zero +/* EC25FC 802403FC 03E00008 */ jr $ra +/* EC2600 80240400 27BD0048 */ addiu $sp, $sp, 0x48 +/* EC2604 80240404 00000000 */ nop +/* EC2608 80240408 00000000 */ nop +/* EC260C 8024040C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC2610/func_80240410_EC2610.s b/asm/nonmatchings/code_EC2610/func_80240410_EC2610.s new file mode 100644 index 0000000000..44e7bfbd73 --- /dev/null +++ b/asm/nonmatchings/code_EC2610/func_80240410_EC2610.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240410_EC2610 +/* EC2610 80240410 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EC2614 80240414 F7B40018 */ sdc1 $f20, 0x18($sp) +/* EC2618 80240418 4485A000 */ mtc1 $a1, $f20 +/* EC261C 8024041C F7B60020 */ sdc1 $f22, 0x20($sp) +/* EC2620 80240420 4486B000 */ mtc1 $a2, $f22 +/* EC2624 80240424 AFB00010 */ sw $s0, 0x10($sp) +/* EC2628 80240428 F7B80028 */ sdc1 $f24, 0x28($sp) +/* EC262C 8024042C 4487C000 */ mtc1 $a3, $f24 +/* EC2630 80240430 AFBF0014 */ sw $ra, 0x14($sp) +/* EC2634 80240434 0C01B198 */ jal osGetCause +/* EC2638 80240438 0080802D */ daddu $s0, $a0, $zero +/* EC263C 8024043C 4616A582 */ mul.s $f22, $f20, $f22 +/* EC2640 80240440 00000000 */ nop +/* EC2644 80240444 4618A502 */ mul.s $f20, $f20, $f24 +/* EC2648 80240448 00000000 */ nop +/* EC264C 8024044C 3C013F80 */ lui $at, 0x3f80 +/* EC2650 80240450 44810000 */ mtc1 $at, $f0 +/* EC2654 80240454 00000000 */ nop +/* EC2658 80240458 E6000014 */ swc1 $f0, 0x14($s0) +/* EC265C 8024045C E6160010 */ swc1 $f22, 0x10($s0) +/* EC2660 80240460 E6140018 */ swc1 $f20, 0x18($s0) +/* EC2664 80240464 8FBF0014 */ lw $ra, 0x14($sp) +/* EC2668 80240468 8FB00010 */ lw $s0, 0x10($sp) +/* EC266C 8024046C D7B80028 */ ldc1 $f24, 0x28($sp) +/* EC2670 80240470 D7B60020 */ ldc1 $f22, 0x20($sp) +/* EC2674 80240474 D7B40018 */ ldc1 $f20, 0x18($sp) +/* EC2678 80240478 03E00008 */ jr $ra +/* EC267C 8024047C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EC2610/func_80240480_EC2680.s b/asm/nonmatchings/code_EC2610/func_80240480_EC2680.s new file mode 100644 index 0000000000..fec61707e1 --- /dev/null +++ b/asm/nonmatchings/code_EC2610/func_80240480_EC2680.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240480_EC2680 +/* EC2680 80240480 27BDFF78 */ addiu $sp, $sp, -0x88 +/* EC2684 80240484 AFB10054 */ sw $s1, 0x54($sp) +/* EC2688 80240488 0080882D */ daddu $s1, $a0, $zero +/* EC268C 8024048C AFBF005C */ sw $ra, 0x5c($sp) +/* EC2690 80240490 AFB20058 */ sw $s2, 0x58($sp) +/* EC2694 80240494 AFB00050 */ sw $s0, 0x50($sp) +/* EC2698 80240498 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* EC269C 8024049C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* EC26A0 802404A0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* EC26A4 802404A4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* EC26A8 802404A8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* EC26AC 802404AC 8E30000C */ lw $s0, 0xc($s1) +/* EC26B0 802404B0 8E050000 */ lw $a1, ($s0) +/* EC26B4 802404B4 0C0B53A3 */ jal func_802D4E8C +/* EC26B8 802404B8 26100004 */ addiu $s0, $s0, 4 +/* EC26BC 802404BC 0C04949C */ jal func_80125270 +/* EC26C0 802404C0 0040202D */ daddu $a0, $v0, $zero +/* EC26C4 802404C4 8E050000 */ lw $a1, ($s0) +/* EC26C8 802404C8 26100004 */ addiu $s0, $s0, 4 +/* EC26CC 802404CC 0220202D */ daddu $a0, $s1, $zero +/* EC26D0 802404D0 0C0B55FF */ jal func_802D57FC +/* EC26D4 802404D4 0040902D */ daddu $s2, $v0, $zero +/* EC26D8 802404D8 8E050000 */ lw $a1, ($s0) +/* EC26DC 802404DC 26100004 */ addiu $s0, $s0, 4 +/* EC26E0 802404E0 0220202D */ daddu $a0, $s1, $zero +/* EC26E4 802404E4 0C0B55FF */ jal func_802D57FC +/* EC26E8 802404E8 46000706 */ mov.s $f28, $f0 +/* EC26EC 802404EC 8E050000 */ lw $a1, ($s0) +/* EC26F0 802404F0 26100004 */ addiu $s0, $s0, 4 +/* EC26F4 802404F4 0220202D */ daddu $a0, $s1, $zero +/* EC26F8 802404F8 0C0B55FF */ jal func_802D57FC +/* EC26FC 802404FC 46000686 */ mov.s $f26, $f0 +/* EC2700 80240500 0220202D */ daddu $a0, $s1, $zero +/* EC2704 80240504 8E050000 */ lw $a1, ($s0) +/* EC2708 80240508 0C0B55FF */ jal func_802D57FC +/* EC270C 8024050C 46000586 */ mov.s $f22, $f0 +/* EC2710 80240510 0240202D */ daddu $a0, $s2, $zero +/* EC2714 80240514 0C0493D1 */ jal func_80124F44 +/* EC2718 80240518 46000606 */ mov.s $f24, $f0 +/* EC271C 8024051C 0040882D */ daddu $s1, $v0, $zero +/* EC2720 80240520 96220000 */ lhu $v0, ($s1) +/* EC2724 80240524 30420400 */ andi $v0, $v0, 0x400 +/* EC2728 80240528 1440001E */ bnez $v0, .L802405A4 +/* EC272C 8024052C 26300058 */ addiu $s0, $s1, 0x58 +/* EC2730 80240530 4480A000 */ mtc1 $zero, $f20 +/* EC2734 80240534 4406B000 */ mfc1 $a2, $f22 +/* EC2738 80240538 4405A000 */ mfc1 $a1, $f20 +/* EC273C 8024053C 4407A000 */ mfc1 $a3, $f20 +/* EC2740 80240540 0C01B2B0 */ jal func_8006CAC0 +/* EC2744 80240544 0200202D */ daddu $a0, $s0, $zero +/* EC2748 80240548 4405E000 */ mfc1 $a1, $f28 +/* EC274C 8024054C 4406D000 */ mfc1 $a2, $f26 +/* EC2750 80240550 4407C000 */ mfc1 $a3, $f24 +/* EC2754 80240554 0C090104 */ jal func_80240410_EC2610 +/* EC2758 80240558 27A40010 */ addiu $a0, $sp, 0x10 +/* EC275C 8024055C 27A40010 */ addiu $a0, $sp, 0x10 +/* EC2760 80240560 0200282D */ daddu $a1, $s0, $zero +/* EC2764 80240564 0C01B1F0 */ jal osSiRawReadIo +/* EC2768 80240568 0200302D */ daddu $a2, $s0, $zero +/* EC276C 8024056C 27A40010 */ addiu $a0, $sp, 0x10 +/* EC2770 80240570 4600B587 */ neg.s $f22, $f22 +/* EC2774 80240574 4405A000 */ mfc1 $a1, $f20 +/* EC2778 80240578 4406B000 */ mfc1 $a2, $f22 +/* EC277C 8024057C 0C01B2B0 */ jal func_8006CAC0 +/* EC2780 80240580 00A0382D */ daddu $a3, $a1, $zero +/* EC2784 80240584 27A40010 */ addiu $a0, $sp, 0x10 +/* EC2788 80240588 0200282D */ daddu $a1, $s0, $zero +/* EC278C 8024058C 0C01B1F0 */ jal osSiRawReadIo +/* EC2790 80240590 00A0302D */ daddu $a2, $a1, $zero +/* EC2794 80240594 96220000 */ lhu $v0, ($s1) +/* EC2798 80240598 34421400 */ ori $v0, $v0, 0x1400 +/* EC279C 8024059C 08090187 */ j .L8024061C +/* EC27A0 802405A0 A6220000 */ sh $v0, ($s1) +.L802405A4: +/* EC27A4 802405A4 4480A000 */ mtc1 $zero, $f20 +/* EC27A8 802405A8 4406B000 */ mfc1 $a2, $f22 +/* EC27AC 802405AC 4405A000 */ mfc1 $a1, $f20 +/* EC27B0 802405B0 4407A000 */ mfc1 $a3, $f20 +/* EC27B4 802405B4 0C01B2B0 */ jal func_8006CAC0 +/* EC27B8 802405B8 27A40010 */ addiu $a0, $sp, 0x10 +/* EC27BC 802405BC 27A40010 */ addiu $a0, $sp, 0x10 +/* EC27C0 802405C0 26300058 */ addiu $s0, $s1, 0x58 +/* EC27C4 802405C4 0200282D */ daddu $a1, $s0, $zero +/* EC27C8 802405C8 0C01B1F0 */ jal osSiRawReadIo +/* EC27CC 802405CC 0200302D */ daddu $a2, $s0, $zero +/* EC27D0 802405D0 4405E000 */ mfc1 $a1, $f28 +/* EC27D4 802405D4 4406D000 */ mfc1 $a2, $f26 +/* EC27D8 802405D8 4407C000 */ mfc1 $a3, $f24 +/* EC27DC 802405DC 0C090104 */ jal func_80240410_EC2610 +/* EC27E0 802405E0 27A40010 */ addiu $a0, $sp, 0x10 +/* EC27E4 802405E4 27A40010 */ addiu $a0, $sp, 0x10 +/* EC27E8 802405E8 0200282D */ daddu $a1, $s0, $zero +/* EC27EC 802405EC 0C01B1F0 */ jal osSiRawReadIo +/* EC27F0 802405F0 0200302D */ daddu $a2, $s0, $zero +/* EC27F4 802405F4 27A40010 */ addiu $a0, $sp, 0x10 +/* EC27F8 802405F8 4600B587 */ neg.s $f22, $f22 +/* EC27FC 802405FC 4405A000 */ mfc1 $a1, $f20 +/* EC2800 80240600 4406B000 */ mfc1 $a2, $f22 +/* EC2804 80240604 0C01B2B0 */ jal func_8006CAC0 +/* EC2808 80240608 00A0382D */ daddu $a3, $a1, $zero +/* EC280C 8024060C 27A40010 */ addiu $a0, $sp, 0x10 +/* EC2810 80240610 0200282D */ daddu $a1, $s0, $zero +/* EC2814 80240614 0C01B1F0 */ jal osSiRawReadIo +/* EC2818 80240618 00A0302D */ daddu $a2, $a1, $zero +.L8024061C: +/* EC281C 8024061C 8FBF005C */ lw $ra, 0x5c($sp) +/* EC2820 80240620 8FB20058 */ lw $s2, 0x58($sp) +/* EC2824 80240624 8FB10054 */ lw $s1, 0x54($sp) +/* EC2828 80240628 8FB00050 */ lw $s0, 0x50($sp) +/* EC282C 8024062C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* EC2830 80240630 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* EC2834 80240634 D7B80070 */ ldc1 $f24, 0x70($sp) +/* EC2838 80240638 D7B60068 */ ldc1 $f22, 0x68($sp) +/* EC283C 8024063C D7B40060 */ ldc1 $f20, 0x60($sp) +/* EC2840 80240640 24020002 */ addiu $v0, $zero, 2 +/* EC2844 80240644 03E00008 */ jr $ra +/* EC2848 80240648 27BD0088 */ addiu $sp, $sp, 0x88 +/* EC284C 8024064C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC71B0/func_80240000_EC71B0.s b/asm/nonmatchings/code_EC71B0/func_80240000_EC71B0.s new file mode 100644 index 0000000000..bbbce02e86 --- /dev/null +++ b/asm/nonmatchings/code_EC71B0/func_80240000_EC71B0.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EC71B0 +/* EC71B0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EC71B4 80240004 AFB00010 */ sw $s0, 0x10($sp) +/* EC71B8 80240008 0080802D */ daddu $s0, $a0, $zero +/* EC71BC 8024000C AFBF0014 */ sw $ra, 0x14($sp) +/* EC71C0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) +/* EC71C4 80240014 8E020088 */ lw $v0, 0x88($s0) +/* EC71C8 80240018 00621821 */ addu $v1, $v1, $v0 +/* EC71CC 8024001C 04610004 */ bgez $v1, .L80240030 +/* EC71D0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) +/* EC71D4 80240024 3C020002 */ lui $v0, 2 +/* EC71D8 80240028 08090010 */ j .L80240040 +/* EC71DC 8024002C 00621021 */ addu $v0, $v1, $v0 +.L80240030: +/* EC71E0 80240030 3C040002 */ lui $a0, 2 +/* EC71E4 80240034 0083102A */ slt $v0, $a0, $v1 +/* EC71E8 80240038 10400002 */ beqz $v0, .L80240044 +/* EC71EC 8024003C 00641023 */ subu $v0, $v1, $a0 +.L80240040: +/* EC71F0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240044: +/* EC71F4 80240044 8E0300AC */ lw $v1, 0xac($s0) +/* EC71F8 80240048 8E02008C */ lw $v0, 0x8c($s0) +/* EC71FC 8024004C 00621821 */ addu $v1, $v1, $v0 +/* EC7200 80240050 04610004 */ bgez $v1, .L80240064 +/* EC7204 80240054 AE0300AC */ sw $v1, 0xac($s0) +/* EC7208 80240058 3C020002 */ lui $v0, 2 +/* EC720C 8024005C 0809001D */ j .L80240074 +/* EC7210 80240060 00621021 */ addu $v0, $v1, $v0 +.L80240064: +/* EC7214 80240064 3C040002 */ lui $a0, 2 +/* EC7218 80240068 0083102A */ slt $v0, $a0, $v1 +/* EC721C 8024006C 10400002 */ beqz $v0, .L80240078 +/* EC7220 80240070 00641023 */ subu $v0, $v1, $a0 +.L80240074: +/* EC7224 80240074 AE0200AC */ sw $v0, 0xac($s0) +.L80240078: +/* EC7228 80240078 8E0300B0 */ lw $v1, 0xb0($s0) +/* EC722C 8024007C 8E020090 */ lw $v0, 0x90($s0) +/* EC7230 80240080 00621821 */ addu $v1, $v1, $v0 +/* EC7234 80240084 04610004 */ bgez $v1, .L80240098 +/* EC7238 80240088 AE0300B0 */ sw $v1, 0xb0($s0) +/* EC723C 8024008C 3C020002 */ lui $v0, 2 +/* EC7240 80240090 0809002A */ j .L802400A8 +/* EC7244 80240094 00621021 */ addu $v0, $v1, $v0 +.L80240098: +/* EC7248 80240098 3C040002 */ lui $a0, 2 +/* EC724C 8024009C 0083102A */ slt $v0, $a0, $v1 +/* EC7250 802400A0 10400002 */ beqz $v0, .L802400AC +/* EC7254 802400A4 00641023 */ subu $v0, $v1, $a0 +.L802400A8: +/* EC7258 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802400AC: +/* EC725C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) +/* EC7260 802400B0 8E020094 */ lw $v0, 0x94($s0) +/* EC7264 802400B4 00621821 */ addu $v1, $v1, $v0 +/* EC7268 802400B8 04610004 */ bgez $v1, .L802400CC +/* EC726C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) +/* EC7270 802400C0 3C020002 */ lui $v0, 2 +/* EC7274 802400C4 08090037 */ j .L802400DC +/* EC7278 802400C8 00621021 */ addu $v0, $v1, $v0 +.L802400CC: +/* EC727C 802400CC 3C040002 */ lui $a0, 2 +/* EC7280 802400D0 0083102A */ slt $v0, $a0, $v1 +/* EC7284 802400D4 10400002 */ beqz $v0, .L802400E0 +/* EC7288 802400D8 00641023 */ subu $v0, $v1, $a0 +.L802400DC: +/* EC728C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) +.L802400E0: +/* EC7290 802400E0 8E040084 */ lw $a0, 0x84($s0) +/* EC7294 802400E4 0C049819 */ jal func_80126064 +/* EC7298 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) +/* EC729C 802400EC 8E040084 */ lw $a0, 0x84($s0) +/* EC72A0 802400F0 0C04981F */ jal func_8012607C +/* EC72A4 802400F4 8E0500AC */ lw $a1, 0xac($s0) +/* EC72A8 802400F8 8E040084 */ lw $a0, 0x84($s0) +/* EC72AC 802400FC 0C049825 */ jal func_80126094 +/* EC72B0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) +/* EC72B4 80240104 8E040084 */ lw $a0, 0x84($s0) +/* EC72B8 80240108 0C04982B */ jal func_801260AC +/* EC72BC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) +/* EC72C0 80240110 8FBF0014 */ lw $ra, 0x14($sp) +/* EC72C4 80240114 8FB00010 */ lw $s0, 0x10($sp) +/* EC72C8 80240118 0000102D */ daddu $v0, $zero, $zero +/* EC72CC 8024011C 03E00008 */ jr $ra +/* EC72D0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EC71B0/func_80240124_EC72D4.s b/asm/nonmatchings/code_EC71B0/func_80240124_EC72D4.s new file mode 100644 index 0000000000..8860dfa860 --- /dev/null +++ b/asm/nonmatchings/code_EC71B0/func_80240124_EC72D4.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240124_EC72D4 +/* EC72D4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EC72D8 80240128 AFB00010 */ sw $s0, 0x10($sp) +/* EC72DC 8024012C 0080802D */ daddu $s0, $a0, $zero +/* EC72E0 80240130 10A00005 */ beqz $a1, .L80240148 +/* EC72E4 80240134 AFBF0014 */ sw $ra, 0x14($sp) +/* EC72E8 80240138 AE000070 */ sw $zero, 0x70($s0) +/* EC72EC 8024013C AE000074 */ sw $zero, 0x74($s0) +/* EC72F0 80240140 AE000078 */ sw $zero, 0x78($s0) +/* EC72F4 80240144 AE00007C */ sw $zero, 0x7c($s0) +.L80240148: +/* EC72F8 80240148 8E020070 */ lw $v0, 0x70($s0) +/* EC72FC 8024014C 1440000E */ bnez $v0, .L80240188 +/* EC7300 80240150 00000000 */ nop +/* EC7304 80240154 8E0300A8 */ lw $v1, 0xa8($s0) +/* EC7308 80240158 8E020088 */ lw $v0, 0x88($s0) +/* EC730C 8024015C 00621821 */ addu $v1, $v1, $v0 +/* EC7310 80240160 04610004 */ bgez $v1, .L80240174 +/* EC7314 80240164 AE0300A8 */ sw $v1, 0xa8($s0) +/* EC7318 80240168 3C020002 */ lui $v0, 2 +/* EC731C 8024016C 08090061 */ j .L80240184 +/* EC7320 80240170 00621021 */ addu $v0, $v1, $v0 +.L80240174: +/* EC7324 80240174 3C040002 */ lui $a0, 2 +/* EC7328 80240178 0083102A */ slt $v0, $a0, $v1 +/* EC732C 8024017C 10400002 */ beqz $v0, .L80240188 +/* EC7330 80240180 00641023 */ subu $v0, $v1, $a0 +.L80240184: +/* EC7334 80240184 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240188: +/* EC7338 80240188 8E020074 */ lw $v0, 0x74($s0) +/* EC733C 8024018C 1440000E */ bnez $v0, .L802401C8 +/* EC7340 80240190 00000000 */ nop +/* EC7344 80240194 8E0300AC */ lw $v1, 0xac($s0) +/* EC7348 80240198 8E02008C */ lw $v0, 0x8c($s0) +/* EC734C 8024019C 00621821 */ addu $v1, $v1, $v0 +/* EC7350 802401A0 04610004 */ bgez $v1, .L802401B4 +/* EC7354 802401A4 AE0300AC */ sw $v1, 0xac($s0) +/* EC7358 802401A8 3C020002 */ lui $v0, 2 +/* EC735C 802401AC 08090071 */ j .L802401C4 +/* EC7360 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* EC7364 802401B4 3C040002 */ lui $a0, 2 +/* EC7368 802401B8 0083102A */ slt $v0, $a0, $v1 +/* EC736C 802401BC 10400002 */ beqz $v0, .L802401C8 +/* EC7370 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* EC7374 802401C4 AE0200AC */ sw $v0, 0xac($s0) +.L802401C8: +/* EC7378 802401C8 8E020078 */ lw $v0, 0x78($s0) +/* EC737C 802401CC 1440000E */ bnez $v0, .L80240208 +/* EC7380 802401D0 00000000 */ nop +/* EC7384 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) +/* EC7388 802401D8 8E020090 */ lw $v0, 0x90($s0) +/* EC738C 802401DC 00621821 */ addu $v1, $v1, $v0 +/* EC7390 802401E0 04610004 */ bgez $v1, .L802401F4 +/* EC7394 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) +/* EC7398 802401E8 3C020002 */ lui $v0, 2 +/* EC739C 802401EC 08090081 */ j .L80240204 +/* EC73A0 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* EC73A4 802401F4 3C040002 */ lui $a0, 2 +/* EC73A8 802401F8 0083102A */ slt $v0, $a0, $v1 +/* EC73AC 802401FC 10400002 */ beqz $v0, .L80240208 +/* EC73B0 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* EC73B4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240208: +/* EC73B8 80240208 8E02007C */ lw $v0, 0x7c($s0) +/* EC73BC 8024020C 1440000E */ bnez $v0, .L80240248 +/* EC73C0 80240210 00000000 */ nop +/* EC73C4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) +/* EC73C8 80240218 8E020094 */ lw $v0, 0x94($s0) +/* EC73CC 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EC73D0 80240220 04610004 */ bgez $v1, .L80240234 +/* EC73D4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) +/* EC73D8 80240228 3C020002 */ lui $v0, 2 +/* EC73DC 8024022C 08090091 */ j .L80240244 +/* EC73E0 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* EC73E4 80240234 3C040002 */ lui $a0, 2 +/* EC73E8 80240238 0083102A */ slt $v0, $a0, $v1 +/* EC73EC 8024023C 10400002 */ beqz $v0, .L80240248 +/* EC73F0 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* EC73F4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240248: +/* EC73F8 80240248 8E040084 */ lw $a0, 0x84($s0) +/* EC73FC 8024024C 0C049819 */ jal func_80126064 +/* EC7400 80240250 8E0500A8 */ lw $a1, 0xa8($s0) +/* EC7404 80240254 8E040084 */ lw $a0, 0x84($s0) +/* EC7408 80240258 0C04981F */ jal func_8012607C +/* EC740C 8024025C 8E0500AC */ lw $a1, 0xac($s0) +/* EC7410 80240260 8E040084 */ lw $a0, 0x84($s0) +/* EC7414 80240264 0C049825 */ jal func_80126094 +/* EC7418 80240268 8E0500B0 */ lw $a1, 0xb0($s0) +/* EC741C 8024026C 8E040084 */ lw $a0, 0x84($s0) +/* EC7420 80240270 0C04982B */ jal func_801260AC +/* EC7424 80240274 8E0500B4 */ lw $a1, 0xb4($s0) +/* EC7428 80240278 8E020070 */ lw $v0, 0x70($s0) +/* EC742C 8024027C 8E030078 */ lw $v1, 0x78($s0) +/* EC7430 80240280 8E040098 */ lw $a0, 0x98($s0) +/* EC7434 80240284 24420001 */ addiu $v0, $v0, 1 +/* EC7438 80240288 AE020070 */ sw $v0, 0x70($s0) +/* EC743C 8024028C 8E020074 */ lw $v0, 0x74($s0) +/* EC7440 80240290 24630001 */ addiu $v1, $v1, 1 +/* EC7444 80240294 AE030078 */ sw $v1, 0x78($s0) +/* EC7448 80240298 8E030070 */ lw $v1, 0x70($s0) +/* EC744C 8024029C 24420001 */ addiu $v0, $v0, 1 +/* EC7450 802402A0 AE020074 */ sw $v0, 0x74($s0) +/* EC7454 802402A4 8E02007C */ lw $v0, 0x7c($s0) +/* EC7458 802402A8 0064182A */ slt $v1, $v1, $a0 +/* EC745C 802402AC 24420001 */ addiu $v0, $v0, 1 +/* EC7460 802402B0 14600002 */ bnez $v1, .L802402BC +/* EC7464 802402B4 AE02007C */ sw $v0, 0x7c($s0) +/* EC7468 802402B8 AE000070 */ sw $zero, 0x70($s0) +.L802402BC: +/* EC746C 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* EC7470 802402C0 8E03009C */ lw $v1, 0x9c($s0) +/* EC7474 802402C4 0043102A */ slt $v0, $v0, $v1 +/* EC7478 802402C8 50400001 */ beql $v0, $zero, .L802402D0 +/* EC747C 802402CC AE000074 */ sw $zero, 0x74($s0) +.L802402D0: +/* EC7480 802402D0 8E020078 */ lw $v0, 0x78($s0) +/* EC7484 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) +/* EC7488 802402D8 0043102A */ slt $v0, $v0, $v1 +/* EC748C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* EC7490 802402E0 AE000078 */ sw $zero, 0x78($s0) +.L802402E4: +/* EC7494 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* EC7498 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) +/* EC749C 802402EC 0043102A */ slt $v0, $v0, $v1 +/* EC74A0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 +/* EC74A4 802402F4 AE00007C */ sw $zero, 0x7c($s0) +.L802402F8: +/* EC74A8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) +/* EC74AC 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* EC74B0 80240300 0000102D */ daddu $v0, $zero, $zero +/* EC74B4 80240304 03E00008 */ jr $ra +/* EC74B8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EC71B0/func_8024030C_EC74BC.s b/asm/nonmatchings/code_EC71B0/func_8024030C_EC74BC.s new file mode 100644 index 0000000000..65c762411b --- /dev/null +++ b/asm/nonmatchings/code_EC71B0/func_8024030C_EC74BC.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024030C_EC74BC +/* EC74BC 8024030C 44800000 */ mtc1 $zero, $f0 +/* EC74C0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EC74C4 80240314 44050000 */ mfc1 $a1, $f0 +/* EC74C8 80240318 0000202D */ daddu $a0, $zero, $zero +/* EC74CC 8024031C AFBF0018 */ sw $ra, 0x18($sp) +/* EC74D0 80240320 AFA00014 */ sw $zero, 0x14($sp) +/* EC74D4 80240324 E7A00010 */ swc1 $f0, 0x10($sp) +/* EC74D8 80240328 00A0302D */ daddu $a2, $a1, $zero +/* EC74DC 8024032C 0C01DEF4 */ jal func_80077BD0 +/* EC74E0 80240330 00A0382D */ daddu $a3, $a1, $zero +/* EC74E4 80240334 8FBF0018 */ lw $ra, 0x18($sp) +/* EC74E8 80240338 24020002 */ addiu $v0, $zero, 2 +/* EC74EC 8024033C 03E00008 */ jr $ra +/* EC74F0 80240340 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC71B0/func_80240344_EC74F4.s b/asm/nonmatchings/code_EC71B0/func_80240344_EC74F4.s new file mode 100644 index 0000000000..7f9f47be72 --- /dev/null +++ b/asm/nonmatchings/code_EC71B0/func_80240344_EC74F4.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240344_EC74F4 +/* EC74F4 80240344 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EC74F8 80240348 24020008 */ addiu $v0, $zero, 8 +/* EC74FC 8024034C 3C014348 */ lui $at, 0x4348 +/* EC7500 80240350 44810000 */ mtc1 $at, $f0 +/* EC7504 80240354 3C0142F0 */ lui $at, 0x42f0 +/* EC7508 80240358 44811000 */ mtc1 $at, $f2 +/* EC750C 8024035C 3C014080 */ lui $at, 0x4080 +/* EC7510 80240360 44812000 */ mtc1 $at, $f4 +/* EC7514 80240364 3C05C388 */ lui $a1, 0xc388 +/* EC7518 80240368 3C0642A0 */ lui $a2, 0x42a0 +/* EC751C 8024036C 3C0741A0 */ lui $a3, 0x41a0 +/* EC7520 80240370 24040003 */ addiu $a0, $zero, 3 +/* EC7524 80240374 AFBF0028 */ sw $ra, 0x28($sp) +/* EC7528 80240378 AFA2001C */ sw $v0, 0x1c($sp) +/* EC752C 8024037C AFA00020 */ sw $zero, 0x20($sp) +/* EC7530 80240380 E7A00010 */ swc1 $f0, 0x10($sp) +/* EC7534 80240384 E7A20014 */ swc1 $f2, 0x14($sp) +/* EC7538 80240388 0C01DD74 */ jal func_800775D0 +/* EC753C 8024038C E7A40018 */ swc1 $f4, 0x18($sp) +/* EC7540 80240390 8C43000C */ lw $v1, 0xc($v0) +/* EC7544 80240394 240500F0 */ addiu $a1, $zero, 0xf0 +/* EC7548 80240398 AC650038 */ sw $a1, 0x38($v1) +/* EC754C 8024039C 8C43000C */ lw $v1, 0xc($v0) +/* EC7550 802403A0 AC65003C */ sw $a1, 0x3c($v1) +/* EC7554 802403A4 8C43000C */ lw $v1, 0xc($v0) +/* EC7558 802403A8 AC650040 */ sw $a1, 0x40($v1) +/* EC755C 802403AC 8C43000C */ lw $v1, 0xc($v0) +/* EC7560 802403B0 240400E6 */ addiu $a0, $zero, 0xe6 +/* EC7564 802403B4 AC640048 */ sw $a0, 0x48($v1) +/* EC7568 802403B8 8C43000C */ lw $v1, 0xc($v0) +/* EC756C 802403BC AC64004C */ sw $a0, 0x4c($v1) +/* EC7570 802403C0 8C43000C */ lw $v1, 0xc($v0) +/* EC7574 802403C4 AC650050 */ sw $a1, 0x50($v1) +/* EC7578 802403C8 8FBF0028 */ lw $ra, 0x28($sp) +/* EC757C 802403CC 24020002 */ addiu $v0, $zero, 2 +/* EC7580 802403D0 03E00008 */ jr $ra +/* EC7584 802403D4 27BD0030 */ addiu $sp, $sp, 0x30 +/* EC7588 802403D8 00000000 */ nop +/* EC758C 802403DC 00000000 */ nop diff --git a/asm/nonmatchings/code_EC7590/func_802403E0_EC7590.s b/asm/nonmatchings/code_EC7590/func_802403E0_EC7590.s new file mode 100644 index 0000000000..40d74a5e4c --- /dev/null +++ b/asm/nonmatchings/code_EC7590/func_802403E0_EC7590.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403E0_EC7590 +/* EC7590 802403E0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EC7594 802403E4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* EC7598 802403E8 4485A000 */ mtc1 $a1, $f20 +/* EC759C 802403EC F7B60020 */ sdc1 $f22, 0x20($sp) +/* EC75A0 802403F0 4486B000 */ mtc1 $a2, $f22 +/* EC75A4 802403F4 AFB00010 */ sw $s0, 0x10($sp) +/* EC75A8 802403F8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* EC75AC 802403FC 4487C000 */ mtc1 $a3, $f24 +/* EC75B0 80240400 AFBF0014 */ sw $ra, 0x14($sp) +/* EC75B4 80240404 0C01B198 */ jal osGetCause +/* EC75B8 80240408 0080802D */ daddu $s0, $a0, $zero +/* EC75BC 8024040C 4616A582 */ mul.s $f22, $f20, $f22 +/* EC75C0 80240410 00000000 */ nop +/* EC75C4 80240414 4618A502 */ mul.s $f20, $f20, $f24 +/* EC75C8 80240418 00000000 */ nop +/* EC75CC 8024041C 3C013F80 */ lui $at, 0x3f80 +/* EC75D0 80240420 44810000 */ mtc1 $at, $f0 +/* EC75D4 80240424 00000000 */ nop +/* EC75D8 80240428 E6000014 */ swc1 $f0, 0x14($s0) +/* EC75DC 8024042C E6160010 */ swc1 $f22, 0x10($s0) +/* EC75E0 80240430 E6140018 */ swc1 $f20, 0x18($s0) +/* EC75E4 80240434 8FBF0014 */ lw $ra, 0x14($sp) +/* EC75E8 80240438 8FB00010 */ lw $s0, 0x10($sp) +/* EC75EC 8024043C D7B80028 */ ldc1 $f24, 0x28($sp) +/* EC75F0 80240440 D7B60020 */ ldc1 $f22, 0x20($sp) +/* EC75F4 80240444 D7B40018 */ ldc1 $f20, 0x18($sp) +/* EC75F8 80240448 03E00008 */ jr $ra +/* EC75FC 8024044C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EC7590/func_80240450_EC7600.s b/asm/nonmatchings/code_EC7590/func_80240450_EC7600.s new file mode 100644 index 0000000000..462574a6b9 --- /dev/null +++ b/asm/nonmatchings/code_EC7590/func_80240450_EC7600.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240450_EC7600 +/* EC7600 80240450 27BDFF78 */ addiu $sp, $sp, -0x88 +/* EC7604 80240454 AFB10054 */ sw $s1, 0x54($sp) +/* EC7608 80240458 0080882D */ daddu $s1, $a0, $zero +/* EC760C 8024045C AFBF005C */ sw $ra, 0x5c($sp) +/* EC7610 80240460 AFB20058 */ sw $s2, 0x58($sp) +/* EC7614 80240464 AFB00050 */ sw $s0, 0x50($sp) +/* EC7618 80240468 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* EC761C 8024046C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* EC7620 80240470 F7B80070 */ sdc1 $f24, 0x70($sp) +/* EC7624 80240474 F7B60068 */ sdc1 $f22, 0x68($sp) +/* EC7628 80240478 F7B40060 */ sdc1 $f20, 0x60($sp) +/* EC762C 8024047C 8E30000C */ lw $s0, 0xc($s1) +/* EC7630 80240480 8E050000 */ lw $a1, ($s0) +/* EC7634 80240484 0C0B53A3 */ jal func_802D4E8C +/* EC7638 80240488 26100004 */ addiu $s0, $s0, 4 +/* EC763C 8024048C 0C04949C */ jal func_80125270 +/* EC7640 80240490 0040202D */ daddu $a0, $v0, $zero +/* EC7644 80240494 8E050000 */ lw $a1, ($s0) +/* EC7648 80240498 26100004 */ addiu $s0, $s0, 4 +/* EC764C 8024049C 0220202D */ daddu $a0, $s1, $zero +/* EC7650 802404A0 0C0B55FF */ jal func_802D57FC +/* EC7654 802404A4 0040902D */ daddu $s2, $v0, $zero +/* EC7658 802404A8 8E050000 */ lw $a1, ($s0) +/* EC765C 802404AC 26100004 */ addiu $s0, $s0, 4 +/* EC7660 802404B0 0220202D */ daddu $a0, $s1, $zero +/* EC7664 802404B4 0C0B55FF */ jal func_802D57FC +/* EC7668 802404B8 46000706 */ mov.s $f28, $f0 +/* EC766C 802404BC 8E050000 */ lw $a1, ($s0) +/* EC7670 802404C0 26100004 */ addiu $s0, $s0, 4 +/* EC7674 802404C4 0220202D */ daddu $a0, $s1, $zero +/* EC7678 802404C8 0C0B55FF */ jal func_802D57FC +/* EC767C 802404CC 46000686 */ mov.s $f26, $f0 +/* EC7680 802404D0 0220202D */ daddu $a0, $s1, $zero +/* EC7684 802404D4 8E050000 */ lw $a1, ($s0) +/* EC7688 802404D8 0C0B55FF */ jal func_802D57FC +/* EC768C 802404DC 46000586 */ mov.s $f22, $f0 +/* EC7690 802404E0 0240202D */ daddu $a0, $s2, $zero +/* EC7694 802404E4 0C0493D1 */ jal func_80124F44 +/* EC7698 802404E8 46000606 */ mov.s $f24, $f0 +/* EC769C 802404EC 0040882D */ daddu $s1, $v0, $zero +/* EC76A0 802404F0 96220000 */ lhu $v0, ($s1) +/* EC76A4 802404F4 30420400 */ andi $v0, $v0, 0x400 +/* EC76A8 802404F8 1440001E */ bnez $v0, .L80240574 +/* EC76AC 802404FC 26300058 */ addiu $s0, $s1, 0x58 +/* EC76B0 80240500 4480A000 */ mtc1 $zero, $f20 +/* EC76B4 80240504 4406B000 */ mfc1 $a2, $f22 +/* EC76B8 80240508 4405A000 */ mfc1 $a1, $f20 +/* EC76BC 8024050C 4407A000 */ mfc1 $a3, $f20 +/* EC76C0 80240510 0C01B2B0 */ jal func_8006CAC0 +/* EC76C4 80240514 0200202D */ daddu $a0, $s0, $zero +/* EC76C8 80240518 4405E000 */ mfc1 $a1, $f28 +/* EC76CC 8024051C 4406D000 */ mfc1 $a2, $f26 +/* EC76D0 80240520 4407C000 */ mfc1 $a3, $f24 +/* EC76D4 80240524 0C0900F8 */ jal func_802403E0_EC7590 +/* EC76D8 80240528 27A40010 */ addiu $a0, $sp, 0x10 +/* EC76DC 8024052C 27A40010 */ addiu $a0, $sp, 0x10 +/* EC76E0 80240530 0200282D */ daddu $a1, $s0, $zero +/* EC76E4 80240534 0C01B1F0 */ jal osSiRawReadIo +/* EC76E8 80240538 0200302D */ daddu $a2, $s0, $zero +/* EC76EC 8024053C 27A40010 */ addiu $a0, $sp, 0x10 +/* EC76F0 80240540 4600B587 */ neg.s $f22, $f22 +/* EC76F4 80240544 4405A000 */ mfc1 $a1, $f20 +/* EC76F8 80240548 4406B000 */ mfc1 $a2, $f22 +/* EC76FC 8024054C 0C01B2B0 */ jal func_8006CAC0 +/* EC7700 80240550 00A0382D */ daddu $a3, $a1, $zero +/* EC7704 80240554 27A40010 */ addiu $a0, $sp, 0x10 +/* EC7708 80240558 0200282D */ daddu $a1, $s0, $zero +/* EC770C 8024055C 0C01B1F0 */ jal osSiRawReadIo +/* EC7710 80240560 00A0302D */ daddu $a2, $a1, $zero +/* EC7714 80240564 96220000 */ lhu $v0, ($s1) +/* EC7718 80240568 34421400 */ ori $v0, $v0, 0x1400 +/* EC771C 8024056C 0809017B */ j .L802405EC +/* EC7720 80240570 A6220000 */ sh $v0, ($s1) +.L80240574: +/* EC7724 80240574 4480A000 */ mtc1 $zero, $f20 +/* EC7728 80240578 4406B000 */ mfc1 $a2, $f22 +/* EC772C 8024057C 4405A000 */ mfc1 $a1, $f20 +/* EC7730 80240580 4407A000 */ mfc1 $a3, $f20 +/* EC7734 80240584 0C01B2B0 */ jal func_8006CAC0 +/* EC7738 80240588 27A40010 */ addiu $a0, $sp, 0x10 +/* EC773C 8024058C 27A40010 */ addiu $a0, $sp, 0x10 +/* EC7740 80240590 26300058 */ addiu $s0, $s1, 0x58 +/* EC7744 80240594 0200282D */ daddu $a1, $s0, $zero +/* EC7748 80240598 0C01B1F0 */ jal osSiRawReadIo +/* EC774C 8024059C 0200302D */ daddu $a2, $s0, $zero +/* EC7750 802405A0 4405E000 */ mfc1 $a1, $f28 +/* EC7754 802405A4 4406D000 */ mfc1 $a2, $f26 +/* EC7758 802405A8 4407C000 */ mfc1 $a3, $f24 +/* EC775C 802405AC 0C0900F8 */ jal func_802403E0_EC7590 +/* EC7760 802405B0 27A40010 */ addiu $a0, $sp, 0x10 +/* EC7764 802405B4 27A40010 */ addiu $a0, $sp, 0x10 +/* EC7768 802405B8 0200282D */ daddu $a1, $s0, $zero +/* EC776C 802405BC 0C01B1F0 */ jal osSiRawReadIo +/* EC7770 802405C0 0200302D */ daddu $a2, $s0, $zero +/* EC7774 802405C4 27A40010 */ addiu $a0, $sp, 0x10 +/* EC7778 802405C8 4600B587 */ neg.s $f22, $f22 +/* EC777C 802405CC 4405A000 */ mfc1 $a1, $f20 +/* EC7780 802405D0 4406B000 */ mfc1 $a2, $f22 +/* EC7784 802405D4 0C01B2B0 */ jal func_8006CAC0 +/* EC7788 802405D8 00A0382D */ daddu $a3, $a1, $zero +/* EC778C 802405DC 27A40010 */ addiu $a0, $sp, 0x10 +/* EC7790 802405E0 0200282D */ daddu $a1, $s0, $zero +/* EC7794 802405E4 0C01B1F0 */ jal osSiRawReadIo +/* EC7798 802405E8 00A0302D */ daddu $a2, $a1, $zero +.L802405EC: +/* EC779C 802405EC 8FBF005C */ lw $ra, 0x5c($sp) +/* EC77A0 802405F0 8FB20058 */ lw $s2, 0x58($sp) +/* EC77A4 802405F4 8FB10054 */ lw $s1, 0x54($sp) +/* EC77A8 802405F8 8FB00050 */ lw $s0, 0x50($sp) +/* EC77AC 802405FC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* EC77B0 80240600 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* EC77B4 80240604 D7B80070 */ ldc1 $f24, 0x70($sp) +/* EC77B8 80240608 D7B60068 */ ldc1 $f22, 0x68($sp) +/* EC77BC 8024060C D7B40060 */ ldc1 $f20, 0x60($sp) +/* EC77C0 80240610 24020002 */ addiu $v0, $zero, 2 +/* EC77C4 80240614 03E00008 */ jr $ra +/* EC77C8 80240618 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/code_EC7590/func_8024061C_EC77CC.s b/asm/nonmatchings/code_EC7590/func_8024061C_EC77CC.s new file mode 100644 index 0000000000..74ebc5e716 --- /dev/null +++ b/asm/nonmatchings/code_EC7590/func_8024061C_EC77CC.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024061C_EC77CC +/* EC77CC 8024061C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EC77D0 80240620 AFB00010 */ sw $s0, 0x10($sp) +/* EC77D4 80240624 3C108024 */ lui $s0, %hi(D_80241BB0) +/* EC77D8 80240628 26101BB0 */ addiu $s0, $s0, %lo(D_80241BB0) +/* EC77DC 8024062C AFBF0018 */ sw $ra, 0x18($sp) +/* EC77E0 80240630 AFB10014 */ sw $s1, 0x14($sp) +/* EC77E4 80240634 8E020000 */ lw $v0, ($s0) +/* EC77E8 80240638 14400010 */ bnez $v0, .L8024067C +/* EC77EC 8024063C 0080882D */ daddu $s1, $a0, $zero +/* EC77F0 80240640 0C00AFF5 */ jal func_8002BFD4 +/* EC77F4 80240644 24040040 */ addiu $a0, $zero, 0x40 +/* EC77F8 80240648 AE020000 */ sw $v0, ($s0) +/* EC77FC 8024064C 0000182D */ daddu $v1, $zero, $zero +/* EC7800 80240650 0040282D */ daddu $a1, $v0, $zero +/* EC7804 80240654 0220202D */ daddu $a0, $s1, $zero +.L80240658: +/* EC7808 80240658 8C820084 */ lw $v0, 0x84($a0) +/* EC780C 8024065C 24840004 */ addiu $a0, $a0, 4 +/* EC7810 80240660 24630001 */ addiu $v1, $v1, 1 +/* EC7814 80240664 ACA20000 */ sw $v0, ($a1) +/* EC7818 80240668 28620010 */ slti $v0, $v1, 0x10 +/* EC781C 8024066C 1440FFFA */ bnez $v0, .L80240658 +/* EC7820 80240670 24A50004 */ addiu $a1, $a1, 4 +/* EC7824 80240674 080901AE */ j .L802406B8 +/* EC7828 80240678 00000000 */ nop +.L8024067C: +/* EC782C 8024067C 0000182D */ daddu $v1, $zero, $zero +/* EC7830 80240680 0040282D */ daddu $a1, $v0, $zero +/* EC7834 80240684 0220202D */ daddu $a0, $s1, $zero +.L80240688: +/* EC7838 80240688 8CA20000 */ lw $v0, ($a1) +/* EC783C 8024068C 24A50004 */ addiu $a1, $a1, 4 +/* EC7840 80240690 24630001 */ addiu $v1, $v1, 1 +/* EC7844 80240694 AC820084 */ sw $v0, 0x84($a0) +/* EC7848 80240698 28620010 */ slti $v0, $v1, 0x10 +/* EC784C 8024069C 1440FFFA */ bnez $v0, .L80240688 +/* EC7850 802406A0 24840004 */ addiu $a0, $a0, 4 +/* EC7854 802406A4 3C108024 */ lui $s0, %hi(D_80241BB0) +/* EC7858 802406A8 26101BB0 */ addiu $s0, $s0, %lo(D_80241BB0) +/* EC785C 802406AC 0C00B007 */ jal func_8002C01C +/* EC7860 802406B0 8E040000 */ lw $a0, ($s0) +/* EC7864 802406B4 AE000000 */ sw $zero, ($s0) +.L802406B8: +/* EC7868 802406B8 8FBF0018 */ lw $ra, 0x18($sp) +/* EC786C 802406BC 8FB10014 */ lw $s1, 0x14($sp) +/* EC7870 802406C0 8FB00010 */ lw $s0, 0x10($sp) +/* EC7874 802406C4 24020002 */ addiu $v0, $zero, 2 +/* EC7878 802406C8 03E00008 */ jr $ra +/* EC787C 802406CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC7590/func_802406D0_EC7880.s b/asm/nonmatchings/code_EC7590/func_802406D0_EC7880.s new file mode 100644 index 0000000000..c8661fe6b5 --- /dev/null +++ b/asm/nonmatchings/code_EC7590/func_802406D0_EC7880.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406D0_EC7880 +/* EC7880 802406D0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EC7884 802406D4 AFB00010 */ sw $s0, 0x10($sp) +/* EC7888 802406D8 0080802D */ daddu $s0, $a0, $zero +/* EC788C 802406DC AFBF0018 */ sw $ra, 0x18($sp) +/* EC7890 802406E0 AFB10014 */ sw $s1, 0x14($sp) +/* EC7894 802406E4 8E02000C */ lw $v0, 0xc($s0) +/* EC7898 802406E8 8C510000 */ lw $s1, ($v0) +/* EC789C 802406EC 0C0B53A3 */ jal func_802D4E8C +/* EC78A0 802406F0 0220282D */ daddu $a1, $s1, $zero +/* EC78A4 802406F4 3C03FFF0 */ lui $v1, 0xfff0 +/* EC78A8 802406F8 3463FFFF */ ori $v1, $v1, 0xffff +/* EC78AC 802406FC 0200202D */ daddu $a0, $s0, $zero +/* EC78B0 80240700 00431024 */ and $v0, $v0, $v1 +/* EC78B4 80240704 00021140 */ sll $v0, $v0, 5 +/* EC78B8 80240708 3C068009 */ lui $a2, %hi(D_8008D2C0) +/* EC78BC 8024070C 00C23021 */ addu $a2, $a2, $v0 +/* EC78C0 80240710 8CC6D2C0 */ lw $a2, %lo(D_8008D2C0)($a2) +/* EC78C4 80240714 0C0B551A */ jal func_802D5468 +/* EC78C8 80240718 0220282D */ daddu $a1, $s1, $zero +/* EC78CC 8024071C 8FBF0018 */ lw $ra, 0x18($sp) +/* EC78D0 80240720 8FB10014 */ lw $s1, 0x14($sp) +/* EC78D4 80240724 8FB00010 */ lw $s0, 0x10($sp) +/* EC78D8 80240728 24020002 */ addiu $v0, $zero, 2 +/* EC78DC 8024072C 03E00008 */ jr $ra +/* EC78E0 80240730 27BD0020 */ addiu $sp, $sp, 0x20 +/* EC78E4 80240734 00000000 */ nop +/* EC78E8 80240738 00000000 */ nop +/* EC78EC 8024073C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC9D00/func_80240000_EC9D00.s b/asm/nonmatchings/code_EC9D00/func_80240000_EC9D00.s new file mode 100644 index 0000000000..8383675774 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240000_EC9D00.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EC9D00 +/* EC9D00 80240000 3C03800A */ lui $v1, %hi(D_800A15A8) +/* EC9D04 80240004 246315A8 */ addiu $v1, $v1, %lo(D_800A15A8) +/* EC9D08 80240008 8C620000 */ lw $v0, ($v1) +/* EC9D0C 8024000C 34420040 */ ori $v0, $v0, 0x40 +/* EC9D10 80240010 AC620000 */ sw $v0, ($v1) +/* EC9D14 80240014 03E00008 */ jr $ra +/* EC9D18 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EC9D00/func_8024001C_EC9D1C.s b/asm/nonmatchings/code_EC9D00/func_8024001C_EC9D1C.s new file mode 100644 index 0000000000..84a8d3e0d4 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_8024001C_EC9D1C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024001C_EC9D1C +/* EC9D1C 8024001C 3C02800A */ lui $v0, %hi(D_800A15A8) +/* EC9D20 80240020 244215A8 */ addiu $v0, $v0, %lo(D_800A15A8) +/* EC9D24 80240024 8C430000 */ lw $v1, ($v0) +/* EC9D28 80240028 2404FFBF */ addiu $a0, $zero, -0x41 +/* EC9D2C 8024002C 00641824 */ and $v1, $v1, $a0 +/* EC9D30 80240030 AC430000 */ sw $v1, ($v0) +/* EC9D34 80240034 03E00008 */ jr $ra +/* EC9D38 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EC9D00/func_8024003C_EC9D3C.s b/asm/nonmatchings/code_EC9D00/func_8024003C_EC9D3C.s new file mode 100644 index 0000000000..d5bedd5795 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_8024003C_EC9D3C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024003C_EC9D3C +/* EC9D3C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EC9D40 80240040 AFBF0010 */ sw $ra, 0x10($sp) +/* EC9D44 80240044 8C82000C */ lw $v0, 0xc($a0) +/* EC9D48 80240048 0C0B53A3 */ jal func_802D4E8C +/* EC9D4C 8024004C 8C450000 */ lw $a1, ($v0) +/* EC9D50 80240050 0C0BCEC0 */ jal func_802F3B00 +/* EC9D54 80240054 0040202D */ daddu $a0, $v0, $zero +/* EC9D58 80240058 8FBF0010 */ lw $ra, 0x10($sp) +/* EC9D5C 8024005C 24020002 */ addiu $v0, $zero, 2 +/* EC9D60 80240060 03E00008 */ jr $ra +/* EC9D64 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EC9D00/func_80240068_EC9D68.s b/asm/nonmatchings/code_EC9D00/func_80240068_EC9D68.s new file mode 100644 index 0000000000..344553a260 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240068_EC9D68.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240068_EC9D68 +/* EC9D68 80240068 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EC9D6C 8024006C AFB00010 */ sw $s0, 0x10($sp) +/* EC9D70 80240070 0080802D */ daddu $s0, $a0, $zero +/* EC9D74 80240074 AFBF0018 */ sw $ra, 0x18($sp) +/* EC9D78 80240078 AFB10014 */ sw $s1, 0x14($sp) +/* EC9D7C 8024007C 8E11000C */ lw $s1, 0xc($s0) +/* EC9D80 80240080 8E250000 */ lw $a1, ($s1) +/* EC9D84 80240084 0C0B53A3 */ jal func_802D4E8C +/* EC9D88 80240088 26310004 */ addiu $s1, $s1, 4 +/* EC9D8C 8024008C 0200202D */ daddu $a0, $s0, $zero +/* EC9D90 80240090 3C038011 */ lui $v1, %hi(D_80117840) +/* EC9D94 80240094 24637840 */ addiu $v1, $v1, %lo(D_80117840) +/* EC9D98 80240098 000210C0 */ sll $v0, $v0, 3 +/* EC9D9C 8024009C 00431021 */ addu $v0, $v0, $v1 +/* EC9DA0 802400A0 90460015 */ lbu $a2, 0x15($v0) +/* EC9DA4 802400A4 8E250000 */ lw $a1, ($s1) +/* EC9DA8 802400A8 24C60001 */ addiu $a2, $a2, 1 +/* EC9DAC 802400AC A0460015 */ sb $a2, 0x15($v0) +/* EC9DB0 802400B0 00063600 */ sll $a2, $a2, 0x18 +/* EC9DB4 802400B4 0C0B551A */ jal func_802D5468 +/* EC9DB8 802400B8 00063603 */ sra $a2, $a2, 0x18 +/* EC9DBC 802400BC 8FBF0018 */ lw $ra, 0x18($sp) +/* EC9DC0 802400C0 8FB10014 */ lw $s1, 0x14($sp) +/* EC9DC4 802400C4 8FB00010 */ lw $s0, 0x10($sp) +/* EC9DC8 802400C8 24020002 */ addiu $v0, $zero, 2 +/* EC9DCC 802400CC 03E00008 */ jr $ra +/* EC9DD0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC9D00/func_802400D4_EC9DD4.s b/asm/nonmatchings/code_EC9D00/func_802400D4_EC9DD4.s new file mode 100644 index 0000000000..489249bdff --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_802400D4_EC9DD4.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400D4_EC9DD4 +/* EC9DD4 802400D4 3C028011 */ lui $v0, %hi(D_80117840) +/* EC9DD8 802400D8 24427840 */ addiu $v0, $v0, %lo(D_80117840) +/* EC9DDC 802400DC 000420C0 */ sll $a0, $a0, 3 +/* EC9DE0 802400E0 00822021 */ addu $a0, $a0, $v0 +/* EC9DE4 802400E4 90820014 */ lbu $v0, 0x14($a0) +/* EC9DE8 802400E8 10400009 */ beqz $v0, .L80240110 +/* EC9DEC 802400EC 00000000 */ nop +/* EC9DF0 802400F0 90820015 */ lbu $v0, 0x15($a0) +/* EC9DF4 802400F4 00022600 */ sll $a0, $v0, 0x18 +/* EC9DF8 802400F8 00041E03 */ sra $v1, $a0, 0x18 +/* EC9DFC 802400FC 00051400 */ sll $v0, $a1, 0x10 +/* EC9E00 80240100 00021403 */ sra $v0, $v0, 0x10 +/* EC9E04 80240104 0043102A */ slt $v0, $v0, $v1 +/* EC9E08 80240108 10400003 */ beqz $v0, .L80240118 +/* EC9E0C 8024010C 00000000 */ nop +.L80240110: +/* EC9E10 80240110 03E00008 */ jr $ra +/* EC9E14 80240114 2402FFFF */ addiu $v0, $zero, -1 +.L80240118: +/* EC9E18 80240118 03E00008 */ jr $ra +/* EC9E1C 8024011C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/code_EC9D00/func_80240120_EC9E20.s b/asm/nonmatchings/code_EC9D00/func_80240120_EC9E20.s new file mode 100644 index 0000000000..aa2d327e9f --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240120_EC9E20.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240120_EC9E20 +/* EC9E20 80240120 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EC9E24 80240124 AFB3001C */ sw $s3, 0x1c($sp) +/* EC9E28 80240128 0080982D */ daddu $s3, $a0, $zero +/* EC9E2C 8024012C AFB00010 */ sw $s0, 0x10($sp) +/* EC9E30 80240130 24100001 */ addiu $s0, $zero, 1 +/* EC9E34 80240134 AFB40020 */ sw $s4, 0x20($sp) +/* EC9E38 80240138 2414FFFF */ addiu $s4, $zero, -1 +/* EC9E3C 8024013C AFB50024 */ sw $s5, 0x24($sp) +/* EC9E40 80240140 0200A82D */ daddu $s5, $s0, $zero +/* EC9E44 80240144 AFB10014 */ sw $s1, 0x14($sp) +/* EC9E48 80240148 3C118011 */ lui $s1, %hi(D_80117848) +/* EC9E4C 8024014C 26317848 */ addiu $s1, $s1, %lo(D_80117848) +/* EC9E50 80240150 AFBF0028 */ sw $ra, 0x28($sp) +/* EC9E54 80240154 AFB20018 */ sw $s2, 0x18($sp) +/* EC9E58 80240158 8E6200B4 */ lw $v0, 0xb4($s3) +/* EC9E5C 8024015C 0280182D */ daddu $v1, $s4, $zero +/* EC9E60 80240160 AE630084 */ sw $v1, 0x84($s3) +/* EC9E64 80240164 00021027 */ nor $v0, $zero, $v0 +/* EC9E68 80240168 000217C2 */ srl $v0, $v0, 0x1f +/* EC9E6C 8024016C 00029400 */ sll $s2, $v0, 0x10 +.L80240170: +/* EC9E70 80240170 92220014 */ lbu $v0, 0x14($s1) +/* EC9E74 80240174 50400008 */ beql $v0, $zero, .L80240198 +/* EC9E78 80240178 26100001 */ addiu $s0, $s0, 1 +/* EC9E7C 8024017C 0200202D */ daddu $a0, $s0, $zero +/* EC9E80 80240180 0C090035 */ jal func_802400D4_EC9DD4 +/* EC9E84 80240184 00122C03 */ sra $a1, $s2, 0x10 +/* EC9E88 80240188 10540003 */ beq $v0, $s4, .L80240198 +/* EC9E8C 8024018C 26100001 */ addiu $s0, $s0, 1 +/* EC9E90 80240190 08090069 */ j .L802401A4 +/* EC9E94 80240194 AE750084 */ sw $s5, 0x84($s3) +.L80240198: +/* EC9E98 80240198 2A02000C */ slti $v0, $s0, 0xc +/* EC9E9C 8024019C 1440FFF4 */ bnez $v0, .L80240170 +/* EC9EA0 802401A0 26310008 */ addiu $s1, $s1, 8 +.L802401A4: +/* EC9EA4 802401A4 8FBF0028 */ lw $ra, 0x28($sp) +/* EC9EA8 802401A8 8FB50024 */ lw $s5, 0x24($sp) +/* EC9EAC 802401AC 8FB40020 */ lw $s4, 0x20($sp) +/* EC9EB0 802401B0 8FB3001C */ lw $s3, 0x1c($sp) +/* EC9EB4 802401B4 8FB20018 */ lw $s2, 0x18($sp) +/* EC9EB8 802401B8 8FB10014 */ lw $s1, 0x14($sp) +/* EC9EBC 802401BC 8FB00010 */ lw $s0, 0x10($sp) +/* EC9EC0 802401C0 24020002 */ addiu $v0, $zero, 2 +/* EC9EC4 802401C4 03E00008 */ jr $ra +/* EC9EC8 802401C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EC9D00/func_802401CC_EC9ECC.s b/asm/nonmatchings/code_EC9D00/func_802401CC_EC9ECC.s new file mode 100644 index 0000000000..75a9db4e6b --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_802401CC_EC9ECC.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401CC_EC9ECC +/* EC9ECC 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* EC9ED0 802401D0 AFB5002C */ sw $s5, 0x2c($sp) +/* EC9ED4 802401D4 0080A82D */ daddu $s5, $a0, $zero +/* EC9ED8 802401D8 AFBE0038 */ sw $fp, 0x38($sp) +/* EC9EDC 802401DC 3C1E8011 */ lui $fp, %hi(D_80117840) +/* EC9EE0 802401E0 27DE7840 */ addiu $fp, $fp, %lo(D_80117840) +/* EC9EE4 802401E4 AFBF003C */ sw $ra, 0x3c($sp) +/* EC9EE8 802401E8 AFB70034 */ sw $s7, 0x34($sp) +/* EC9EEC 802401EC AFB60030 */ sw $s6, 0x30($sp) +/* EC9EF0 802401F0 AFB40028 */ sw $s4, 0x28($sp) +/* EC9EF4 802401F4 AFB30024 */ sw $s3, 0x24($sp) +/* EC9EF8 802401F8 AFB20020 */ sw $s2, 0x20($sp) +/* EC9EFC 802401FC AFB1001C */ sw $s1, 0x1c($sp) +/* EC9F00 80240200 10A0004F */ beqz $a1, .L80240340 +/* EC9F04 80240204 AFB00018 */ sw $s0, 0x18($sp) +/* EC9F08 80240208 0C00AFF5 */ jal func_8002BFD4 +/* EC9F0C 8024020C 24040330 */ addiu $a0, $zero, 0x330 +/* EC9F10 80240210 0040982D */ daddu $s3, $v0, $zero +/* EC9F14 80240214 0000B02D */ daddu $s6, $zero, $zero +/* EC9F18 80240218 02C0902D */ daddu $s2, $s6, $zero +/* EC9F1C 8024021C 3C148024 */ lui $s4, %hi(func_80241FE8_D3C5B8) +/* EC9F20 80240220 26941FE8 */ addiu $s4, $s4, %lo(func_80241FE8_D3C5B8) +/* EC9F24 80240224 0260882D */ daddu $s1, $s3, $zero +/* EC9F28 80240228 8EA200B4 */ lw $v0, 0xb4($s5) +/* EC9F2C 8024022C 3C038024 */ lui $v1, %hi(D_80241FE0) +/* EC9F30 80240230 24631FE0 */ addiu $v1, $v1, %lo(D_80241FE0) +/* EC9F34 80240234 AEB30078 */ sw $s3, 0x78($s5) +/* EC9F38 80240238 00021027 */ nor $v0, $zero, $v0 +/* EC9F3C 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f +/* EC9F40 80240240 00171080 */ sll $v0, $s7, 2 +/* EC9F44 80240244 00431021 */ addu $v0, $v0, $v1 +/* EC9F48 80240248 AFA20010 */ sw $v0, 0x10($sp) +.L8024024C: +/* EC9F4C 8024024C 86900000 */ lh $s0, ($s4) +/* EC9F50 80240250 001010C0 */ sll $v0, $s0, 3 +/* EC9F54 80240254 03C21021 */ addu $v0, $fp, $v0 +/* EC9F58 80240258 90420014 */ lbu $v0, 0x14($v0) +/* EC9F5C 8024025C 5040002E */ beql $v0, $zero, .L80240318 +/* EC9F60 80240260 26520001 */ addiu $s2, $s2, 1 +/* EC9F64 80240264 00101100 */ sll $v0, $s0, 4 +/* EC9F68 80240268 3C068009 */ lui $a2, %hi(D_80094900) +/* EC9F6C 8024026C 24C64900 */ addiu $a2, $a2, %lo(D_80094900) +/* EC9F70 80240270 00461021 */ addu $v0, $v0, $a2 +/* EC9F74 80240274 0200202D */ daddu $a0, $s0, $zero +/* EC9F78 80240278 AE300108 */ sw $s0, 0x108($s1) +/* EC9F7C 8024027C 8C420000 */ lw $v0, ($v0) +/* EC9F80 80240280 02E0282D */ daddu $a1, $s7, $zero +/* EC9F84 80240284 0C090035 */ jal func_802400D4_EC9DD4 +/* EC9F88 80240288 AE220084 */ sw $v0, 0x84($s1) +/* EC9F8C 8024028C 0040202D */ daddu $a0, $v0, $zero +/* EC9F90 80240290 04800011 */ bltz $a0, .L802402D8 +/* EC9F94 80240294 00101080 */ sll $v0, $s0, 2 +/* EC9F98 80240298 3C068010 */ lui $a2, %hi(D_80100060) +/* EC9F9C 8024029C 24C60060 */ addiu $a2, $a2, %lo(D_80100060) +/* EC9FA0 802402A0 00461021 */ addu $v0, $v0, $a2 +/* EC9FA4 802402A4 8C430000 */ lw $v1, ($v0) +/* EC9FA8 802402A8 24020001 */ addiu $v0, $zero, 1 +/* EC9FAC 802402AC AE22018C */ sw $v0, 0x18c($s1) +/* EC9FB0 802402B0 00041080 */ sll $v0, $a0, 2 +/* EC9FB4 802402B4 3C068024 */ lui $a2, %hi(func_80241FF8_C41DA8) +/* EC9FB8 802402B8 24C61FF8 */ addiu $a2, $a2, %lo(func_80241FF8_C41DA8) +/* EC9FBC 802402BC AE230000 */ sw $v1, ($s1) +/* EC9FC0 802402C0 001218C0 */ sll $v1, $s2, 3 +/* EC9FC4 802402C4 00431021 */ addu $v0, $v0, $v1 +/* EC9FC8 802402C8 00461021 */ addu $v0, $v0, $a2 +/* EC9FCC 802402CC 8C420000 */ lw $v0, ($v0) +/* EC9FD0 802402D0 080900BF */ j .L802402FC +/* EC9FD4 802402D4 AE220294 */ sw $v0, 0x294($s1) +.L802402D8: +/* EC9FD8 802402D8 3C068010 */ lui $a2, %hi(D_801000A0) +/* EC9FDC 802402DC 24C600A0 */ addiu $a2, $a2, %lo(D_801000A0) +/* EC9FE0 802402E0 00461021 */ addu $v0, $v0, $a2 +/* EC9FE4 802402E4 8C420000 */ lw $v0, ($v0) +/* EC9FE8 802402E8 AE20018C */ sw $zero, 0x18c($s1) +/* EC9FEC 802402EC AE220000 */ sw $v0, ($s1) +/* EC9FF0 802402F0 8FA60010 */ lw $a2, 0x10($sp) +/* EC9FF4 802402F4 8CC20000 */ lw $v0, ($a2) +/* EC9FF8 802402F8 AE220294 */ sw $v0, 0x294($s1) +.L802402FC: +/* EC9FFC 802402FC 001010C0 */ sll $v0, $s0, 3 +/* ECA000 80240300 03C21021 */ addu $v0, $fp, $v0 +/* ECA004 80240304 80420015 */ lb $v0, 0x15($v0) +/* ECA008 80240308 26D60001 */ addiu $s6, $s6, 1 +/* ECA00C 8024030C AE220210 */ sw $v0, 0x210($s1) +/* ECA010 80240310 26310004 */ addiu $s1, $s1, 4 +/* ECA014 80240314 26520001 */ addiu $s2, $s2, 1 +.L80240318: +/* ECA018 80240318 2A420008 */ slti $v0, $s2, 8 +/* ECA01C 8024031C 1440FFCB */ bnez $v0, .L8024024C +/* ECA020 80240320 26940002 */ addiu $s4, $s4, 2 +/* ECA024 80240324 0260202D */ daddu $a0, $s3, $zero +/* ECA028 80240328 24020004 */ addiu $v0, $zero, 4 +/* ECA02C 8024032C AC820318 */ sw $v0, 0x318($a0) +/* ECA030 80240330 AC960324 */ sw $s6, 0x324($a0) +/* ECA034 80240334 0C03F343 */ jal func_800FCD0C +/* ECA038 80240338 AC800328 */ sw $zero, 0x328($a0) +/* ECA03C 8024033C AEA00070 */ sw $zero, 0x70($s5) +.L80240340: +/* ECA040 80240340 8EA20070 */ lw $v0, 0x70($s5) +/* ECA044 80240344 8EB30078 */ lw $s3, 0x78($s5) +/* ECA048 80240348 14400008 */ bnez $v0, .L8024036C +/* ECA04C 8024034C 24420001 */ addiu $v0, $v0, 1 +/* ECA050 80240350 8662032C */ lh $v0, 0x32c($s3) +/* ECA054 80240354 10400009 */ beqz $v0, .L8024037C +/* ECA058 80240358 AEA20074 */ sw $v0, 0x74($s5) +/* ECA05C 8024035C 0C03E498 */ jal func_800F9260 +/* ECA060 80240360 00000000 */ nop +/* ECA064 80240364 8EA20070 */ lw $v0, 0x70($s5) +/* ECA068 80240368 24420001 */ addiu $v0, $v0, 1 +.L8024036C: +/* ECA06C 8024036C AEA20070 */ sw $v0, 0x70($s5) +/* ECA070 80240370 2842000F */ slti $v0, $v0, 0xf +/* ECA074 80240374 10400003 */ beqz $v0, .L80240384 +/* ECA078 80240378 00000000 */ nop +.L8024037C: +/* ECA07C 8024037C 080900FB */ j .L802403EC +/* ECA080 80240380 0000102D */ daddu $v0, $zero, $zero +.L80240384: +/* ECA084 80240384 0C03E4FA */ jal func_800F93E8 +/* ECA088 80240388 00000000 */ nop +/* ECA08C 8024038C 8EA30074 */ lw $v1, 0x74($s5) +/* ECA090 80240390 240200FF */ addiu $v0, $zero, 0xff +/* ECA094 80240394 10620010 */ beq $v1, $v0, .L802403D8 +/* ECA098 80240398 2462FFFF */ addiu $v0, $v1, -1 +/* ECA09C 8024039C 00021080 */ sll $v0, $v0, 2 +/* ECA0A0 802403A0 02621021 */ addu $v0, $s3, $v0 +/* ECA0A4 802403A4 8C420108 */ lw $v0, 0x108($v0) +/* ECA0A8 802403A8 00021100 */ sll $v0, $v0, 4 +/* ECA0AC 802403AC 3C038009 */ lui $v1, %hi(D_80094900) +/* ECA0B0 802403B0 00621821 */ addu $v1, $v1, $v0 +/* ECA0B4 802403B4 8C634900 */ lw $v1, %lo(D_80094900)($v1) +/* ECA0B8 802403B8 8EA20074 */ lw $v0, 0x74($s5) +/* ECA0BC 802403BC 2442FFFF */ addiu $v0, $v0, -1 +/* ECA0C0 802403C0 00021080 */ sll $v0, $v0, 2 +/* ECA0C4 802403C4 02621021 */ addu $v0, $s3, $v0 +/* ECA0C8 802403C8 AEA30084 */ sw $v1, 0x84($s5) +/* ECA0CC 802403CC 8C420108 */ lw $v0, 0x108($v0) +/* ECA0D0 802403D0 080900F8 */ j .L802403E0 +/* ECA0D4 802403D4 AEA20088 */ sw $v0, 0x88($s5) +.L802403D8: +/* ECA0D8 802403D8 2402FFFF */ addiu $v0, $zero, -1 +/* ECA0DC 802403DC AEA20084 */ sw $v0, 0x84($s5) +.L802403E0: +/* ECA0E0 802403E0 0C00B007 */ jal func_8002C01C +/* ECA0E4 802403E4 8EA40078 */ lw $a0, 0x78($s5) +/* ECA0E8 802403E8 24020002 */ addiu $v0, $zero, 2 +.L802403EC: +/* ECA0EC 802403EC 8FBF003C */ lw $ra, 0x3c($sp) +/* ECA0F0 802403F0 8FBE0038 */ lw $fp, 0x38($sp) +/* ECA0F4 802403F4 8FB70034 */ lw $s7, 0x34($sp) +/* ECA0F8 802403F8 8FB60030 */ lw $s6, 0x30($sp) +/* ECA0FC 802403FC 8FB5002C */ lw $s5, 0x2c($sp) +/* ECA100 80240400 8FB40028 */ lw $s4, 0x28($sp) +/* ECA104 80240404 8FB30024 */ lw $s3, 0x24($sp) +/* ECA108 80240408 8FB20020 */ lw $s2, 0x20($sp) +/* ECA10C 8024040C 8FB1001C */ lw $s1, 0x1c($sp) +/* ECA110 80240410 8FB00018 */ lw $s0, 0x18($sp) +/* ECA114 80240414 03E00008 */ jr $ra +/* ECA118 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_EC9D00/func_8024041C_ECA11C.s b/asm/nonmatchings/code_EC9D00/func_8024041C_ECA11C.s new file mode 100644 index 0000000000..9418c6be94 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_8024041C_ECA11C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024041C_ECA11C +/* ECA11C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ECA120 80240420 AFBF0010 */ sw $ra, 0x10($sp) +/* ECA124 80240424 8C82000C */ lw $v0, 0xc($a0) +/* ECA128 80240428 0C0B53A3 */ jal func_802D4E8C +/* ECA12C 8024042C 8C450000 */ lw $a1, ($v0) +/* ECA130 80240430 0C03CB57 */ jal func_800F2D5C +/* ECA134 80240434 0040202D */ daddu $a0, $v0, $zero +/* ECA138 80240438 8FBF0010 */ lw $ra, 0x10($sp) +/* ECA13C 8024043C 24020002 */ addiu $v0, $zero, 2 +/* ECA140 80240440 03E00008 */ jr $ra +/* ECA144 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EC9D00/func_80240448_ECA148.s b/asm/nonmatchings/code_EC9D00/func_80240448_ECA148.s new file mode 100644 index 0000000000..1335208e53 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240448_ECA148.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240448_ECA148 +/* ECA148 80240448 3C028011 */ lui $v0, %hi(D_80117852) +/* ECA14C 8024044C 80427852 */ lb $v0, %lo(D_80117852)($v0) +/* ECA150 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ECA154 80240454 AFBF0010 */ sw $ra, 0x10($sp) +/* ECA158 80240458 00021100 */ sll $v0, $v0, 4 +/* ECA15C 8024045C 3C048009 */ lui $a0, %hi(D_80094900) +/* ECA160 80240460 00822021 */ addu $a0, $a0, $v0 +/* ECA164 80240464 8C844900 */ lw $a0, %lo(D_80094900)($a0) +/* ECA168 80240468 0C04C31D */ jal func_80130C74 +/* ECA16C 8024046C 0000282D */ daddu $a1, $zero, $zero +/* ECA170 80240470 8FBF0010 */ lw $ra, 0x10($sp) +/* ECA174 80240474 24020002 */ addiu $v0, $zero, 2 +/* ECA178 80240478 03E00008 */ jr $ra +/* ECA17C 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EC9D00/func_80240480_ECA180.s b/asm/nonmatchings/code_EC9D00/func_80240480_ECA180.s new file mode 100644 index 0000000000..68452e2cb6 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240480_ECA180.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240480_ECA180 +/* ECA180 80240480 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* ECA184 80240484 AFB1001C */ sw $s1, 0x1c($sp) +/* ECA188 80240488 0080882D */ daddu $s1, $a0, $zero +/* ECA18C 8024048C AFBF0020 */ sw $ra, 0x20($sp) +/* ECA190 80240490 AFB00018 */ sw $s0, 0x18($sp) +/* ECA194 80240494 8E30000C */ lw $s0, 0xc($s1) +/* ECA198 80240498 8E050000 */ lw $a1, ($s0) +/* ECA19C 8024049C 0C0B53A3 */ jal func_802D4E8C +/* ECA1A0 802404A0 26100004 */ addiu $s0, $s0, 4 +/* ECA1A4 802404A4 0C0462EC */ jal func_80118BB0 +/* ECA1A8 802404A8 0040202D */ daddu $a0, $v0, $zero +/* ECA1AC 802404AC 8E100000 */ lw $s0, ($s0) +/* ECA1B0 802404B0 C444004C */ lwc1 $f4, 0x4c($v0) +/* ECA1B4 802404B4 3C014148 */ lui $at, 0x4148 +/* ECA1B8 802404B8 44810000 */ mtc1 $at, $f0 +/* ECA1BC 802404BC 3C013F33 */ lui $at, 0x3f33 +/* ECA1C0 802404C0 34213333 */ ori $at, $at, 0x3333 +/* ECA1C4 802404C4 44811000 */ mtc1 $at, $f2 +/* ECA1C8 802404C8 AFA00014 */ sw $zero, 0x14($sp) +/* ECA1CC 802404CC 46002100 */ add.s $f4, $f4, $f0 +/* ECA1D0 802404D0 E7A20010 */ swc1 $f2, 0x10($sp) +/* ECA1D4 802404D4 8C450048 */ lw $a1, 0x48($v0) +/* ECA1D8 802404D8 8C470050 */ lw $a3, 0x50($v0) +/* ECA1DC 802404DC 44062000 */ mfc1 $a2, $f4 +/* ECA1E0 802404E0 0C01DA74 */ jal func_800769D0 +/* ECA1E4 802404E4 0000202D */ daddu $a0, $zero, $zero +/* ECA1E8 802404E8 0220202D */ daddu $a0, $s1, $zero +/* ECA1EC 802404EC 0200282D */ daddu $a1, $s0, $zero +/* ECA1F0 802404F0 0C0B551A */ jal func_802D5468 +/* ECA1F4 802404F4 0040302D */ daddu $a2, $v0, $zero +/* ECA1F8 802404F8 8FBF0020 */ lw $ra, 0x20($sp) +/* ECA1FC 802404FC 8FB1001C */ lw $s1, 0x1c($sp) +/* ECA200 80240500 8FB00018 */ lw $s0, 0x18($sp) +/* ECA204 80240504 24020002 */ addiu $v0, $zero, 2 +/* ECA208 80240508 03E00008 */ jr $ra +/* ECA20C 8024050C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EC9D00/func_80240510_ECA210.s b/asm/nonmatchings/code_EC9D00/func_80240510_ECA210.s new file mode 100644 index 0000000000..3ad5cef6ae --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240510_ECA210.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240510_ECA210 +/* ECA210 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ECA214 80240514 AFBF0010 */ sw $ra, 0x10($sp) +/* ECA218 80240518 8C82000C */ lw $v0, 0xc($a0) +/* ECA21C 8024051C 0C0B53A3 */ jal func_802D4E8C +/* ECA220 80240520 8C450000 */ lw $a1, ($v0) +/* ECA224 80240524 0040202D */ daddu $a0, $v0, $zero +/* ECA228 80240528 8C830000 */ lw $v1, ($a0) +/* ECA22C 8024052C 34630010 */ ori $v1, $v1, 0x10 +/* ECA230 80240530 AC830000 */ sw $v1, ($a0) +/* ECA234 80240534 8FBF0010 */ lw $ra, 0x10($sp) +/* ECA238 80240538 24020002 */ addiu $v0, $zero, 2 +/* ECA23C 8024053C 03E00008 */ jr $ra +/* ECA240 80240540 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EC9D00/func_80240544_ECA244.s b/asm/nonmatchings/code_EC9D00/func_80240544_ECA244.s new file mode 100644 index 0000000000..1890938b42 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240544_ECA244.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240544_ECA244 +/* ECA244 80240544 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ECA248 80240548 AFBF0018 */ sw $ra, 0x18($sp) +/* ECA24C 8024054C 8C82000C */ lw $v0, 0xc($a0) +/* ECA250 80240550 0C0B53A3 */ jal func_802D4E8C +/* ECA254 80240554 8C450000 */ lw $a1, ($v0) +/* ECA258 80240558 0C0462EC */ jal func_80118BB0 +/* ECA25C 8024055C 0040202D */ daddu $a0, $v0, $zero +/* ECA260 80240560 3C013F80 */ lui $at, 0x3f80 +/* ECA264 80240564 44810000 */ mtc1 $at, $f0 +/* ECA268 80240568 C442004C */ lwc1 $f2, 0x4c($v0) +/* ECA26C 8024056C E7A00010 */ swc1 $f0, 0x10($sp) +/* ECA270 80240570 3C014148 */ lui $at, 0x4148 +/* ECA274 80240574 44810000 */ mtc1 $at, $f0 +/* ECA278 80240578 2403004B */ addiu $v1, $zero, 0x4b +/* ECA27C 8024057C AFA30014 */ sw $v1, 0x14($sp) +/* ECA280 80240580 46001080 */ add.s $f2, $f2, $f0 +/* ECA284 80240584 8C450048 */ lw $a1, 0x48($v0) +/* ECA288 80240588 8C470050 */ lw $a3, 0x50($v0) +/* ECA28C 8024058C 44061000 */ mfc1 $a2, $f2 +/* ECA290 80240590 0C01D78C */ jal func_80075E30 +/* ECA294 80240594 24040004 */ addiu $a0, $zero, 4 +/* ECA298 80240598 8FBF0018 */ lw $ra, 0x18($sp) +/* ECA29C 8024059C 24020002 */ addiu $v0, $zero, 2 +/* ECA2A0 802405A0 03E00008 */ jr $ra +/* ECA2A4 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC9D00/func_802405A8_ECA2A8.s b/asm/nonmatchings/code_EC9D00/func_802405A8_ECA2A8.s new file mode 100644 index 0000000000..ae28d41b98 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_802405A8_ECA2A8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405A8_ECA2A8 +/* ECA2A8 802405A8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ECA2AC 802405AC AFBF0018 */ sw $ra, 0x18($sp) +/* ECA2B0 802405B0 0C00F94D */ jal func_8003E534 +/* ECA2B4 802405B4 2404FFFC */ addiu $a0, $zero, -4 +/* ECA2B8 802405B8 C444003C */ lwc1 $f4, 0x3c($v0) +/* ECA2BC 802405BC 3C014148 */ lui $at, 0x4148 +/* ECA2C0 802405C0 44811000 */ mtc1 $at, $f2 +/* ECA2C4 802405C4 3C013F80 */ lui $at, 0x3f80 +/* ECA2C8 802405C8 44810000 */ mtc1 $at, $f0 +/* ECA2CC 802405CC 2403001E */ addiu $v1, $zero, 0x1e +/* ECA2D0 802405D0 AFA30014 */ sw $v1, 0x14($sp) +/* ECA2D4 802405D4 46022100 */ add.s $f4, $f4, $f2 +/* ECA2D8 802405D8 E7A00010 */ swc1 $f0, 0x10($sp) +/* ECA2DC 802405DC 8C450038 */ lw $a1, 0x38($v0) +/* ECA2E0 802405E0 8C470040 */ lw $a3, 0x40($v0) +/* ECA2E4 802405E4 44062000 */ mfc1 $a2, $f4 +/* ECA2E8 802405E8 0C01D78C */ jal func_80075E30 +/* ECA2EC 802405EC 24040009 */ addiu $a0, $zero, 9 +/* ECA2F0 802405F0 8FBF0018 */ lw $ra, 0x18($sp) +/* ECA2F4 802405F4 24020002 */ addiu $v0, $zero, 2 +/* ECA2F8 802405F8 03E00008 */ jr $ra +/* ECA2FC 802405FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC9D00/func_80240600_ECA300.s b/asm/nonmatchings/code_EC9D00/func_80240600_ECA300.s new file mode 100644 index 0000000000..7dddd58d2d --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240600_ECA300.s @@ -0,0 +1,356 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240600_ECA300 +/* ECA300 80240600 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* ECA304 80240604 AFB60040 */ sw $s6, 0x40($sp) +/* ECA308 80240608 0080B02D */ daddu $s6, $a0, $zero +/* ECA30C 8024060C AFB00028 */ sw $s0, 0x28($sp) +/* ECA310 80240610 00A0802D */ daddu $s0, $a1, $zero +/* ECA314 80240614 AFBF0044 */ sw $ra, 0x44($sp) +/* ECA318 80240618 AFB5003C */ sw $s5, 0x3c($sp) +/* ECA31C 8024061C AFB40038 */ sw $s4, 0x38($sp) +/* ECA320 80240620 AFB30034 */ sw $s3, 0x34($sp) +/* ECA324 80240624 AFB20030 */ sw $s2, 0x30($sp) +/* ECA328 80240628 AFB1002C */ sw $s1, 0x2c($sp) +/* ECA32C 8024062C F7B80058 */ sdc1 $f24, 0x58($sp) +/* ECA330 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) +/* ECA334 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) +/* ECA338 80240638 8ED3000C */ lw $s3, 0xc($s6) +/* ECA33C 8024063C 0C00F94D */ jal func_8003E534 +/* ECA340 80240640 2404FFFC */ addiu $a0, $zero, -4 +/* ECA344 80240644 27A50018 */ addiu $a1, $sp, 0x18 +/* ECA348 80240648 3C048008 */ lui $a0, %hi(D_8007C760) +/* ECA34C 8024064C 8C84C760 */ lw $a0, %lo(D_8007C760)($a0) +/* ECA350 80240650 27A6001C */ addiu $a2, $sp, 0x1c +/* ECA354 80240654 00041880 */ sll $v1, $a0, 2 +/* ECA358 80240658 00641821 */ addu $v1, $v1, $a0 +/* ECA35C 8024065C 00031880 */ sll $v1, $v1, 2 +/* ECA360 80240660 00641823 */ subu $v1, $v1, $a0 +/* ECA364 80240664 000320C0 */ sll $a0, $v1, 3 +/* ECA368 80240668 00641821 */ addu $v1, $v1, $a0 +/* ECA36C 8024066C 000318C0 */ sll $v1, $v1, 3 +/* ECA370 80240670 3C01800C */ lui $at, %hi(D_800B8DEC) +/* ECA374 80240674 00230821 */ addu $at, $at, $v1 +/* ECA378 80240678 C42C8DEC */ lwc1 $f12, %lo(D_800B8DEC)($at) +/* ECA37C 8024067C 0C00AD49 */ jal func_8002B524 +/* ECA380 80240680 0040A82D */ daddu $s5, $v0, $zero +/* ECA384 80240684 1200005D */ beqz $s0, .L802407FC +/* ECA388 80240688 00000000 */ nop +/* ECA38C 8024068C 0C00AFC6 */ jal func_8002BF18 +/* ECA390 80240690 24040068 */ addiu $a0, $zero, 0x68 +/* ECA394 80240694 0040902D */ daddu $s2, $v0, $zero +/* ECA398 80240698 02C0202D */ daddu $a0, $s6, $zero +/* ECA39C 8024069C 0000882D */ daddu $s1, $zero, $zero +/* ECA3A0 802406A0 2414FFFF */ addiu $s4, $zero, -1 +/* ECA3A4 802406A4 AED20060 */ sw $s2, 0x60($s6) +/* ECA3A8 802406A8 8E650000 */ lw $a1, ($s3) +/* ECA3AC 802406AC 3C014148 */ lui $at, 0x4148 +/* ECA3B0 802406B0 4481C000 */ mtc1 $at, $f24 +/* ECA3B4 802406B4 3C013F80 */ lui $at, 0x3f80 +/* ECA3B8 802406B8 4481B000 */ mtc1 $at, $f22 +/* ECA3BC 802406BC 4480A000 */ mtc1 $zero, $f20 +/* ECA3C0 802406C0 0C0B53A3 */ jal func_802D4E8C +/* ECA3C4 802406C4 0240802D */ daddu $s0, $s2, $zero +/* ECA3C8 802406C8 0C0462EC */ jal func_80118BB0 +/* ECA3CC 802406CC 0040202D */ daddu $a0, $v0, $zero +/* ECA3D0 802406D0 AE42005C */ sw $v0, 0x5c($s2) +.L802406D4: +/* ECA3D4 802406D4 8E42005C */ lw $v0, 0x5c($s2) +/* ECA3D8 802406D8 C440004C */ lwc1 $f0, 0x4c($v0) +/* ECA3DC 802406DC 0000202D */ daddu $a0, $zero, $zero +/* ECA3E0 802406E0 E7B60010 */ swc1 $f22, 0x10($sp) +/* ECA3E4 802406E4 AFB40014 */ sw $s4, 0x14($sp) +/* ECA3E8 802406E8 46180000 */ add.s $f0, $f0, $f24 +/* ECA3EC 802406EC 8C450048 */ lw $a1, 0x48($v0) +/* ECA3F0 802406F0 8C470050 */ lw $a3, 0x50($v0) +/* ECA3F4 802406F4 44060000 */ mfc1 $a2, $f0 +/* ECA3F8 802406F8 0C01DA5C */ jal func_80076970 +/* ECA3FC 802406FC 26310001 */ addiu $s1, $s1, 1 +/* ECA400 80240700 AE020008 */ sw $v0, 8($s0) +/* ECA404 80240704 E614002C */ swc1 $f20, 0x2c($s0) +/* ECA408 80240708 E6140020 */ swc1 $f20, 0x20($s0) +/* ECA40C 8024070C E6140014 */ swc1 $f20, 0x14($s0) +/* ECA410 80240710 E6140050 */ swc1 $f20, 0x50($s0) +/* ECA414 80240714 E6140044 */ swc1 $f20, 0x44($s0) +/* ECA418 80240718 E6140038 */ swc1 $f20, 0x38($s0) +/* ECA41C 8024071C 2A220003 */ slti $v0, $s1, 3 +/* ECA420 80240720 1440FFEC */ bnez $v0, .L802406D4 +/* ECA424 80240724 26100004 */ addiu $s0, $s0, 4 +/* ECA428 80240728 0000882D */ daddu $s1, $zero, $zero +/* ECA42C 8024072C 0240802D */ daddu $s0, $s2, $zero +/* ECA430 80240730 3C148024 */ lui $s4, %hi(func_80242038_CD3E68) +/* ECA434 80240734 26942038 */ addiu $s4, $s4, %lo(func_80242038_CD3E68) +/* ECA438 80240738 3C014248 */ lui $at, 0x4248 +/* ECA43C 8024073C 4481A000 */ mtc1 $at, $f20 +/* ECA440 80240740 24130044 */ addiu $s3, $zero, 0x44 +/* ECA444 80240744 AE400000 */ sw $zero, ($s2) +/* ECA448 80240748 AE400004 */ sw $zero, 4($s2) +/* ECA44C 8024074C AE400060 */ sw $zero, 0x60($s2) +/* ECA450 80240750 AE400064 */ sw $zero, 0x64($s2) +.L80240754: +/* ECA454 80240754 27A40020 */ addiu $a0, $sp, 0x20 +/* ECA458 80240758 4406A000 */ mfc1 $a2, $f20 +/* ECA45C 8024075C 8E870000 */ lw $a3, ($s4) +/* ECA460 80240760 02532821 */ addu $a1, $s2, $s3 +/* ECA464 80240764 0C00ACA3 */ jal func_8002B28C +/* ECA468 80240768 AFA00020 */ sw $zero, 0x20($sp) +/* ECA46C 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) +/* ECA470 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) +/* ECA474 80240774 46041082 */ mul.s $f2, $f2, $f4 +/* ECA478 80240778 00000000 */ nop +/* ECA47C 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) +/* ECA480 80240780 46040002 */ mul.s $f0, $f0, $f4 +/* ECA484 80240784 00000000 */ nop +/* ECA488 80240788 E6020038 */ swc1 $f2, 0x38($s0) +/* ECA48C 8024078C E6000050 */ swc1 $f0, 0x50($s0) +/* ECA490 80240790 8E42005C */ lw $v0, 0x5c($s2) +/* ECA494 80240794 C6000038 */ lwc1 $f0, 0x38($s0) +/* ECA498 80240798 C4420048 */ lwc1 $f2, 0x48($v0) +/* ECA49C 8024079C 46001080 */ add.s $f2, $f2, $f0 +/* ECA4A0 802407A0 C6A00038 */ lwc1 $f0, 0x38($s5) +/* ECA4A4 802407A4 46020001 */ sub.s $f0, $f0, $f2 +/* ECA4A8 802407A8 E6000038 */ swc1 $f0, 0x38($s0) +/* ECA4AC 802407AC 8E42005C */ lw $v0, 0x5c($s2) +/* ECA4B0 802407B0 C6000044 */ lwc1 $f0, 0x44($s0) +/* ECA4B4 802407B4 C442004C */ lwc1 $f2, 0x4c($v0) +/* ECA4B8 802407B8 46001080 */ add.s $f2, $f2, $f0 +/* ECA4BC 802407BC C6A0003C */ lwc1 $f0, 0x3c($s5) +/* ECA4C0 802407C0 46020001 */ sub.s $f0, $f0, $f2 +/* ECA4C4 802407C4 E6000044 */ swc1 $f0, 0x44($s0) +/* ECA4C8 802407C8 8E42005C */ lw $v0, 0x5c($s2) +/* ECA4CC 802407CC C6000050 */ lwc1 $f0, 0x50($s0) +/* ECA4D0 802407D0 C4420050 */ lwc1 $f2, 0x50($v0) +/* ECA4D4 802407D4 26940004 */ addiu $s4, $s4, 4 +/* ECA4D8 802407D8 46001080 */ add.s $f2, $f2, $f0 +/* ECA4DC 802407DC C6A00040 */ lwc1 $f0, 0x40($s5) +/* ECA4E0 802407E0 26730004 */ addiu $s3, $s3, 4 +/* ECA4E4 802407E4 46020001 */ sub.s $f0, $f0, $f2 +/* ECA4E8 802407E8 26310001 */ addiu $s1, $s1, 1 +/* ECA4EC 802407EC 2A220003 */ slti $v0, $s1, 3 +/* ECA4F0 802407F0 E6000050 */ swc1 $f0, 0x50($s0) +/* ECA4F4 802407F4 1440FFD7 */ bnez $v0, .L80240754 +/* ECA4F8 802407F8 26100004 */ addiu $s0, $s0, 4 +.L802407FC: +/* ECA4FC 802407FC 8ED20060 */ lw $s2, 0x60($s6) +/* ECA500 80240800 8E430000 */ lw $v1, ($s2) +/* ECA504 80240804 24020001 */ addiu $v0, $zero, 1 +/* ECA508 80240808 10620038 */ beq $v1, $v0, .L802408EC +/* ECA50C 8024080C 28620002 */ slti $v0, $v1, 2 +/* ECA510 80240810 50400005 */ beql $v0, $zero, .L80240828 +/* ECA514 80240814 24020002 */ addiu $v0, $zero, 2 +/* ECA518 80240818 10600007 */ beqz $v1, .L80240838 +/* ECA51C 8024081C 24040005 */ addiu $a0, $zero, 5 +/* ECA520 80240820 08090274 */ j .L802409D0 +/* ECA524 80240824 00000000 */ nop +.L80240828: +/* ECA528 80240828 10620058 */ beq $v1, $v0, .L8024098C +/* ECA52C 8024082C 00000000 */ nop +/* ECA530 80240830 08090274 */ j .L802409D0 +/* ECA534 80240834 00000000 */ nop +.L80240838: +/* ECA538 80240838 0000882D */ daddu $s1, $zero, $zero +/* ECA53C 8024083C 3C148024 */ lui $s4, %hi(func_80242038_CD3E68) +/* ECA540 80240840 26942038 */ addiu $s4, $s4, %lo(func_80242038_CD3E68) +/* ECA544 80240844 24130020 */ addiu $s3, $zero, 0x20 +/* ECA548 80240848 3C064248 */ lui $a2, 0x4248 +/* ECA54C 8024084C 44800000 */ mtc1 $zero, $f0 +/* ECA550 80240850 24020014 */ addiu $v0, $zero, 0x14 +/* ECA554 80240854 AFA20010 */ sw $v0, 0x10($sp) +/* ECA558 80240858 44050000 */ mfc1 $a1, $f0 +/* ECA55C 8024085C 8E470060 */ lw $a3, 0x60($s2) +/* ECA560 80240860 4485B000 */ mtc1 $a1, $f22 +/* ECA564 80240864 0C00ADA9 */ jal func_8002B6A4 +/* ECA568 80240868 0240802D */ daddu $s0, $s2, $zero +/* ECA56C 8024086C 46000506 */ mov.s $f20, $f0 +.L80240870: +/* ECA570 80240870 4406A000 */ mfc1 $a2, $f20 +/* ECA574 80240874 27A40020 */ addiu $a0, $sp, 0x20 +/* ECA578 80240878 E6160020 */ swc1 $f22, 0x20($s0) +/* ECA57C 8024087C 8E870000 */ lw $a3, ($s4) +/* ECA580 80240880 02532821 */ addu $a1, $s2, $s3 +/* ECA584 80240884 0C00ACA3 */ jal func_8002B28C +/* ECA588 80240888 E7B60020 */ swc1 $f22, 0x20($sp) +/* ECA58C 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) +/* ECA590 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) +/* ECA594 80240894 46002102 */ mul.s $f4, $f4, $f0 +/* ECA598 80240898 00000000 */ nop +/* ECA59C 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) +/* ECA5A0 802408A0 26940004 */ addiu $s4, $s4, 4 +/* ECA5A4 802408A4 46001082 */ mul.s $f2, $f2, $f0 +/* ECA5A8 802408A8 00000000 */ nop +/* ECA5AC 802408AC 26730004 */ addiu $s3, $s3, 4 +/* ECA5B0 802408B0 26310001 */ addiu $s1, $s1, 1 +/* ECA5B4 802408B4 2A220003 */ slti $v0, $s1, 3 +/* ECA5B8 802408B8 E6040014 */ swc1 $f4, 0x14($s0) +/* ECA5BC 802408BC E602002C */ swc1 $f2, 0x2c($s0) +/* ECA5C0 802408C0 1440FFEB */ bnez $v0, .L80240870 +/* ECA5C4 802408C4 26100004 */ addiu $s0, $s0, 4 +/* ECA5C8 802408C8 8E420060 */ lw $v0, 0x60($s2) +/* ECA5CC 802408CC 24420001 */ addiu $v0, $v0, 1 +/* ECA5D0 802408D0 AE420060 */ sw $v0, 0x60($s2) +/* ECA5D4 802408D4 28420015 */ slti $v0, $v0, 0x15 +/* ECA5D8 802408D8 1440003D */ bnez $v0, .L802409D0 +/* ECA5DC 802408DC 24020001 */ addiu $v0, $zero, 1 +/* ECA5E0 802408E0 AE420000 */ sw $v0, ($s2) +/* ECA5E4 802408E4 08090274 */ j .L802409D0 +/* ECA5E8 802408E8 AE400060 */ sw $zero, 0x60($s2) +.L802408EC: +/* ECA5EC 802408EC 0000882D */ daddu $s1, $zero, $zero +/* ECA5F0 802408F0 3C148024 */ lui $s4, %hi(func_80242038_CD3E68) +/* ECA5F4 802408F4 26942038 */ addiu $s4, $s4, %lo(func_80242038_CD3E68) +/* ECA5F8 802408F8 24130020 */ addiu $s3, $zero, 0x20 +/* ECA5FC 802408FC 0240802D */ daddu $s0, $s2, $zero +/* ECA600 80240900 3C014248 */ lui $at, 0x4248 +/* ECA604 80240904 4481A000 */ mtc1 $at, $f20 +/* ECA608 80240908 4480B000 */ mtc1 $zero, $f22 +.L8024090C: +/* ECA60C 8024090C 4406A000 */ mfc1 $a2, $f20 +/* ECA610 80240910 27A40020 */ addiu $a0, $sp, 0x20 +/* ECA614 80240914 E6160020 */ swc1 $f22, 0x20($s0) +/* ECA618 80240918 8E870000 */ lw $a3, ($s4) +/* ECA61C 8024091C 02532821 */ addu $a1, $s2, $s3 +/* ECA620 80240920 0C00ACA3 */ jal func_8002B28C +/* ECA624 80240924 E7B60020 */ swc1 $f22, 0x20($sp) +/* ECA628 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* ECA62C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) +/* ECA630 80240930 46002102 */ mul.s $f4, $f4, $f0 +/* ECA634 80240934 00000000 */ nop +/* ECA638 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) +/* ECA63C 8024093C 26940004 */ addiu $s4, $s4, 4 +/* ECA640 80240940 46001082 */ mul.s $f2, $f2, $f0 +/* ECA644 80240944 00000000 */ nop +/* ECA648 80240948 26730004 */ addiu $s3, $s3, 4 +/* ECA64C 8024094C 26310001 */ addiu $s1, $s1, 1 +/* ECA650 80240950 2A220003 */ slti $v0, $s1, 3 +/* ECA654 80240954 E6040014 */ swc1 $f4, 0x14($s0) +/* ECA658 80240958 E602002C */ swc1 $f2, 0x2c($s0) +/* ECA65C 8024095C 1440FFEB */ bnez $v0, .L8024090C +/* ECA660 80240960 26100004 */ addiu $s0, $s0, 4 +/* ECA664 80240964 8E420060 */ lw $v0, 0x60($s2) +/* ECA668 80240968 24420001 */ addiu $v0, $v0, 1 +/* ECA66C 8024096C AE420060 */ sw $v0, 0x60($s2) +/* ECA670 80240970 28420010 */ slti $v0, $v0, 0x10 +/* ECA674 80240974 14400016 */ bnez $v0, .L802409D0 +/* ECA678 80240978 2402000F */ addiu $v0, $zero, 0xf +/* ECA67C 8024097C AE420060 */ sw $v0, 0x60($s2) +/* ECA680 80240980 24020002 */ addiu $v0, $zero, 2 +/* ECA684 80240984 08090274 */ j .L802409D0 +/* ECA688 80240988 AE420000 */ sw $v0, ($s2) +.L8024098C: +/* ECA68C 8024098C 8E420060 */ lw $v0, 0x60($s2) +/* ECA690 80240990 24420001 */ addiu $v0, $v0, 1 +/* ECA694 80240994 AE420060 */ sw $v0, 0x60($s2) +/* ECA698 80240998 2842001F */ slti $v0, $v0, 0x1f +/* ECA69C 8024099C 1440000C */ bnez $v0, .L802409D0 +/* ECA6A0 802409A0 0000882D */ daddu $s1, $zero, $zero +/* ECA6A4 802409A4 0240282D */ daddu $a1, $s2, $zero +.L802409A8: +/* ECA6A8 802409A8 8CA20008 */ lw $v0, 8($a1) +/* ECA6AC 802409AC 8C430000 */ lw $v1, ($v0) +/* ECA6B0 802409B0 26310001 */ addiu $s1, $s1, 1 +/* ECA6B4 802409B4 34630010 */ ori $v1, $v1, 0x10 +/* ECA6B8 802409B8 AC430000 */ sw $v1, ($v0) +/* ECA6BC 802409BC 2A220003 */ slti $v0, $s1, 3 +/* ECA6C0 802409C0 1440FFF9 */ bnez $v0, .L802409A8 +/* ECA6C4 802409C4 24A50004 */ addiu $a1, $a1, 4 +/* ECA6C8 802409C8 080902C1 */ j .L80240B04 +/* ECA6CC 802409CC 24020002 */ addiu $v0, $zero, 2 +.L802409D0: +/* ECA6D0 802409D0 8E430004 */ lw $v1, 4($s2) +/* ECA6D4 802409D4 10600005 */ beqz $v1, .L802409EC +/* ECA6D8 802409D8 24020001 */ addiu $v0, $zero, 1 +/* ECA6DC 802409DC 1062000B */ beq $v1, $v0, .L80240A0C +/* ECA6E0 802409E0 0000882D */ daddu $s1, $zero, $zero +/* ECA6E4 802409E4 080902B0 */ j .L80240AC0 +/* ECA6E8 802409E8 0240282D */ daddu $a1, $s2, $zero +.L802409EC: +/* ECA6EC 802409EC 8E420064 */ lw $v0, 0x64($s2) +/* ECA6F0 802409F0 24420001 */ addiu $v0, $v0, 1 +/* ECA6F4 802409F4 AE420064 */ sw $v0, 0x64($s2) +/* ECA6F8 802409F8 28420010 */ slti $v0, $v0, 0x10 +/* ECA6FC 802409FC 1440002F */ bnez $v0, .L80240ABC +/* ECA700 80240A00 0000882D */ daddu $s1, $zero, $zero +/* ECA704 80240A04 080902AC */ j .L80240AB0 +/* ECA708 80240A08 24020001 */ addiu $v0, $zero, 1 +.L80240A0C: +/* ECA70C 80240A0C 4480A000 */ mtc1 $zero, $f20 +/* ECA710 80240A10 24130014 */ addiu $s3, $zero, 0x14 +/* ECA714 80240A14 0240802D */ daddu $s0, $s2, $zero +.L80240A18: +/* ECA718 80240A18 4405A000 */ mfc1 $a1, $f20 +/* ECA71C 80240A1C AFB30010 */ sw $s3, 0x10($sp) +/* ECA720 80240A20 8E060038 */ lw $a2, 0x38($s0) +/* ECA724 80240A24 8E470064 */ lw $a3, 0x64($s2) +/* ECA728 80240A28 0C00ADA9 */ jal func_8002B6A4 +/* ECA72C 80240A2C 24040001 */ addiu $a0, $zero, 1 +/* ECA730 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) +/* ECA734 80240A34 46001080 */ add.s $f2, $f2, $f0 +/* ECA738 80240A38 4405A000 */ mfc1 $a1, $f20 +/* ECA73C 80240A3C E6020014 */ swc1 $f2, 0x14($s0) +/* ECA740 80240A40 AFB30010 */ sw $s3, 0x10($sp) +/* ECA744 80240A44 8E060044 */ lw $a2, 0x44($s0) +/* ECA748 80240A48 8E470064 */ lw $a3, 0x64($s2) +/* ECA74C 80240A4C 0C00ADA9 */ jal func_8002B6A4 +/* ECA750 80240A50 24040001 */ addiu $a0, $zero, 1 +/* ECA754 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) +/* ECA758 80240A58 46001080 */ add.s $f2, $f2, $f0 +/* ECA75C 80240A5C 4405A000 */ mfc1 $a1, $f20 +/* ECA760 80240A60 E6020020 */ swc1 $f2, 0x20($s0) +/* ECA764 80240A64 AFB30010 */ sw $s3, 0x10($sp) +/* ECA768 80240A68 8E060050 */ lw $a2, 0x50($s0) +/* ECA76C 80240A6C 8E470064 */ lw $a3, 0x64($s2) +/* ECA770 80240A70 0C00ADA9 */ jal func_8002B6A4 +/* ECA774 80240A74 24040001 */ addiu $a0, $zero, 1 +/* ECA778 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) +/* ECA77C 80240A7C 46001080 */ add.s $f2, $f2, $f0 +/* ECA780 80240A80 26310001 */ addiu $s1, $s1, 1 +/* ECA784 80240A84 2A220003 */ slti $v0, $s1, 3 +/* ECA788 80240A88 E602002C */ swc1 $f2, 0x2c($s0) +/* ECA78C 80240A8C 1440FFE2 */ bnez $v0, .L80240A18 +/* ECA790 80240A90 26100004 */ addiu $s0, $s0, 4 +/* ECA794 80240A94 8E420064 */ lw $v0, 0x64($s2) +/* ECA798 80240A98 24420001 */ addiu $v0, $v0, 1 +/* ECA79C 80240A9C AE420064 */ sw $v0, 0x64($s2) +/* ECA7A0 80240AA0 28420015 */ slti $v0, $v0, 0x15 +/* ECA7A4 80240AA4 14400005 */ bnez $v0, .L80240ABC +/* ECA7A8 80240AA8 0000882D */ daddu $s1, $zero, $zero +/* ECA7AC 80240AAC 24020002 */ addiu $v0, $zero, 2 +.L80240AB0: +/* ECA7B0 80240AB0 AE420004 */ sw $v0, 4($s2) +/* ECA7B4 80240AB4 AE400064 */ sw $zero, 0x64($s2) +/* ECA7B8 80240AB8 0000882D */ daddu $s1, $zero, $zero +.L80240ABC: +/* ECA7BC 80240ABC 0240282D */ daddu $a1, $s2, $zero +.L80240AC0: +/* ECA7C0 80240AC0 8CA20008 */ lw $v0, 8($a1) +/* ECA7C4 80240AC4 C4A00014 */ lwc1 $f0, 0x14($a1) +/* ECA7C8 80240AC8 8C42000C */ lw $v0, 0xc($v0) +/* ECA7CC 80240ACC E4400010 */ swc1 $f0, 0x10($v0) +/* ECA7D0 80240AD0 8CA20008 */ lw $v0, 8($a1) +/* ECA7D4 80240AD4 C4A00020 */ lwc1 $f0, 0x20($a1) +/* ECA7D8 80240AD8 8C42000C */ lw $v0, 0xc($v0) +/* ECA7DC 80240ADC 26310001 */ addiu $s1, $s1, 1 +/* ECA7E0 80240AE0 E4400014 */ swc1 $f0, 0x14($v0) +/* ECA7E4 80240AE4 8CA20008 */ lw $v0, 8($a1) +/* ECA7E8 80240AE8 C4A0002C */ lwc1 $f0, 0x2c($a1) +/* ECA7EC 80240AEC 8C42000C */ lw $v0, 0xc($v0) +/* ECA7F0 80240AF0 E4400018 */ swc1 $f0, 0x18($v0) +/* ECA7F4 80240AF4 2A220003 */ slti $v0, $s1, 3 +/* ECA7F8 80240AF8 1440FFF1 */ bnez $v0, .L80240AC0 +/* ECA7FC 80240AFC 24A50004 */ addiu $a1, $a1, 4 +/* ECA800 80240B00 0000102D */ daddu $v0, $zero, $zero +.L80240B04: +/* ECA804 80240B04 8FBF0044 */ lw $ra, 0x44($sp) +/* ECA808 80240B08 8FB60040 */ lw $s6, 0x40($sp) +/* ECA80C 80240B0C 8FB5003C */ lw $s5, 0x3c($sp) +/* ECA810 80240B10 8FB40038 */ lw $s4, 0x38($sp) +/* ECA814 80240B14 8FB30034 */ lw $s3, 0x34($sp) +/* ECA818 80240B18 8FB20030 */ lw $s2, 0x30($sp) +/* ECA81C 80240B1C 8FB1002C */ lw $s1, 0x2c($sp) +/* ECA820 80240B20 8FB00028 */ lw $s0, 0x28($sp) +/* ECA824 80240B24 D7B80058 */ ldc1 $f24, 0x58($sp) +/* ECA828 80240B28 D7B60050 */ ldc1 $f22, 0x50($sp) +/* ECA82C 80240B2C D7B40048 */ ldc1 $f20, 0x48($sp) +/* ECA830 80240B30 03E00008 */ jr $ra +/* ECA834 80240B34 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/code_EC9D00/func_80240B38_ECA838.s b/asm/nonmatchings/code_EC9D00/func_80240B38_ECA838.s new file mode 100644 index 0000000000..843e51e98b --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240B38_ECA838.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B38_ECA838 +/* ECA838 80240B38 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ECA83C 80240B3C AFB10014 */ sw $s1, 0x14($sp) +/* ECA840 80240B40 0080882D */ daddu $s1, $a0, $zero +/* ECA844 80240B44 AFB20018 */ sw $s2, 0x18($sp) +/* ECA848 80240B48 AFBF001C */ sw $ra, 0x1c($sp) +/* ECA84C 80240B4C AFB00010 */ sw $s0, 0x10($sp) +/* ECA850 80240B50 8E30000C */ lw $s0, 0xc($s1) +/* ECA854 80240B54 10A00010 */ beqz $a1, .L80240B98 +/* ECA858 80240B58 0000902D */ daddu $s2, $zero, $zero +/* ECA85C 80240B5C 8E050000 */ lw $a1, ($s0) +/* ECA860 80240B60 0C0B53A3 */ jal func_802D4E8C +/* ECA864 80240B64 26100004 */ addiu $s0, $s0, 4 +/* ECA868 80240B68 AE220084 */ sw $v0, 0x84($s1) +/* ECA86C 80240B6C 8E050000 */ lw $a1, ($s0) +/* ECA870 80240B70 0C0B53A3 */ jal func_802D4E8C +/* ECA874 80240B74 0220202D */ daddu $a0, $s1, $zero +/* ECA878 80240B78 0240202D */ daddu $a0, $s2, $zero +/* ECA87C 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 +/* ECA880 80240B80 00A0302D */ daddu $a2, $a1, $zero +/* ECA884 80240B84 00A0382D */ daddu $a3, $a1, $zero +/* ECA888 80240B88 AE220088 */ sw $v0, 0x88($s1) +/* ECA88C 80240B8C AE200070 */ sw $zero, 0x70($s1) +/* ECA890 80240B90 0C051080 */ jal func_80144200 +/* ECA894 80240B94 AE200074 */ sw $zero, 0x74($s1) +.L80240B98: +/* ECA898 80240B98 8E230070 */ lw $v1, 0x70($s1) +/* ECA89C 80240B9C 24040001 */ addiu $a0, $zero, 1 +/* ECA8A0 80240BA0 10640019 */ beq $v1, $a0, .L80240C08 +/* ECA8A4 80240BA4 28620002 */ slti $v0, $v1, 2 +/* ECA8A8 80240BA8 10400005 */ beqz $v0, .L80240BC0 +/* ECA8AC 80240BAC 24020002 */ addiu $v0, $zero, 2 +/* ECA8B0 80240BB0 10600007 */ beqz $v1, .L80240BD0 +/* ECA8B4 80240BB4 240500FF */ addiu $a1, $zero, 0xff +/* ECA8B8 80240BB8 08090312 */ j .L80240C48 +/* ECA8BC 80240BBC 00000000 */ nop +.L80240BC0: +/* ECA8C0 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 +/* ECA8C4 80240BC4 00000000 */ nop +/* ECA8C8 80240BC8 08090312 */ j .L80240C48 +/* ECA8CC 80240BCC 00000000 */ nop +.L80240BD0: +/* ECA8D0 80240BD0 8E220074 */ lw $v0, 0x74($s1) +/* ECA8D4 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 +/* ECA8D8 80240BD8 00000000 */ nop +/* ECA8DC 80240BDC AE240070 */ sw $a0, 0x70($s1) +/* ECA8E0 80240BE0 AE200078 */ sw $zero, 0x78($s1) +/* ECA8E4 80240BE4 8E220074 */ lw $v0, 0x74($s1) +.L80240BE8: +/* ECA8E8 80240BE8 8E230084 */ lw $v1, 0x84($s1) +/* ECA8EC 80240BEC 00431021 */ addu $v0, $v0, $v1 +/* ECA8F0 80240BF0 AE220074 */ sw $v0, 0x74($s1) +/* ECA8F4 80240BF4 28420100 */ slti $v0, $v0, 0x100 +/* ECA8F8 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 +/* ECA8FC 80240BFC AE250074 */ sw $a1, 0x74($s1) +/* ECA900 80240C00 08090312 */ j .L80240C48 +/* ECA904 80240C04 00000000 */ nop +.L80240C08: +/* ECA908 80240C08 8E220078 */ lw $v0, 0x78($s1) +/* ECA90C 80240C0C 24420001 */ addiu $v0, $v0, 1 +/* ECA910 80240C10 AE220078 */ sw $v0, 0x78($s1) +/* ECA914 80240C14 28420002 */ slti $v0, $v0, 2 +/* ECA918 80240C18 1440000B */ bnez $v0, .L80240C48 +/* ECA91C 80240C1C 24020002 */ addiu $v0, $zero, 2 +/* ECA920 80240C20 08090312 */ j .L80240C48 +/* ECA924 80240C24 AE220070 */ sw $v0, 0x70($s1) +.L80240C28: +/* ECA928 80240C28 8E230074 */ lw $v1, 0x74($s1) +/* ECA92C 80240C2C 50600001 */ beql $v1, $zero, .L80240C34 +/* ECA930 80240C30 24120001 */ addiu $s2, $zero, 1 +.L80240C34: +/* ECA934 80240C34 8E220088 */ lw $v0, 0x88($s1) +/* ECA938 80240C38 00621023 */ subu $v0, $v1, $v0 +/* ECA93C 80240C3C 04410002 */ bgez $v0, .L80240C48 +/* ECA940 80240C40 AE220074 */ sw $v0, 0x74($s1) +/* ECA944 80240C44 AE200074 */ sw $zero, 0x74($s1) +.L80240C48: +/* ECA948 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) +/* ECA94C 80240C4C 46800020 */ cvt.s.w $f0, $f0 +/* ECA950 80240C50 44050000 */ mfc1 $a1, $f0 +/* ECA954 80240C54 0C05105E */ jal func_80144178 +/* ECA958 80240C58 24040001 */ addiu $a0, $zero, 1 +/* ECA95C 80240C5C 0240102D */ daddu $v0, $s2, $zero +/* ECA960 80240C60 8FBF001C */ lw $ra, 0x1c($sp) +/* ECA964 80240C64 8FB20018 */ lw $s2, 0x18($sp) +/* ECA968 80240C68 8FB10014 */ lw $s1, 0x14($sp) +/* ECA96C 80240C6C 8FB00010 */ lw $s0, 0x10($sp) +/* ECA970 80240C70 03E00008 */ jr $ra +/* ECA974 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC9D00/func_80240C78_ECA978.s b/asm/nonmatchings/code_EC9D00/func_80240C78_ECA978.s new file mode 100644 index 0000000000..1e5a332d65 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240C78_ECA978.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C78_ECA978 +/* ECA978 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ECA97C 80240C7C AFBF0018 */ sw $ra, 0x18($sp) +/* ECA980 80240C80 0C00F94D */ jal func_8003E534 +/* ECA984 80240C84 2404FFFC */ addiu $a0, $zero, -4 +/* ECA988 80240C88 3C0141F0 */ lui $at, 0x41f0 +/* ECA98C 80240C8C 44810000 */ mtc1 $at, $f0 +/* ECA990 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) +/* ECA994 80240C94 46001080 */ add.s $f2, $f2, $f0 +/* ECA998 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) +/* ECA99C 80240C9C 8C450038 */ lw $a1, 0x38($v0) +/* ECA9A0 80240CA0 8C470040 */ lw $a3, 0x40($v0) +/* ECA9A4 80240CA4 44061000 */ mfc1 $a2, $f2 +/* ECA9A8 80240CA8 0C01D45C */ jal func_80075170 +/* ECA9AC 80240CAC 24040002 */ addiu $a0, $zero, 2 +/* ECA9B0 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) +/* ECA9B4 80240CB4 24020002 */ addiu $v0, $zero, 2 +/* ECA9B8 80240CB8 03E00008 */ jr $ra +/* ECA9BC 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC9D00/func_80240CC0_ECA9C0.s b/asm/nonmatchings/code_EC9D00/func_80240CC0_ECA9C0.s new file mode 100644 index 0000000000..ac54321e90 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240CC0_ECA9C0.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CC0_ECA9C0 +/* ECA9C0 80240CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ECA9C4 80240CC4 AFBF0018 */ sw $ra, 0x18($sp) +/* ECA9C8 80240CC8 0C00F94D */ jal func_8003E534 +/* ECA9CC 80240CCC 2404FFFC */ addiu $a0, $zero, -4 +/* ECA9D0 80240CD0 3C0141F0 */ lui $at, 0x41f0 +/* ECA9D4 80240CD4 44810000 */ mtc1 $at, $f0 +/* ECA9D8 80240CD8 C442003C */ lwc1 $f2, 0x3c($v0) +/* ECA9DC 80240CDC 46001080 */ add.s $f2, $f2, $f0 +/* ECA9E0 80240CE0 E7A00010 */ swc1 $f0, 0x10($sp) +/* ECA9E4 80240CE4 8C450038 */ lw $a1, 0x38($v0) +/* ECA9E8 80240CE8 8C470040 */ lw $a3, 0x40($v0) +/* ECA9EC 80240CEC 44061000 */ mfc1 $a2, $f2 +/* ECA9F0 80240CF0 0C01D45C */ jal func_80075170 +/* ECA9F4 80240CF4 24040004 */ addiu $a0, $zero, 4 +/* ECA9F8 80240CF8 8FBF0018 */ lw $ra, 0x18($sp) +/* ECA9FC 80240CFC 24020002 */ addiu $v0, $zero, 2 +/* ECAA00 80240D00 03E00008 */ jr $ra +/* ECAA04 80240D04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EC9D00/func_80240D08_ECAA08.s b/asm/nonmatchings/code_EC9D00/func_80240D08_ECAA08.s new file mode 100644 index 0000000000..1bab2da743 --- /dev/null +++ b/asm/nonmatchings/code_EC9D00/func_80240D08_ECAA08.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D08_ECAA08 +/* ECAA08 80240D08 3C038011 */ lui $v1, %hi(D_80117160) +/* ECAA0C 80240D0C 24637160 */ addiu $v1, $v1, %lo(D_80117160) +/* ECAA10 80240D10 AC800084 */ sw $zero, 0x84($a0) +/* ECAA14 80240D14 80620000 */ lb $v0, ($v1) +/* ECAA18 80240D18 10400005 */ beqz $v0, .L80240D30 +/* ECAA1C 80240D1C 24020003 */ addiu $v0, $zero, 3 +/* ECAA20 80240D20 80630003 */ lb $v1, 3($v1) +/* ECAA24 80240D24 14620002 */ bne $v1, $v0, .L80240D30 +/* ECAA28 80240D28 24020001 */ addiu $v0, $zero, 1 +/* ECAA2C 80240D2C AC820084 */ sw $v0, 0x84($a0) +.L80240D30: +/* ECAA30 80240D30 03E00008 */ jr $ra +/* ECAA34 80240D34 24020002 */ addiu $v0, $zero, 2 +/* ECAA38 80240D38 00000000 */ nop +/* ECAA3C 80240D3C 00000000 */ nop diff --git a/asm/nonmatchings/code_ECAA40/func_80240D40_ECAA40.s b/asm/nonmatchings/code_ECAA40/func_80240D40_ECAA40.s new file mode 100644 index 0000000000..cb682689d6 --- /dev/null +++ b/asm/nonmatchings/code_ECAA40/func_80240D40_ECAA40.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D40_ECAA40 +/* ECAA40 80240D40 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ECAA44 80240D44 24040001 */ addiu $a0, $zero, 1 +/* ECAA48 80240D48 0000282D */ daddu $a1, $zero, $zero +/* ECAA4C 80240D4C 00A0302D */ daddu $a2, $a1, $zero +/* ECAA50 80240D50 00A0382D */ daddu $a3, $a1, $zero +/* ECAA54 80240D54 AFBF0018 */ sw $ra, 0x18($sp) +/* ECAA58 80240D58 AFA00010 */ sw $zero, 0x10($sp) +/* ECAA5C 80240D5C 0C01DEF4 */ jal func_80077BD0 +/* ECAA60 80240D60 AFA00014 */ sw $zero, 0x14($sp) +/* ECAA64 80240D64 8FBF0018 */ lw $ra, 0x18($sp) +/* ECAA68 80240D68 24020002 */ addiu $v0, $zero, 2 +/* ECAA6C 80240D6C 03E00008 */ jr $ra +/* ECAA70 80240D70 27BD0020 */ addiu $sp, $sp, 0x20 +/* ECAA74 80240D74 00000000 */ nop +/* ECAA78 80240D78 00000000 */ nop +/* ECAA7C 80240D7C 00000000 */ nop diff --git a/asm/nonmatchings/code_ECAA80/func_80240D80_ECAA80.s b/asm/nonmatchings/code_ECAA80/func_80240D80_ECAA80.s new file mode 100644 index 0000000000..8483c2025a --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_80240D80_ECAA80.s @@ -0,0 +1,401 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D80_ECAA80 +/* ECAA80 80240D80 27BDFF68 */ addiu $sp, $sp, -0x98 +/* ECAA84 80240D84 AFB60060 */ sw $s6, 0x60($sp) +/* ECAA88 80240D88 0080B02D */ daddu $s6, $a0, $zero +/* ECAA8C 80240D8C AFBF0064 */ sw $ra, 0x64($sp) +/* ECAA90 80240D90 AFB5005C */ sw $s5, 0x5c($sp) +/* ECAA94 80240D94 AFB40058 */ sw $s4, 0x58($sp) +/* ECAA98 80240D98 AFB30054 */ sw $s3, 0x54($sp) +/* ECAA9C 80240D9C AFB20050 */ sw $s2, 0x50($sp) +/* ECAAA0 80240DA0 AFB1004C */ sw $s1, 0x4c($sp) +/* ECAAA4 80240DA4 AFB00048 */ sw $s0, 0x48($sp) +/* ECAAA8 80240DA8 F7BE0090 */ sdc1 $f30, 0x90($sp) +/* ECAAAC 80240DAC F7BC0088 */ sdc1 $f28, 0x88($sp) +/* ECAAB0 80240DB0 F7BA0080 */ sdc1 $f26, 0x80($sp) +/* ECAAB4 80240DB4 F7B80078 */ sdc1 $f24, 0x78($sp) +/* ECAAB8 80240DB8 F7B60070 */ sdc1 $f22, 0x70($sp) +/* ECAABC 80240DBC F7B40068 */ sdc1 $f20, 0x68($sp) +/* ECAAC0 80240DC0 8ED20148 */ lw $s2, 0x148($s6) +/* ECAAC4 80240DC4 00A0882D */ daddu $s1, $a1, $zero +/* ECAAC8 80240DC8 86440008 */ lh $a0, 8($s2) +/* ECAACC 80240DCC 0C00F92F */ jal func_8003E4BC +/* ECAAD0 80240DD0 00C0A82D */ daddu $s5, $a2, $zero +/* ECAAD4 80240DD4 8E240020 */ lw $a0, 0x20($s1) +/* ECAAD8 80240DD8 0040802D */ daddu $s0, $v0, $zero +/* ECAADC 80240DDC 00041FC2 */ srl $v1, $a0, 0x1f +/* ECAAE0 80240DE0 00832021 */ addu $a0, $a0, $v1 +/* ECAAE4 80240DE4 00042043 */ sra $a0, $a0, 1 +/* ECAAE8 80240DE8 0C00AB3B */ jal func_8002ACEC +/* ECAAEC 80240DEC 24840001 */ addiu $a0, $a0, 1 +/* ECAAF0 80240DF0 8E230020 */ lw $v1, 0x20($s1) +/* ECAAF4 80240DF4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECAAF8 80240DF8 000327C2 */ srl $a0, $v1, 0x1f +/* ECAAFC 80240DFC 00641821 */ addu $v1, $v1, $a0 +/* ECAB00 80240E00 00031843 */ sra $v1, $v1, 1 +/* ECAB04 80240E04 00621821 */ addu $v1, $v1, $v0 +/* ECAB08 80240E08 A603008E */ sh $v1, 0x8e($s0) +/* ECAB0C 80240E0C 8E4200CC */ lw $v0, 0xcc($s2) +/* ECAB10 80240E10 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECAB14 80240E14 8C42000C */ lw $v0, 0xc($v0) +/* ECAB18 80240E18 AE020028 */ sw $v0, 0x28($s0) +/* ECAB1C 80240E1C C6200018 */ lwc1 $f0, 0x18($s1) +/* ECAB20 80240E20 3C028010 */ lui $v0, %hi(D_800FFC90) +/* ECAB24 80240E24 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* ECAB28 80240E28 E6000018 */ swc1 $f0, 0x18($s0) +/* ECAB2C 80240E2C 8C460028 */ lw $a2, 0x28($v0) +/* ECAB30 80240E30 8C470030 */ lw $a3, 0x30($v0) +/* ECAB34 80240E34 0C00ABDC */ jal fio_validate_header_checksums +/* ECAB38 80240E38 0000982D */ daddu $s3, $zero, $zero +/* ECAB3C 80240E3C 3C014334 */ lui $at, 0x4334 +/* ECAB40 80240E40 44816000 */ mtc1 $at, $f12 +/* ECAB44 80240E44 0C00AB85 */ jal func_8002AE14 +/* ECAB48 80240E48 460C0300 */ add.s $f12, $f0, $f12 +/* ECAB4C 80240E4C 46000506 */ mov.s $f20, $f0 +/* ECAB50 80240E50 C60C000C */ lwc1 $f12, 0xc($s0) +/* ECAB54 80240E54 0C00ABC6 */ jal func_8002AF18 +/* ECAB58 80240E58 4600A386 */ mov.s $f14, $f20 +/* ECAB5C 80240E5C 46000086 */ mov.s $f2, $f0 +/* ECAB60 80240E60 8E22001C */ lw $v0, 0x1c($s1) +/* ECAB64 80240E64 46001005 */ abs.s $f0, $f2 +/* ECAB68 80240E68 44822000 */ mtc1 $v0, $f4 +/* ECAB6C 80240E6C 00000000 */ nop +/* ECAB70 80240E70 46802120 */ cvt.s.w $f4, $f4 +/* ECAB74 80240E74 4600203C */ c.lt.s $f4, $f0 +/* ECAB78 80240E78 00000000 */ nop +/* ECAB7C 80240E7C 4500000D */ bc1f .L80240EB4 +/* ECAB80 80240E80 00000000 */ nop +/* ECAB84 80240E84 44800000 */ mtc1 $zero, $f0 +/* ECAB88 80240E88 C614000C */ lwc1 $f20, 0xc($s0) +/* ECAB8C 80240E8C 4600103C */ c.lt.s $f2, $f0 +/* ECAB90 80240E90 00000000 */ nop +/* ECAB94 80240E94 45000006 */ bc1f .L80240EB0 +/* ECAB98 80240E98 00021023 */ negu $v0, $v0 +/* ECAB9C 80240E9C 44820000 */ mtc1 $v0, $f0 +/* ECABA0 80240EA0 00000000 */ nop +/* ECABA4 80240EA4 46800020 */ cvt.s.w $f0, $f0 +/* ECABA8 80240EA8 080903AD */ j .L80240EB4 +/* ECABAC 80240EAC 4600A500 */ add.s $f20, $f20, $f0 +.L80240EB0: +/* ECABB0 80240EB0 4604A500 */ add.s $f20, $f20, $f4 +.L80240EB4: +/* ECABB4 80240EB4 0C00AB85 */ jal func_8002AE14 +/* ECABB8 80240EB8 4600A306 */ mov.s $f12, $f20 +/* ECABBC 80240EBC 3C148010 */ lui $s4, %hi(D_800FFC90) +/* ECABC0 80240EC0 2694FC90 */ addiu $s4, $s4, %lo(D_800FFC90) +/* ECABC4 80240EC4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECABC8 80240EC8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECABCC 80240ECC 8E820000 */ lw $v0, ($s4) +/* ECABD0 80240ED0 C602003C */ lwc1 $f2, 0x3c($s0) +/* ECABD4 80240ED4 E600000C */ swc1 $f0, 0xc($s0) +/* ECABD8 80240ED8 46006006 */ mov.s $f0, $f12 +/* ECABDC 80240EDC 8C460028 */ lw $a2, 0x28($v0) +/* ECABE0 80240EE0 8C470030 */ lw $a3, 0x30($v0) +/* ECABE4 80240EE4 46007106 */ mov.s $f4, $f14 +/* ECABE8 80240EE8 E7A00020 */ swc1 $f0, 0x20($sp) +/* ECABEC 80240EEC E7A20024 */ swc1 $f2, 0x24($sp) +/* ECABF0 80240EF0 0C00ABDC */ jal fio_validate_header_checksums +/* ECABF4 80240EF4 E7A40028 */ swc1 $f4, 0x28($sp) +/* ECABF8 80240EF8 3C014334 */ lui $at, 0x4334 +/* ECABFC 80240EFC 44816000 */ mtc1 $at, $f12 +/* ECAC00 80240F00 0C00AB85 */ jal func_8002AE14 +/* ECAC04 80240F04 460C0300 */ add.s $f12, $f0, $f12 +/* ECAC08 80240F08 C6020018 */ lwc1 $f2, 0x18($s0) +/* ECAC0C 80240F0C 3C014012 */ lui $at, 0x4012 +/* ECAC10 80240F10 4481E800 */ mtc1 $at, $f29 +/* ECAC14 80240F14 4480E000 */ mtc1 $zero, $f28 +/* ECAC18 80240F18 460010A1 */ cvt.d.s $f2, $f2 +/* ECAC1C 80240F1C 463C1082 */ mul.d $f2, $f2, $f28 +/* ECAC20 80240F20 00000000 */ nop +/* ECAC24 80240F24 46000506 */ mov.s $f20, $f0 +/* ECAC28 80240F28 27A50020 */ addiu $a1, $sp, 0x20 +/* ECAC2C 80240F2C 27A60024 */ addiu $a2, $sp, 0x24 +/* ECAC30 80240F30 27A70028 */ addiu $a3, $sp, 0x28 +/* ECAC34 80240F34 E7B40014 */ swc1 $f20, 0x14($sp) +/* ECAC38 80240F38 462010A0 */ cvt.s.d $f2, $f2 +/* ECAC3C 80240F3C E7A20010 */ swc1 $f2, 0x10($sp) +/* ECAC40 80240F40 860200A8 */ lh $v0, 0xa8($s0) +/* ECAC44 80240F44 4480B000 */ mtc1 $zero, $f22 +/* ECAC48 80240F48 44820000 */ mtc1 $v0, $f0 +/* ECAC4C 80240F4C 00000000 */ nop +/* ECAC50 80240F50 46800020 */ cvt.s.w $f0, $f0 +/* ECAC54 80240F54 E7A00018 */ swc1 $f0, 0x18($sp) +/* ECAC58 80240F58 860200A6 */ lh $v0, 0xa6($s0) +/* ECAC5C 80240F5C 4600B606 */ mov.s $f24, $f22 +/* ECAC60 80240F60 44820000 */ mtc1 $v0, $f0 +/* ECAC64 80240F64 00000000 */ nop +/* ECAC68 80240F68 46800020 */ cvt.s.w $f0, $f0 +/* ECAC6C 80240F6C E7A0001C */ swc1 $f0, 0x1c($sp) +/* ECAC70 80240F70 8E040080 */ lw $a0, 0x80($s0) +/* ECAC74 80240F74 0C0394EB */ jal func_800E53AC +/* ECAC78 80240F78 4600C686 */ mov.s $f26, $f24 +/* ECAC7C 80240F7C 104000E1 */ beqz $v0, .L80241304 +/* ECAC80 80240F80 00000000 */ nop +/* ECAC84 80240F84 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECAC88 80240F88 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECAC8C 80240F8C 8FA60020 */ lw $a2, 0x20($sp) +/* ECAC90 80240F90 0C00AC71 */ jal func_8002B1C4 +/* ECAC94 80240F94 8FA70028 */ lw $a3, 0x28($sp) +/* ECAC98 80240F98 46000586 */ mov.s $f22, $f0 +/* ECAC9C 80240F9C C6020038 */ lwc1 $f2, 0x38($s0) +/* ECACA0 80240FA0 C604003C */ lwc1 $f4, 0x3c($s0) +/* ECACA4 80240FA4 3C01420C */ lui $at, 0x420c +/* ECACA8 80240FA8 4481F000 */ mtc1 $at, $f30 +/* ECACAC 80240FAC C6000040 */ lwc1 $f0, 0x40($s0) +/* ECACB0 80240FB0 461EA300 */ add.s $f12, $f20, $f30 +/* ECACB4 80240FB4 E7A2002C */ swc1 $f2, 0x2c($sp) +/* ECACB8 80240FB8 E7A40030 */ swc1 $f4, 0x30($sp) +/* ECACBC 80240FBC 0C00AB85 */ jal func_8002AE14 +/* ECACC0 80240FC0 E7A00034 */ swc1 $f0, 0x34($sp) +/* ECACC4 80240FC4 C6020018 */ lwc1 $f2, 0x18($s0) +/* ECACC8 80240FC8 460010A1 */ cvt.d.s $f2, $f2 +/* ECACCC 80240FCC 463C1082 */ mul.d $f2, $f2, $f28 +/* ECACD0 80240FD0 00000000 */ nop +/* ECACD4 80240FD4 E7A00014 */ swc1 $f0, 0x14($sp) +/* ECACD8 80240FD8 462010A0 */ cvt.s.d $f2, $f2 +/* ECACDC 80240FDC E7A20010 */ swc1 $f2, 0x10($sp) +/* ECACE0 80240FE0 860200A8 */ lh $v0, 0xa8($s0) +/* ECACE4 80240FE4 27A5002C */ addiu $a1, $sp, 0x2c +/* ECACE8 80240FE8 44820000 */ mtc1 $v0, $f0 +/* ECACEC 80240FEC 00000000 */ nop +/* ECACF0 80240FF0 46800020 */ cvt.s.w $f0, $f0 +/* ECACF4 80240FF4 E7A00018 */ swc1 $f0, 0x18($sp) +/* ECACF8 80240FF8 860200A6 */ lh $v0, 0xa6($s0) +/* ECACFC 80240FFC 27A60030 */ addiu $a2, $sp, 0x30 +/* ECAD00 80241000 44820000 */ mtc1 $v0, $f0 +/* ECAD04 80241004 00000000 */ nop +/* ECAD08 80241008 46800020 */ cvt.s.w $f0, $f0 +/* ECAD0C 8024100C E7A0001C */ swc1 $f0, 0x1c($sp) +/* ECAD10 80241010 8E040080 */ lw $a0, 0x80($s0) +/* ECAD14 80241014 0C0394EB */ jal func_800E53AC +/* ECAD18 80241018 27A70034 */ addiu $a3, $sp, 0x34 +/* ECAD1C 8024101C 10400007 */ beqz $v0, .L8024103C +/* ECAD20 80241020 00000000 */ nop +/* ECAD24 80241024 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECAD28 80241028 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECAD2C 8024102C 8FA6002C */ lw $a2, 0x2c($sp) +/* ECAD30 80241030 0C00AC71 */ jal func_8002B1C4 +/* ECAD34 80241034 8FA70034 */ lw $a3, 0x34($sp) +/* ECAD38 80241038 46000606 */ mov.s $f24, $f0 +.L8024103C: +/* ECAD3C 8024103C C6000038 */ lwc1 $f0, 0x38($s0) +/* ECAD40 80241040 C602003C */ lwc1 $f2, 0x3c($s0) +/* ECAD44 80241044 C6040040 */ lwc1 $f4, 0x40($s0) +/* ECAD48 80241048 461EA301 */ sub.s $f12, $f20, $f30 +/* ECAD4C 8024104C E7A00038 */ swc1 $f0, 0x38($sp) +/* ECAD50 80241050 E7A2003C */ swc1 $f2, 0x3c($sp) +/* ECAD54 80241054 0C00AB85 */ jal func_8002AE14 +/* ECAD58 80241058 E7A40040 */ swc1 $f4, 0x40($sp) +/* ECAD5C 8024105C C6020018 */ lwc1 $f2, 0x18($s0) +/* ECAD60 80241060 460010A1 */ cvt.d.s $f2, $f2 +/* ECAD64 80241064 463C1082 */ mul.d $f2, $f2, $f28 +/* ECAD68 80241068 00000000 */ nop +/* ECAD6C 8024106C E7A00014 */ swc1 $f0, 0x14($sp) +/* ECAD70 80241070 462010A0 */ cvt.s.d $f2, $f2 +/* ECAD74 80241074 E7A20010 */ swc1 $f2, 0x10($sp) +/* ECAD78 80241078 860200A8 */ lh $v0, 0xa8($s0) +/* ECAD7C 8024107C 27A50038 */ addiu $a1, $sp, 0x38 +/* ECAD80 80241080 44820000 */ mtc1 $v0, $f0 +/* ECAD84 80241084 00000000 */ nop +/* ECAD88 80241088 46800020 */ cvt.s.w $f0, $f0 +/* ECAD8C 8024108C E7A00018 */ swc1 $f0, 0x18($sp) +/* ECAD90 80241090 860200A6 */ lh $v0, 0xa6($s0) +/* ECAD94 80241094 27A6003C */ addiu $a2, $sp, 0x3c +/* ECAD98 80241098 44820000 */ mtc1 $v0, $f0 +/* ECAD9C 8024109C 00000000 */ nop +/* ECADA0 802410A0 46800020 */ cvt.s.w $f0, $f0 +/* ECADA4 802410A4 E7A0001C */ swc1 $f0, 0x1c($sp) +/* ECADA8 802410A8 8E040080 */ lw $a0, 0x80($s0) +/* ECADAC 802410AC 0C0394EB */ jal func_800E53AC +/* ECADB0 802410B0 27A70040 */ addiu $a3, $sp, 0x40 +/* ECADB4 802410B4 10400007 */ beqz $v0, .L802410D4 +/* ECADB8 802410B8 00000000 */ nop +/* ECADBC 802410BC C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECADC0 802410C0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECADC4 802410C4 8FA60038 */ lw $a2, 0x38($sp) +/* ECADC8 802410C8 0C00AC71 */ jal func_8002B1C4 +/* ECADCC 802410CC 8FA70040 */ lw $a3, 0x40($sp) +/* ECADD0 802410D0 46000686 */ mov.s $f26, $f0 +.L802410D4: +/* ECADD4 802410D4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECADD8 802410D8 8E820000 */ lw $v0, ($s4) +/* ECADDC 802410DC C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECADE0 802410E0 8C460028 */ lw $a2, 0x28($v0) +/* ECADE4 802410E4 0C00AC71 */ jal func_8002B1C4 +/* ECADE8 802410E8 8C470030 */ lw $a3, 0x30($v0) +/* ECADEC 802410EC C6000018 */ lwc1 $f0, 0x18($s0) +/* ECADF0 802410F0 3C013FF8 */ lui $at, 0x3ff8 +/* ECADF4 802410F4 44811800 */ mtc1 $at, $f3 +/* ECADF8 802410F8 44801000 */ mtc1 $zero, $f2 +/* ECADFC 802410FC 46000021 */ cvt.d.s $f0, $f0 +/* ECAE00 80241100 46220082 */ mul.d $f2, $f0, $f2 +/* ECAE04 80241104 00000000 */ nop +/* ECAE08 80241108 4600B021 */ cvt.d.s $f0, $f22 +/* ECAE0C 8024110C 4622003C */ c.lt.d $f0, $f2 +/* ECAE10 80241110 00000000 */ nop +/* ECAE14 80241114 45000012 */ bc1f .L80241160 +/* ECAE18 80241118 00000000 */ nop +/* ECAE1C 8024111C 4600C021 */ cvt.d.s $f0, $f24 +/* ECAE20 80241120 4622003C */ c.lt.d $f0, $f2 +/* ECAE24 80241124 00000000 */ nop +/* ECAE28 80241128 4500000D */ bc1f .L80241160 +/* ECAE2C 8024112C 00000000 */ nop +/* ECAE30 80241130 4600D021 */ cvt.d.s $f0, $f26 +/* ECAE34 80241134 4622003C */ c.lt.d $f0, $f2 +/* ECAE38 80241138 00000000 */ nop +/* ECAE3C 8024113C 45000008 */ bc1f .L80241160 +/* ECAE40 80241140 02A0202D */ daddu $a0, $s5, $zero +/* ECAE44 80241144 AFA00010 */ sw $zero, 0x10($sp) +/* ECAE48 80241148 8E26000C */ lw $a2, 0xc($s1) +/* ECAE4C 8024114C 8E270010 */ lw $a3, 0x10($s1) +/* ECAE50 80241150 0C013469 */ jal func_8004D1A4 +/* ECAE54 80241154 0240282D */ daddu $a1, $s2, $zero +/* ECAE58 80241158 54400001 */ bnel $v0, $zero, .L80241160 +/* ECAE5C 8024115C 24130001 */ addiu $s3, $zero, 1 +.L80241160: +/* ECAE60 80241160 1660006A */ bnez $s3, .L8024130C +/* ECAE64 80241164 2402000A */ addiu $v0, $zero, 0xa +/* ECAE68 80241168 4616C03C */ c.lt.s $f24, $f22 +/* ECAE6C 8024116C 00000000 */ nop +/* ECAE70 80241170 4500000C */ bc1f .L802411A4 +/* ECAE74 80241174 00000000 */ nop +/* ECAE78 80241178 4618D03C */ c.lt.s $f26, $f24 +/* ECAE7C 8024117C 00000000 */ nop +/* ECAE80 80241180 45000006 */ bc1f .L8024119C +/* ECAE84 80241184 00000000 */ nop +/* ECAE88 80241188 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECAE8C 8024118C C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECAE90 80241190 8FA60020 */ lw $a2, 0x20($sp) +/* ECAE94 80241194 080904A2 */ j .L80241288 +/* ECAE98 80241198 8FA70028 */ lw $a3, 0x28($sp) +.L8024119C: +/* ECAE9C 8024119C 4616C03C */ c.lt.s $f24, $f22 +/* ECAEA0 802411A0 00000000 */ nop +.L802411A4: +/* ECAEA4 802411A4 4500000A */ bc1f .L802411D0 +/* ECAEA8 802411A8 00000000 */ nop +/* ECAEAC 802411AC 461AC03C */ c.lt.s $f24, $f26 +/* ECAEB0 802411B0 00000000 */ nop +/* ECAEB4 802411B4 45000006 */ bc1f .L802411D0 +/* ECAEB8 802411B8 00000000 */ nop +/* ECAEBC 802411BC C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECAEC0 802411C0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECAEC4 802411C4 8FA60020 */ lw $a2, 0x20($sp) +/* ECAEC8 802411C8 080904A2 */ j .L80241288 +/* ECAECC 802411CC 8FA70028 */ lw $a3, 0x28($sp) +.L802411D0: +/* ECAED0 802411D0 4618B03C */ c.lt.s $f22, $f24 +/* ECAED4 802411D4 00000000 */ nop +/* ECAED8 802411D8 4500000A */ bc1f .L80241204 +/* ECAEDC 802411DC 00000000 */ nop +/* ECAEE0 802411E0 4616D03C */ c.lt.s $f26, $f22 +/* ECAEE4 802411E4 00000000 */ nop +/* ECAEE8 802411E8 45000006 */ bc1f .L80241204 +/* ECAEEC 802411EC 00000000 */ nop +/* ECAEF0 802411F0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECAEF4 802411F4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECAEF8 802411F8 8FA6002C */ lw $a2, 0x2c($sp) +/* ECAEFC 802411FC 080904A2 */ j .L80241288 +/* ECAF00 80241200 8FA70034 */ lw $a3, 0x34($sp) +.L80241204: +/* ECAF04 80241204 4618D03C */ c.lt.s $f26, $f24 +/* ECAF08 80241208 00000000 */ nop +/* ECAF0C 8024120C 4500000A */ bc1f .L80241238 +/* ECAF10 80241210 00000000 */ nop +/* ECAF14 80241214 461AB03C */ c.lt.s $f22, $f26 +/* ECAF18 80241218 00000000 */ nop +/* ECAF1C 8024121C 45000008 */ bc1f .L80241240 +/* ECAF20 80241220 00000000 */ nop +/* ECAF24 80241224 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECAF28 80241228 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECAF2C 8024122C 8FA6002C */ lw $a2, 0x2c($sp) +/* ECAF30 80241230 080904A2 */ j .L80241288 +/* ECAF34 80241234 8FA70034 */ lw $a3, 0x34($sp) +.L80241238: +/* ECAF38 80241238 461AB03C */ c.lt.s $f22, $f26 +/* ECAF3C 8024123C 00000000 */ nop +.L80241240: +/* ECAF40 80241240 45000005 */ bc1f .L80241258 +/* ECAF44 80241244 00000000 */ nop +/* ECAF48 80241248 4616C03C */ c.lt.s $f24, $f22 +/* ECAF4C 8024124C 00000000 */ nop +/* ECAF50 80241250 45010009 */ bc1t .L80241278 +/* ECAF54 80241254 00000000 */ nop +.L80241258: +/* ECAF58 80241258 461AC03C */ c.lt.s $f24, $f26 +/* ECAF5C 8024125C 00000000 */ nop +/* ECAF60 80241260 4500000C */ bc1f .L80241294 +/* ECAF64 80241264 00000000 */ nop +/* ECAF68 80241268 4618B03C */ c.lt.s $f22, $f24 +/* ECAF6C 8024126C 00000000 */ nop +/* ECAF70 80241270 45000008 */ bc1f .L80241294 +/* ECAF74 80241274 00000000 */ nop +.L80241278: +/* ECAF78 80241278 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ECAF7C 8024127C C60E0040 */ lwc1 $f14, 0x40($s0) +/* ECAF80 80241280 8FA60038 */ lw $a2, 0x38($sp) +/* ECAF84 80241284 8FA70040 */ lw $a3, 0x40($sp) +.L80241288: +/* ECAF88 80241288 0C00ABDC */ jal fio_validate_header_checksums +/* ECAF8C 8024128C 00000000 */ nop +/* ECAF90 80241290 46000506 */ mov.s $f20, $f0 +.L80241294: +/* ECAF94 80241294 C60C000C */ lwc1 $f12, 0xc($s0) +/* ECAF98 80241298 0C00ABC6 */ jal func_8002AF18 +/* ECAF9C 8024129C 4600A386 */ mov.s $f14, $f20 +/* ECAFA0 802412A0 46000086 */ mov.s $f2, $f0 +/* ECAFA4 802412A4 8E22001C */ lw $v0, 0x1c($s1) +/* ECAFA8 802412A8 46001005 */ abs.s $f0, $f2 +/* ECAFAC 802412AC 44822000 */ mtc1 $v0, $f4 +/* ECAFB0 802412B0 00000000 */ nop +/* ECAFB4 802412B4 46802120 */ cvt.s.w $f4, $f4 +/* ECAFB8 802412B8 4600203C */ c.lt.s $f4, $f0 +/* ECAFBC 802412BC 00000000 */ nop +/* ECAFC0 802412C0 4500000D */ bc1f .L802412F8 +/* ECAFC4 802412C4 00000000 */ nop +/* ECAFC8 802412C8 44800000 */ mtc1 $zero, $f0 +/* ECAFCC 802412CC C614000C */ lwc1 $f20, 0xc($s0) +/* ECAFD0 802412D0 4600103C */ c.lt.s $f2, $f0 +/* ECAFD4 802412D4 00000000 */ nop +/* ECAFD8 802412D8 45000006 */ bc1f .L802412F4 +/* ECAFDC 802412DC 00021023 */ negu $v0, $v0 +/* ECAFE0 802412E0 44820000 */ mtc1 $v0, $f0 +/* ECAFE4 802412E4 00000000 */ nop +/* ECAFE8 802412E8 46800020 */ cvt.s.w $f0, $f0 +/* ECAFEC 802412EC 080904BE */ j .L802412F8 +/* ECAFF0 802412F0 4600A500 */ add.s $f20, $f20, $f0 +.L802412F4: +/* ECAFF4 802412F4 4604A500 */ add.s $f20, $f20, $f4 +.L802412F8: +/* ECAFF8 802412F8 0C00AB85 */ jal func_8002AE14 +/* ECAFFC 802412FC 4600A306 */ mov.s $f12, $f20 +/* ECB000 80241300 E600000C */ swc1 $f0, 0xc($s0) +.L80241304: +/* ECB004 80241304 12600005 */ beqz $s3, .L8024131C +/* ECB008 80241308 2402000A */ addiu $v0, $zero, 0xa +.L8024130C: +/* ECB00C 8024130C A602008E */ sh $v0, 0x8e($s0) +/* ECB010 80241310 8E4200CC */ lw $v0, 0xcc($s2) +/* ECB014 80241314 8C420020 */ lw $v0, 0x20($v0) +/* ECB018 80241318 AE020028 */ sw $v0, 0x28($s0) +.L8024131C: +/* ECB01C 8024131C 2402000D */ addiu $v0, $zero, 0xd +/* ECB020 80241320 AEC20070 */ sw $v0, 0x70($s6) +/* ECB024 80241324 8FBF0064 */ lw $ra, 0x64($sp) +/* ECB028 80241328 8FB60060 */ lw $s6, 0x60($sp) +/* ECB02C 8024132C 8FB5005C */ lw $s5, 0x5c($sp) +/* ECB030 80241330 8FB40058 */ lw $s4, 0x58($sp) +/* ECB034 80241334 8FB30054 */ lw $s3, 0x54($sp) +/* ECB038 80241338 8FB20050 */ lw $s2, 0x50($sp) +/* ECB03C 8024133C 8FB1004C */ lw $s1, 0x4c($sp) +/* ECB040 80241340 8FB00048 */ lw $s0, 0x48($sp) +/* ECB044 80241344 D7BE0090 */ ldc1 $f30, 0x90($sp) +/* ECB048 80241348 D7BC0088 */ ldc1 $f28, 0x88($sp) +/* ECB04C 8024134C D7BA0080 */ ldc1 $f26, 0x80($sp) +/* ECB050 80241350 D7B80078 */ ldc1 $f24, 0x78($sp) +/* ECB054 80241354 D7B60070 */ ldc1 $f22, 0x70($sp) +/* ECB058 80241358 D7B40068 */ ldc1 $f20, 0x68($sp) +/* ECB05C 8024135C 03E00008 */ jr $ra +/* ECB060 80241360 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/asm/nonmatchings/code_ECAA80/func_80241364_ECB064.s b/asm/nonmatchings/code_ECAA80/func_80241364_ECB064.s new file mode 100644 index 0000000000..9fe0b4a40f --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_80241364_ECB064.s @@ -0,0 +1,100 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241364_ECB064 +/* ECB064 80241364 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* ECB068 80241368 AFB3003C */ sw $s3, 0x3c($sp) +/* ECB06C 8024136C 0080982D */ daddu $s3, $a0, $zero +/* ECB070 80241370 AFBF0040 */ sw $ra, 0x40($sp) +/* ECB074 80241374 AFB20038 */ sw $s2, 0x38($sp) +/* ECB078 80241378 AFB10034 */ sw $s1, 0x34($sp) +/* ECB07C 8024137C AFB00030 */ sw $s0, 0x30($sp) +/* ECB080 80241380 8E720148 */ lw $s2, 0x148($s3) +/* ECB084 80241384 00A0882D */ daddu $s1, $a1, $zero +/* ECB088 80241388 86440008 */ lh $a0, 8($s2) +/* ECB08C 8024138C 0C00F92F */ jal func_8003E4BC +/* ECB090 80241390 00C0802D */ daddu $s0, $a2, $zero +/* ECB094 80241394 0200202D */ daddu $a0, $s0, $zero +/* ECB098 80241398 0240282D */ daddu $a1, $s2, $zero +/* ECB09C 8024139C 24030001 */ addiu $v1, $zero, 1 +/* ECB0A0 802413A0 AFA30010 */ sw $v1, 0x10($sp) +/* ECB0A4 802413A4 8E260024 */ lw $a2, 0x24($s1) +/* ECB0A8 802413A8 8E270028 */ lw $a3, 0x28($s1) +/* ECB0AC 802413AC 0C013469 */ jal func_8004D1A4 +/* ECB0B0 802413B0 0040802D */ daddu $s0, $v0, $zero +/* ECB0B4 802413B4 1440001D */ bnez $v0, .L8024142C +/* ECB0B8 802413B8 24040002 */ addiu $a0, $zero, 2 +/* ECB0BC 802413BC 0200282D */ daddu $a1, $s0, $zero +/* ECB0C0 802413C0 0000302D */ daddu $a2, $zero, $zero +/* ECB0C4 802413C4 860300A8 */ lh $v1, 0xa8($s0) +/* ECB0C8 802413C8 3C013F80 */ lui $at, 0x3f80 +/* ECB0CC 802413CC 44810000 */ mtc1 $at, $f0 +/* ECB0D0 802413D0 3C014000 */ lui $at, 0x4000 +/* ECB0D4 802413D4 44811000 */ mtc1 $at, $f2 +/* ECB0D8 802413D8 3C01C1A0 */ lui $at, 0xc1a0 +/* ECB0DC 802413DC 44812000 */ mtc1 $at, $f4 +/* ECB0E0 802413E0 2402000F */ addiu $v0, $zero, 0xf +/* ECB0E4 802413E4 AFA2001C */ sw $v0, 0x1c($sp) +/* ECB0E8 802413E8 44833000 */ mtc1 $v1, $f6 +/* ECB0EC 802413EC 00000000 */ nop +/* ECB0F0 802413F0 468031A0 */ cvt.s.w $f6, $f6 +/* ECB0F4 802413F4 44073000 */ mfc1 $a3, $f6 +/* ECB0F8 802413F8 27A20028 */ addiu $v0, $sp, 0x28 +/* ECB0FC 802413FC AFA20020 */ sw $v0, 0x20($sp) +/* ECB100 80241400 E7A00010 */ swc1 $f0, 0x10($sp) +/* ECB104 80241404 E7A20014 */ swc1 $f2, 0x14($sp) +/* ECB108 80241408 0C01D444 */ jal func_80075110 +/* ECB10C 8024140C E7A40018 */ swc1 $f4, 0x18($sp) +/* ECB110 80241410 8E4200CC */ lw $v0, 0xcc($s2) +/* ECB114 80241414 8C430000 */ lw $v1, ($v0) +/* ECB118 80241418 24020019 */ addiu $v0, $zero, 0x19 +/* ECB11C 8024141C A602008E */ sh $v0, 0x8e($s0) +/* ECB120 80241420 2402000E */ addiu $v0, $zero, 0xe +/* ECB124 80241424 0809052A */ j .L802414A8 +/* ECB128 80241428 AE030028 */ sw $v1, 0x28($s0) +.L8024142C: +/* ECB12C 8024142C 8E4200CC */ lw $v0, 0xcc($s2) +/* ECB130 80241430 8E030028 */ lw $v1, 0x28($s0) +/* ECB134 80241434 8C420020 */ lw $v0, 0x20($v0) +/* ECB138 80241438 10620014 */ beq $v1, $v0, .L8024148C +/* ECB13C 8024143C 00000000 */ nop +/* ECB140 80241440 C6000018 */ lwc1 $f0, 0x18($s0) +/* ECB144 80241444 3C014010 */ lui $at, 0x4010 +/* ECB148 80241448 44811800 */ mtc1 $at, $f3 +/* ECB14C 8024144C 44801000 */ mtc1 $zero, $f2 +/* ECB150 80241450 46000021 */ cvt.d.s $f0, $f0 +/* ECB154 80241454 4622003C */ c.lt.d $f0, $f2 +/* ECB158 80241458 00000000 */ nop +/* ECB15C 8024145C 45000003 */ bc1f .L8024146C +/* ECB160 80241460 0000282D */ daddu $a1, $zero, $zero +/* ECB164 80241464 0809051D */ j .L80241474 +/* ECB168 80241468 0200202D */ daddu $a0, $s0, $zero +.L8024146C: +/* ECB16C 8024146C 0200202D */ daddu $a0, $s0, $zero +/* ECB170 80241470 24050001 */ addiu $a1, $zero, 1 +.L80241474: +/* ECB174 80241474 0C010420 */ jal func_80041080 +/* ECB178 80241478 00000000 */ nop +/* ECB17C 8024147C 8E050018 */ lw $a1, 0x18($s0) +/* ECB180 80241480 8E06000C */ lw $a2, 0xc($s0) +/* ECB184 80241484 0C00F909 */ jal func_8003E424 +/* ECB188 80241488 0200202D */ daddu $a0, $s0, $zero +.L8024148C: +/* ECB18C 8024148C 8602008E */ lh $v0, 0x8e($s0) +/* ECB190 80241490 9603008E */ lhu $v1, 0x8e($s0) +/* ECB194 80241494 18400003 */ blez $v0, .L802414A4 +/* ECB198 80241498 2462FFFF */ addiu $v0, $v1, -1 +/* ECB19C 8024149C 0809052B */ j .L802414AC +/* ECB1A0 802414A0 A602008E */ sh $v0, 0x8e($s0) +.L802414A4: +/* ECB1A4 802414A4 2402000C */ addiu $v0, $zero, 0xc +.L802414A8: +/* ECB1A8 802414A8 AE620070 */ sw $v0, 0x70($s3) +.L802414AC: +/* ECB1AC 802414AC 8FBF0040 */ lw $ra, 0x40($sp) +/* ECB1B0 802414B0 8FB3003C */ lw $s3, 0x3c($sp) +/* ECB1B4 802414B4 8FB20038 */ lw $s2, 0x38($sp) +/* ECB1B8 802414B8 8FB10034 */ lw $s1, 0x34($sp) +/* ECB1BC 802414BC 8FB00030 */ lw $s0, 0x30($sp) +/* ECB1C0 802414C0 03E00008 */ jr $ra +/* ECB1C4 802414C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_ECAA80/func_802414C8_ECB1C8.s b/asm/nonmatchings/code_ECAA80/func_802414C8_ECB1C8.s new file mode 100644 index 0000000000..2afde5ef7f --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_802414C8_ECB1C8.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414C8_ECB1C8 +/* ECB1C8 802414C8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ECB1CC 802414CC AFB00010 */ sw $s0, 0x10($sp) +/* ECB1D0 802414D0 0080802D */ daddu $s0, $a0, $zero +/* ECB1D4 802414D4 AFBF0014 */ sw $ra, 0x14($sp) +/* ECB1D8 802414D8 8E020148 */ lw $v0, 0x148($s0) +/* ECB1DC 802414DC 0C00F92F */ jal func_8003E4BC +/* ECB1E0 802414E0 84440008 */ lh $a0, 8($v0) +/* ECB1E4 802414E4 9443008E */ lhu $v1, 0x8e($v0) +/* ECB1E8 802414E8 2463FFFF */ addiu $v1, $v1, -1 +/* ECB1EC 802414EC A443008E */ sh $v1, 0x8e($v0) +/* ECB1F0 802414F0 00031C00 */ sll $v1, $v1, 0x10 +/* ECB1F4 802414F4 50600001 */ beql $v1, $zero, .L802414FC +/* ECB1F8 802414F8 AE000070 */ sw $zero, 0x70($s0) +.L802414FC: +/* ECB1FC 802414FC 8FBF0014 */ lw $ra, 0x14($sp) +/* ECB200 80241500 8FB00010 */ lw $s0, 0x10($sp) +/* ECB204 80241504 03E00008 */ jr $ra +/* ECB208 80241508 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s b/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s new file mode 100644 index 0000000000..c2739d3d5f --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s @@ -0,0 +1,162 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024150C_ECB20C +/* ECB20C 8024150C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* ECB210 80241510 AFB50044 */ sw $s5, 0x44($sp) +/* ECB214 80241514 0080A82D */ daddu $s5, $a0, $zero +/* ECB218 80241518 AFBF0048 */ sw $ra, 0x48($sp) +/* ECB21C 8024151C AFB40040 */ sw $s4, 0x40($sp) +/* ECB220 80241520 AFB3003C */ sw $s3, 0x3c($sp) +/* ECB224 80241524 AFB20038 */ sw $s2, 0x38($sp) +/* ECB228 80241528 AFB10034 */ sw $s1, 0x34($sp) +/* ECB22C 8024152C AFB00030 */ sw $s0, 0x30($sp) +/* ECB230 80241530 8EB10148 */ lw $s1, 0x148($s5) +/* ECB234 80241534 86240008 */ lh $a0, 8($s1) +/* ECB238 80241538 0C00F92F */ jal func_8003E4BC +/* ECB23C 8024153C 00A0802D */ daddu $s0, $a1, $zero +/* ECB240 80241540 8EA3000C */ lw $v1, 0xc($s5) +/* ECB244 80241544 02A0202D */ daddu $a0, $s5, $zero +/* ECB248 80241548 8C650000 */ lw $a1, ($v1) +/* ECB24C 8024154C 0C0B53A3 */ jal func_802D4E8C +/* ECB250 80241550 0040902D */ daddu $s2, $v0, $zero +/* ECB254 80241554 AFA00010 */ sw $zero, 0x10($sp) +/* ECB258 80241558 8E2300D0 */ lw $v1, 0xd0($s1) +/* ECB25C 8024155C 8C630030 */ lw $v1, 0x30($v1) +/* ECB260 80241560 AFA30014 */ sw $v1, 0x14($sp) +/* ECB264 80241564 8E2300D0 */ lw $v1, 0xd0($s1) +/* ECB268 80241568 8C63001C */ lw $v1, 0x1c($v1) +/* ECB26C 8024156C AFA30018 */ sw $v1, 0x18($sp) +/* ECB270 80241570 8E2300D0 */ lw $v1, 0xd0($s1) +/* ECB274 80241574 8C630024 */ lw $v1, 0x24($v1) +/* ECB278 80241578 AFA3001C */ sw $v1, 0x1c($sp) +/* ECB27C 8024157C 8E2300D0 */ lw $v1, 0xd0($s1) +/* ECB280 80241580 8C630028 */ lw $v1, 0x28($v1) +/* ECB284 80241584 AFA30020 */ sw $v1, 0x20($sp) +/* ECB288 80241588 8E2300D0 */ lw $v1, 0xd0($s1) +/* ECB28C 8024158C 3C0142C8 */ lui $at, 0x42c8 +/* ECB290 80241590 44810000 */ mtc1 $at, $f0 +/* ECB294 80241594 8C63002C */ lw $v1, 0x2c($v1) +/* ECB298 80241598 E7A00028 */ swc1 $f0, 0x28($sp) +/* ECB29C 8024159C A7A0002C */ sh $zero, 0x2c($sp) +/* ECB2A0 802415A0 AFA30024 */ sw $v1, 0x24($sp) +/* ECB2A4 802415A4 C6400038 */ lwc1 $f0, 0x38($s2) +/* ECB2A8 802415A8 E6200108 */ swc1 $f0, 0x108($s1) +/* ECB2AC 802415AC C640003C */ lwc1 $f0, 0x3c($s2) +/* ECB2B0 802415B0 27B40010 */ addiu $s4, $sp, 0x10 +/* ECB2B4 802415B4 E620010C */ swc1 $f0, 0x10c($s1) +/* ECB2B8 802415B8 3C013C23 */ lui $at, 0x3c23 +/* ECB2BC 802415BC 3421D70A */ ori $at, $at, 0xd70a +/* ECB2C0 802415C0 44810000 */ mtc1 $at, $f0 +/* ECB2C4 802415C4 C6420040 */ lwc1 $f2, 0x40($s2) +/* ECB2C8 802415C8 0040982D */ daddu $s3, $v0, $zero +/* ECB2CC 802415CC E6200114 */ swc1 $f0, 0x114($s1) +/* ECB2D0 802415D0 E6200118 */ swc1 $f0, 0x118($s1) +/* ECB2D4 802415D4 16000005 */ bnez $s0, .L802415EC +/* ECB2D8 802415D8 E6220110 */ swc1 $f2, 0x110($s1) +/* ECB2DC 802415DC 8E2200B0 */ lw $v0, 0xb0($s1) +/* ECB2E0 802415E0 30420004 */ andi $v0, $v0, 4 +/* ECB2E4 802415E4 1040001F */ beqz $v0, .L80241664 +/* ECB2E8 802415E8 00000000 */ nop +.L802415EC: +/* ECB2EC 802415EC 2404F7FF */ addiu $a0, $zero, -0x801 +/* ECB2F0 802415F0 AEA00070 */ sw $zero, 0x70($s5) +/* ECB2F4 802415F4 A640008E */ sh $zero, 0x8e($s2) +/* ECB2F8 802415F8 8E2200CC */ lw $v0, 0xcc($s1) +/* ECB2FC 802415FC 8E430000 */ lw $v1, ($s2) +/* ECB300 80241600 8C420000 */ lw $v0, ($v0) +/* ECB304 80241604 00641824 */ and $v1, $v1, $a0 +/* ECB308 80241608 AE430000 */ sw $v1, ($s2) +/* ECB30C 8024160C AE420028 */ sw $v0, 0x28($s2) +/* ECB310 80241610 8E2200D0 */ lw $v0, 0xd0($s1) +/* ECB314 80241614 8C420034 */ lw $v0, 0x34($v0) +/* ECB318 80241618 54400005 */ bnel $v0, $zero, .L80241630 +/* ECB31C 8024161C 2402FDFF */ addiu $v0, $zero, -0x201 +/* ECB320 80241620 34620200 */ ori $v0, $v1, 0x200 +/* ECB324 80241624 2403FFF7 */ addiu $v1, $zero, -9 +/* ECB328 80241628 0809058E */ j .L80241638 +/* ECB32C 8024162C 00431024 */ and $v0, $v0, $v1 +.L80241630: +/* ECB330 80241630 00621024 */ and $v0, $v1, $v0 +/* ECB334 80241634 34420008 */ ori $v0, $v0, 8 +.L80241638: +/* ECB338 80241638 AE420000 */ sw $v0, ($s2) +/* ECB33C 8024163C 8E2200B0 */ lw $v0, 0xb0($s1) +/* ECB340 80241640 30420004 */ andi $v0, $v0, 4 +/* ECB344 80241644 10400007 */ beqz $v0, .L80241664 +/* ECB348 80241648 24020063 */ addiu $v0, $zero, 0x63 +/* ECB34C 8024164C AEA20070 */ sw $v0, 0x70($s5) +/* ECB350 80241650 AEA00074 */ sw $zero, 0x74($s5) +/* ECB354 80241654 8E2200B0 */ lw $v0, 0xb0($s1) +/* ECB358 80241658 2403FFFB */ addiu $v1, $zero, -5 +/* ECB35C 8024165C 00431024 */ and $v0, $v0, $v1 +/* ECB360 80241660 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241664: +/* ECB364 80241664 8EA30070 */ lw $v1, 0x70($s5) +/* ECB368 80241668 2C620064 */ sltiu $v0, $v1, 0x64 +/* ECB36C 8024166C 10400036 */ beqz $v0, .L80241748 +/* ECB370 80241670 00031080 */ sll $v0, $v1, 2 +/* ECB374 80241674 3C018024 */ lui $at, %hi(D_80246160) +/* ECB378 80241678 00220821 */ addu $at, $at, $v0 +/* ECB37C 8024167C 8C226160 */ lw $v0, %lo(D_80246160)($at) +/* ECB380 80241680 00400008 */ jr $v0 +/* ECB384 80241684 00000000 */ nop +/* ECB388 80241688 02A0202D */ daddu $a0, $s5, $zero +/* ECB38C 8024168C 0260282D */ daddu $a1, $s3, $zero +/* ECB390 80241690 0C013670 */ jal func_8004D9C0 +/* ECB394 80241694 0280302D */ daddu $a2, $s4, $zero +/* ECB398 80241698 02A0202D */ daddu $a0, $s5, $zero +/* ECB39C 8024169C 0260282D */ daddu $a1, $s3, $zero +/* ECB3A0 802416A0 0C0136B6 */ jal func_8004DAD8 +/* ECB3A4 802416A4 0280302D */ daddu $a2, $s4, $zero +/* ECB3A8 802416A8 080905D2 */ j .L80241748 +/* ECB3AC 802416AC 00000000 */ nop +/* ECB3B0 802416B0 02A0202D */ daddu $a0, $s5, $zero +/* ECB3B4 802416B4 0260282D */ daddu $a1, $s3, $zero +/* ECB3B8 802416B8 0C0137D9 */ jal func_8004DF64 +/* ECB3BC 802416BC 0280302D */ daddu $a2, $s4, $zero +/* ECB3C0 802416C0 02A0202D */ daddu $a0, $s5, $zero +/* ECB3C4 802416C4 0260282D */ daddu $a1, $s3, $zero +/* ECB3C8 802416C8 0C013809 */ jal func_8004E024 +/* ECB3CC 802416CC 0280302D */ daddu $a2, $s4, $zero +/* ECB3D0 802416D0 080905D2 */ j .L80241748 +/* ECB3D4 802416D4 00000000 */ nop +/* ECB3D8 802416D8 02A0202D */ daddu $a0, $s5, $zero +/* ECB3DC 802416DC 0260282D */ daddu $a1, $s3, $zero +/* ECB3E0 802416E0 0C013897 */ jal func_8004E25C +/* ECB3E4 802416E4 0280302D */ daddu $a2, $s4, $zero +/* ECB3E8 802416E8 02A0202D */ daddu $a0, $s5, $zero +/* ECB3EC 802416EC 0260282D */ daddu $a1, $s3, $zero +/* ECB3F0 802416F0 0C0138BB */ jal func_8004E2EC +/* ECB3F4 802416F4 0280302D */ daddu $a2, $s4, $zero +/* ECB3F8 802416F8 080905D2 */ j .L80241748 +/* ECB3FC 802416FC 00000000 */ nop +/* ECB400 80241700 02A0202D */ daddu $a0, $s5, $zero +/* ECB404 80241704 0260282D */ daddu $a1, $s3, $zero +/* ECB408 80241708 0C090360 */ jal func_80240D80_ECAA80 +/* ECB40C 8024170C 0280302D */ daddu $a2, $s4, $zero +/* ECB410 80241710 02A0202D */ daddu $a0, $s5, $zero +/* ECB414 80241714 0260282D */ daddu $a1, $s3, $zero +/* ECB418 80241718 0C0904D9 */ jal func_80241364_ECB064 +/* ECB41C 8024171C 0280302D */ daddu $a2, $s4, $zero +/* ECB420 80241720 080905D2 */ j .L80241748 +/* ECB424 80241724 00000000 */ nop +/* ECB428 80241728 02A0202D */ daddu $a0, $s5, $zero +/* ECB42C 8024172C 0260282D */ daddu $a1, $s3, $zero +/* ECB430 80241730 0C090532 */ jal func_802414C8_ECB1C8 +/* ECB434 80241734 0280302D */ daddu $a2, $s4, $zero +/* ECB438 80241738 080905D2 */ j .L80241748 +/* ECB43C 8024173C 00000000 */ nop +/* ECB440 80241740 0C013AE3 */ jal func_8004EB8C +/* ECB444 80241744 02A0202D */ daddu $a0, $s5, $zero +.L80241748: +/* ECB448 80241748 8FBF0048 */ lw $ra, 0x48($sp) +/* ECB44C 8024174C 8FB50044 */ lw $s5, 0x44($sp) +/* ECB450 80241750 8FB40040 */ lw $s4, 0x40($sp) +/* ECB454 80241754 8FB3003C */ lw $s3, 0x3c($sp) +/* ECB458 80241758 8FB20038 */ lw $s2, 0x38($sp) +/* ECB45C 8024175C 8FB10034 */ lw $s1, 0x34($sp) +/* ECB460 80241760 8FB00030 */ lw $s0, 0x30($sp) +/* ECB464 80241764 0000102D */ daddu $v0, $zero, $zero +/* ECB468 80241768 03E00008 */ jr $ra +/* ECB46C 8024176C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_ECAA80/func_80241770_ECB470.s b/asm/nonmatchings/code_ECAA80/func_80241770_ECB470.s new file mode 100644 index 0000000000..25da94c706 --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_80241770_ECB470.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241770_ECB470 +/* ECB470 80241770 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ECB474 80241774 AFB10014 */ sw $s1, 0x14($sp) +/* ECB478 80241778 0080882D */ daddu $s1, $a0, $zero +/* ECB47C 8024177C AFBF0018 */ sw $ra, 0x18($sp) +/* ECB480 80241780 AFB00010 */ sw $s0, 0x10($sp) +/* ECB484 80241784 8E30000C */ lw $s0, 0xc($s1) +/* ECB488 80241788 8E050000 */ lw $a1, ($s0) +/* ECB48C 8024178C 0C0B53A3 */ jal func_802D4E8C +/* ECB490 80241790 26100004 */ addiu $s0, $s0, 4 +/* ECB494 80241794 0C00F94D */ jal func_8003E534 +/* ECB498 80241798 0040202D */ daddu $a0, $v0, $zero +/* ECB49C 8024179C 10400005 */ beqz $v0, .L802417B4 +/* ECB4A0 802417A0 00000000 */ nop +/* ECB4A4 802417A4 8E050000 */ lw $a1, ($s0) +/* ECB4A8 802417A8 844600A8 */ lh $a2, 0xa8($v0) +/* ECB4AC 802417AC 0C0B551A */ jal func_802D5468 +/* ECB4B0 802417B0 0220202D */ daddu $a0, $s1, $zero +.L802417B4: +/* ECB4B4 802417B4 8FBF0018 */ lw $ra, 0x18($sp) +/* ECB4B8 802417B8 8FB10014 */ lw $s1, 0x14($sp) +/* ECB4BC 802417BC 8FB00010 */ lw $s0, 0x10($sp) +/* ECB4C0 802417C0 24020002 */ addiu $v0, $zero, 2 +/* ECB4C4 802417C4 03E00008 */ jr $ra +/* ECB4C8 802417C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_ECAA80/func_802417CC_ECB4CC.s b/asm/nonmatchings/code_ECAA80/func_802417CC_ECB4CC.s new file mode 100644 index 0000000000..b94e84127f --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_802417CC_ECB4CC.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417CC_ECB4CC +/* ECB4CC 802417CC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* ECB4D0 802417D0 AFB10014 */ sw $s1, 0x14($sp) +/* ECB4D4 802417D4 0080882D */ daddu $s1, $a0, $zero +/* ECB4D8 802417D8 AFBF0024 */ sw $ra, 0x24($sp) +/* ECB4DC 802417DC AFB40020 */ sw $s4, 0x20($sp) +/* ECB4E0 802417E0 AFB3001C */ sw $s3, 0x1c($sp) +/* ECB4E4 802417E4 AFB20018 */ sw $s2, 0x18($sp) +/* ECB4E8 802417E8 AFB00010 */ sw $s0, 0x10($sp) +/* ECB4EC 802417EC F7BC0048 */ sdc1 $f28, 0x48($sp) +/* ECB4F0 802417F0 F7BA0040 */ sdc1 $f26, 0x40($sp) +/* ECB4F4 802417F4 F7B80038 */ sdc1 $f24, 0x38($sp) +/* ECB4F8 802417F8 F7B60030 */ sdc1 $f22, 0x30($sp) +/* ECB4FC 802417FC F7B40028 */ sdc1 $f20, 0x28($sp) +/* ECB500 80241800 8E30000C */ lw $s0, 0xc($s1) +/* ECB504 80241804 8E130000 */ lw $s3, ($s0) +/* ECB508 80241808 26100004 */ addiu $s0, $s0, 4 +/* ECB50C 8024180C 0C0B53A3 */ jal func_802D4E8C +/* ECB510 80241810 0260282D */ daddu $a1, $s3, $zero +/* ECB514 80241814 4482E000 */ mtc1 $v0, $f28 +/* ECB518 80241818 00000000 */ nop +/* ECB51C 8024181C 4680E720 */ cvt.s.w $f28, $f28 +/* ECB520 80241820 8E140000 */ lw $s4, ($s0) +/* ECB524 80241824 26100004 */ addiu $s0, $s0, 4 +/* ECB528 80241828 0220202D */ daddu $a0, $s1, $zero +/* ECB52C 8024182C 0C0B53A3 */ jal func_802D4E8C +/* ECB530 80241830 0280282D */ daddu $a1, $s4, $zero +/* ECB534 80241834 4482D000 */ mtc1 $v0, $f26 +/* ECB538 80241838 00000000 */ nop +/* ECB53C 8024183C 4680D6A0 */ cvt.s.w $f26, $f26 +/* ECB540 80241840 8E100000 */ lw $s0, ($s0) +/* ECB544 80241844 0220202D */ daddu $a0, $s1, $zero +/* ECB548 80241848 0C0B53A3 */ jal func_802D4E8C +/* ECB54C 8024184C 0200282D */ daddu $a1, $s0, $zero +/* ECB550 80241850 4482C000 */ mtc1 $v0, $f24 +/* ECB554 80241854 00000000 */ nop +/* ECB558 80241858 4680C620 */ cvt.s.w $f24, $f24 +/* ECB55C 8024185C 3C128011 */ lui $s2, %hi(D_80117578) +/* ECB560 80241860 26527578 */ addiu $s2, $s2, %lo(D_80117578) +/* ECB564 80241864 3C038008 */ lui $v1, %hi(D_8007C760) +/* ECB568 80241868 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* ECB56C 8024186C C64200A8 */ lwc1 $f2, 0xa8($s2) +/* ECB570 80241870 44800000 */ mtc1 $zero, $f0 +/* ECB574 80241874 00031080 */ sll $v0, $v1, 2 +/* ECB578 80241878 00431021 */ addu $v0, $v0, $v1 +/* ECB57C 8024187C 00021080 */ sll $v0, $v0, 2 +/* ECB580 80241880 00431023 */ subu $v0, $v0, $v1 +/* ECB584 80241884 000218C0 */ sll $v1, $v0, 3 +/* ECB588 80241888 00431021 */ addu $v0, $v0, $v1 +/* ECB58C 8024188C 000210C0 */ sll $v0, $v0, 3 +/* ECB590 80241890 46001032 */ c.eq.s $f2, $f0 +/* ECB594 80241894 3C01800C */ lui $at, %hi(D_800B8DEC) +/* ECB598 80241898 00220821 */ addu $at, $at, $v0 +/* ECB59C 8024189C C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) +/* ECB5A0 802418A0 45000005 */ bc1f .L802418B8 +/* ECB5A4 802418A4 00000000 */ nop +/* ECB5A8 802418A8 3C0142C8 */ lui $at, 0x42c8 +/* ECB5AC 802418AC 44810000 */ mtc1 $at, $f0 +/* ECB5B0 802418B0 08090632 */ j .L802418C8 +/* ECB5B4 802418B4 4600B581 */ sub.s $f22, $f22, $f0 +.L802418B8: +/* ECB5B8 802418B8 3C0142C8 */ lui $at, 0x42c8 +/* ECB5BC 802418BC 44810000 */ mtc1 $at, $f0 +/* ECB5C0 802418C0 00000000 */ nop +/* ECB5C4 802418C4 4600B580 */ add.s $f22, $f22, $f0 +.L802418C8: +/* ECB5C8 802418C8 0C00AB85 */ jal func_8002AE14 +/* ECB5CC 802418CC 4600B306 */ mov.s $f12, $f22 +/* ECB5D0 802418D0 46000586 */ mov.s $f22, $f0 +/* ECB5D4 802418D4 3C014170 */ lui $at, 0x4170 +/* ECB5D8 802418D8 4481A000 */ mtc1 $at, $f20 +/* ECB5DC 802418DC 0C00AD77 */ jal func_8002B5DC +/* ECB5E0 802418E0 4600B306 */ mov.s $f12, $f22 +/* ECB5E4 802418E4 46140002 */ mul.s $f0, $f0, $f20 +/* ECB5E8 802418E8 00000000 */ nop +/* ECB5EC 802418EC 864200B0 */ lh $v0, 0xb0($s2) +/* ECB5F0 802418F0 3C013F00 */ lui $at, 0x3f00 +/* ECB5F4 802418F4 44812000 */ mtc1 $at, $f4 +/* ECB5F8 802418F8 44821000 */ mtc1 $v0, $f2 +/* ECB5FC 802418FC 00000000 */ nop +/* ECB600 80241900 468010A0 */ cvt.s.w $f2, $f2 +/* ECB604 80241904 46041082 */ mul.s $f2, $f2, $f4 +/* ECB608 80241908 00000000 */ nop +/* ECB60C 8024190C 4600E700 */ add.s $f28, $f28, $f0 +/* ECB610 80241910 4602D680 */ add.s $f26, $f26, $f2 +/* ECB614 80241914 0C00AD90 */ jal func_8002B640 +/* ECB618 80241918 4600B306 */ mov.s $f12, $f22 +/* ECB61C 8024191C 46140002 */ mul.s $f0, $f0, $f20 +/* ECB620 80241920 00000000 */ nop +/* ECB624 80241924 0220202D */ daddu $a0, $s1, $zero +/* ECB628 80241928 0260282D */ daddu $a1, $s3, $zero +/* ECB62C 8024192C 4600E18D */ trunc.w.s $f6, $f28 +/* ECB630 80241930 44063000 */ mfc1 $a2, $f6 +/* ECB634 80241934 0C0B551A */ jal func_802D5468 +/* ECB638 80241938 4600C601 */ sub.s $f24, $f24, $f0 +/* ECB63C 8024193C 0220202D */ daddu $a0, $s1, $zero +/* ECB640 80241940 4600D18D */ trunc.w.s $f6, $f26 +/* ECB644 80241944 44063000 */ mfc1 $a2, $f6 +/* ECB648 80241948 0C0B551A */ jal func_802D5468 +/* ECB64C 8024194C 0280282D */ daddu $a1, $s4, $zero +/* ECB650 80241950 0220202D */ daddu $a0, $s1, $zero +/* ECB654 80241954 4600C18D */ trunc.w.s $f6, $f24 +/* ECB658 80241958 44063000 */ mfc1 $a2, $f6 +/* ECB65C 8024195C 0C0B551A */ jal func_802D5468 +/* ECB660 80241960 0200282D */ daddu $a1, $s0, $zero +/* ECB664 80241964 8FBF0024 */ lw $ra, 0x24($sp) +/* ECB668 80241968 8FB40020 */ lw $s4, 0x20($sp) +/* ECB66C 8024196C 8FB3001C */ lw $s3, 0x1c($sp) +/* ECB670 80241970 8FB20018 */ lw $s2, 0x18($sp) +/* ECB674 80241974 8FB10014 */ lw $s1, 0x14($sp) +/* ECB678 80241978 8FB00010 */ lw $s0, 0x10($sp) +/* ECB67C 8024197C D7BC0048 */ ldc1 $f28, 0x48($sp) +/* ECB680 80241980 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* ECB684 80241984 D7B80038 */ ldc1 $f24, 0x38($sp) +/* ECB688 80241988 D7B60030 */ ldc1 $f22, 0x30($sp) +/* ECB68C 8024198C D7B40028 */ ldc1 $f20, 0x28($sp) +/* ECB690 80241990 24020002 */ addiu $v0, $zero, 2 +/* ECB694 80241994 03E00008 */ jr $ra +/* ECB698 80241998 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_ECAA80/func_8024199C_ECB69C.s b/asm/nonmatchings/code_ECAA80/func_8024199C_ECB69C.s new file mode 100644 index 0000000000..0f4733fe2a --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_8024199C_ECB69C.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024199C_ECB69C +/* ECB69C 8024199C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ECB6A0 802419A0 AFBF0010 */ sw $ra, 0x10($sp) +/* ECB6A4 802419A4 10A00003 */ beqz $a1, .L802419B4 +/* ECB6A8 802419A8 8C86000C */ lw $a2, 0xc($a0) +/* ECB6AC 802419AC 3C018024 */ lui $at, %hi(func_802430B8_8B3128) +/* ECB6B0 802419B0 AC2030B8 */ sw $zero, %lo(func_802430B8_8B3128)($at) +.L802419B4: +/* ECB6B4 802419B4 3C038024 */ lui $v1, %hi(func_802430B8_8B3128) +/* ECB6B8 802419B8 246330B8 */ addiu $v1, $v1, %lo(func_802430B8_8B3128) +/* ECB6BC 802419BC 8C620000 */ lw $v0, ($v1) +/* ECB6C0 802419C0 54400003 */ bnel $v0, $zero, .L802419D0 +/* ECB6C4 802419C4 AC600000 */ sw $zero, ($v1) +/* ECB6C8 802419C8 08090679 */ j .L802419E4 +/* ECB6CC 802419CC 0000102D */ daddu $v0, $zero, $zero +.L802419D0: +/* ECB6D0 802419D0 8CC50000 */ lw $a1, ($a2) +/* ECB6D4 802419D4 3C068024 */ lui $a2, %hi(D_802430BC) +/* ECB6D8 802419D8 0C0B551A */ jal func_802D5468 +/* ECB6DC 802419DC 8CC630BC */ lw $a2, %lo(D_802430BC)($a2) +/* ECB6E0 802419E0 24020002 */ addiu $v0, $zero, 2 +.L802419E4: +/* ECB6E4 802419E4 8FBF0010 */ lw $ra, 0x10($sp) +/* ECB6E8 802419E8 03E00008 */ jr $ra +/* ECB6EC 802419EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ECAA80/func_802419F0_ECB6F0.s b/asm/nonmatchings/code_ECAA80/func_802419F0_ECB6F0.s new file mode 100644 index 0000000000..b578a2de49 --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_802419F0_ECB6F0.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419F0_ECB6F0 +/* ECB6F0 802419F0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ECB6F4 802419F4 AFBF0010 */ sw $ra, 0x10($sp) +/* ECB6F8 802419F8 8C82000C */ lw $v0, 0xc($a0) +/* ECB6FC 802419FC 0C0B53A3 */ jal func_802D4E8C +/* ECB700 80241A00 8C450000 */ lw $a1, ($v0) +/* ECB704 80241A04 3C018024 */ lui $at, %hi(D_802430BC) +/* ECB708 80241A08 AC2230BC */ sw $v0, %lo(D_802430BC)($at) +/* ECB70C 80241A0C 24020002 */ addiu $v0, $zero, 2 +/* ECB710 80241A10 8FBF0010 */ lw $ra, 0x10($sp) +/* ECB714 80241A14 24030001 */ addiu $v1, $zero, 1 +/* ECB718 80241A18 3C018024 */ lui $at, %hi(func_802430B8_8B3128) +/* ECB71C 80241A1C AC2330B8 */ sw $v1, %lo(func_802430B8_8B3128)($at) +/* ECB720 80241A20 03E00008 */ jr $ra +/* ECB724 80241A24 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ECAA80/func_80241A28_ECB728.s b/asm/nonmatchings/code_ECAA80/func_80241A28_ECB728.s new file mode 100644 index 0000000000..c34bb073a5 --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_80241A28_ECB728.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A28_ECB728 +/* ECB728 80241A28 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ECB72C 80241A2C AFBF0010 */ sw $ra, 0x10($sp) +/* ECB730 80241A30 8C82000C */ lw $v0, 0xc($a0) +/* ECB734 80241A34 0C0B53A3 */ jal func_802D4E8C +/* ECB738 80241A38 8C450000 */ lw $a1, ($v0) +/* ECB73C 80241A3C 0040182D */ daddu $v1, $v0, $zero +/* ECB740 80241A40 10600012 */ beqz $v1, .L80241A8C +/* ECB744 80241A44 0000202D */ daddu $a0, $zero, $zero +/* ECB748 80241A48 8C620000 */ lw $v0, ($v1) +/* ECB74C 80241A4C 5040000A */ beql $v0, $zero, .L80241A78 +/* ECB750 80241A50 00041080 */ sll $v0, $a0, 2 +/* ECB754 80241A54 3C058024 */ lui $a1, %hi(D_802462F0) +/* ECB758 80241A58 24A562F0 */ addiu $a1, $a1, %lo(D_802462F0) +.L80241A5C: +/* ECB75C 80241A5C 24630004 */ addiu $v1, $v1, 4 +/* ECB760 80241A60 24840001 */ addiu $a0, $a0, 1 +/* ECB764 80241A64 ACA20000 */ sw $v0, ($a1) +/* ECB768 80241A68 8C620000 */ lw $v0, ($v1) +/* ECB76C 80241A6C 1440FFFB */ bnez $v0, .L80241A5C +/* ECB770 80241A70 24A50004 */ addiu $a1, $a1, 4 +/* ECB774 80241A74 00041080 */ sll $v0, $a0, 2 +.L80241A78: +/* ECB778 80241A78 3C018024 */ lui $at, %hi(D_802462F0) +/* ECB77C 80241A7C 00220821 */ addu $at, $at, $v0 +/* ECB780 80241A80 AC2062F0 */ sw $zero, %lo(D_802462F0)($at) +/* ECB784 80241A84 080906AD */ j .L80241AB4 +/* ECB788 80241A88 00000000 */ nop +.L80241A8C: +/* ECB78C 80241A8C 3C038024 */ lui $v1, %hi(D_802462F0) +/* ECB790 80241A90 246362F0 */ addiu $v1, $v1, %lo(D_802462F0) +/* ECB794 80241A94 0060282D */ daddu $a1, $v1, $zero +.L80241A98: +/* ECB798 80241A98 24820080 */ addiu $v0, $a0, 0x80 +/* ECB79C 80241A9C AC620000 */ sw $v0, ($v1) +/* ECB7A0 80241AA0 24630004 */ addiu $v1, $v1, 4 +/* ECB7A4 80241AA4 24840001 */ addiu $a0, $a0, 1 +/* ECB7A8 80241AA8 2882005B */ slti $v0, $a0, 0x5b +/* ECB7AC 80241AAC 1440FFFA */ bnez $v0, .L80241A98 +/* ECB7B0 80241AB0 ACA0016C */ sw $zero, 0x16c($a1) +.L80241AB4: +/* ECB7B4 80241AB4 8FBF0010 */ lw $ra, 0x10($sp) +/* ECB7B8 80241AB8 24020002 */ addiu $v0, $zero, 2 +/* ECB7BC 80241ABC 03E00008 */ jr $ra +/* ECB7C0 80241AC0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ECAA80/func_80241AC4_ECB7C4.s b/asm/nonmatchings/code_ECAA80/func_80241AC4_ECB7C4.s new file mode 100644 index 0000000000..3fbefdb854 --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_80241AC4_ECB7C4.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AC4_ECB7C4 +/* ECB7C4 80241AC4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* ECB7C8 80241AC8 AFB10014 */ sw $s1, 0x14($sp) +/* ECB7CC 80241ACC 0080882D */ daddu $s1, $a0, $zero +/* ECB7D0 80241AD0 AFBF0020 */ sw $ra, 0x20($sp) +/* ECB7D4 80241AD4 AFB3001C */ sw $s3, 0x1c($sp) +/* ECB7D8 80241AD8 AFB20018 */ sw $s2, 0x18($sp) +/* ECB7DC 80241ADC AFB00010 */ sw $s0, 0x10($sp) +/* ECB7E0 80241AE0 8E30000C */ lw $s0, 0xc($s1) +/* ECB7E4 80241AE4 8E050000 */ lw $a1, ($s0) +/* ECB7E8 80241AE8 0C0B53A3 */ jal func_802D4E8C +/* ECB7EC 80241AEC 26100004 */ addiu $s0, $s0, 4 +/* ECB7F0 80241AF0 8E050000 */ lw $a1, ($s0) +/* ECB7F4 80241AF4 26100004 */ addiu $s0, $s0, 4 +/* ECB7F8 80241AF8 0220202D */ daddu $a0, $s1, $zero +/* ECB7FC 80241AFC 0C0B53A3 */ jal func_802D4E8C +/* ECB800 80241B00 0040982D */ daddu $s3, $v0, $zero +/* ECB804 80241B04 8E050000 */ lw $a1, ($s0) +/* ECB808 80241B08 26100004 */ addiu $s0, $s0, 4 +/* ECB80C 80241B0C 0220202D */ daddu $a0, $s1, $zero +/* ECB810 80241B10 0C0B53A3 */ jal func_802D4E8C +/* ECB814 80241B14 0040902D */ daddu $s2, $v0, $zero +/* ECB818 80241B18 0220202D */ daddu $a0, $s1, $zero +/* ECB81C 80241B1C 8E050000 */ lw $a1, ($s0) +/* ECB820 80241B20 0C0B53A3 */ jal func_802D4E8C +/* ECB824 80241B24 0040882D */ daddu $s1, $v0, $zero +/* ECB828 80241B28 0260202D */ daddu $a0, $s3, $zero +/* ECB82C 80241B2C 0C04F3E6 */ jal func_8013CF98 +/* ECB830 80241B30 0040802D */ daddu $s0, $v0, $zero +/* ECB834 80241B34 0040182D */ daddu $v1, $v0, $zero +/* ECB838 80241B38 44920000 */ mtc1 $s2, $f0 +/* ECB83C 80241B3C 00000000 */ nop +/* ECB840 80241B40 46800020 */ cvt.s.w $f0, $f0 +/* ECB844 80241B44 E4600008 */ swc1 $f0, 8($v1) +/* ECB848 80241B48 44910000 */ mtc1 $s1, $f0 +/* ECB84C 80241B4C 00000000 */ nop +/* ECB850 80241B50 46800020 */ cvt.s.w $f0, $f0 +/* ECB854 80241B54 E460000C */ swc1 $f0, 0xc($v1) +/* ECB858 80241B58 44900000 */ mtc1 $s0, $f0 +/* ECB85C 80241B5C 00000000 */ nop +/* ECB860 80241B60 46800020 */ cvt.s.w $f0, $f0 +/* ECB864 80241B64 E4600010 */ swc1 $f0, 0x10($v1) +/* ECB868 80241B68 8FBF0020 */ lw $ra, 0x20($sp) +/* ECB86C 80241B6C 8FB3001C */ lw $s3, 0x1c($sp) +/* ECB870 80241B70 8FB20018 */ lw $s2, 0x18($sp) +/* ECB874 80241B74 8FB10014 */ lw $s1, 0x14($sp) +/* ECB878 80241B78 8FB00010 */ lw $s0, 0x10($sp) +/* ECB87C 80241B7C 24020002 */ addiu $v0, $zero, 2 +/* ECB880 80241B80 03E00008 */ jr $ra +/* ECB884 80241B84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_ECAA80/func_80241B88_ECB888.s b/asm/nonmatchings/code_ECAA80/func_80241B88_ECB888.s new file mode 100644 index 0000000000..d84da767f3 --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_80241B88_ECB888.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B88_ECB888 +/* ECB888 80241B88 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ECB88C 80241B8C AFB00010 */ sw $s0, 0x10($sp) +/* ECB890 80241B90 0080802D */ daddu $s0, $a0, $zero +/* ECB894 80241B94 AFBF0014 */ sw $ra, 0x14($sp) +/* ECB898 80241B98 8E02000C */ lw $v0, 0xc($s0) +/* ECB89C 80241B9C 0C0B53A3 */ jal func_802D4E8C +/* ECB8A0 80241BA0 8C450000 */ lw $a1, ($v0) +/* ECB8A4 80241BA4 3C048009 */ lui $a0, %hi(D_8008D2C0) +/* ECB8A8 80241BA8 2484D2C0 */ addiu $a0, $a0, %lo(D_8008D2C0) +/* ECB8AC 80241BAC 00021940 */ sll $v1, $v0, 5 +/* ECB8B0 80241BB0 00642021 */ addu $a0, $v1, $a0 +/* ECB8B4 80241BB4 240300BB */ addiu $v1, $zero, 0xbb +/* ECB8B8 80241BB8 14430003 */ bne $v0, $v1, .L80241BC8 +/* ECB8BC 80241BBC 24020002 */ addiu $v0, $zero, 2 +/* ECB8C0 80241BC0 080906F9 */ j .L80241BE4 +/* ECB8C4 80241BC4 AE0200A8 */ sw $v0, 0xa8($s0) +.L80241BC8: +/* ECB8C8 80241BC8 94820018 */ lhu $v0, 0x18($a0) +/* ECB8CC 80241BCC 30420080 */ andi $v0, $v0, 0x80 +/* ECB8D0 80241BD0 10400003 */ beqz $v0, .L80241BE0 +/* ECB8D4 80241BD4 24020001 */ addiu $v0, $zero, 1 +/* ECB8D8 80241BD8 080906F9 */ j .L80241BE4 +/* ECB8DC 80241BDC AE0200A8 */ sw $v0, 0xa8($s0) +.L80241BE0: +/* ECB8E0 80241BE0 AE0000A8 */ sw $zero, 0xa8($s0) +.L80241BE4: +/* ECB8E4 80241BE4 8FBF0014 */ lw $ra, 0x14($sp) +/* ECB8E8 80241BE8 8FB00010 */ lw $s0, 0x10($sp) +/* ECB8EC 80241BEC 24020002 */ addiu $v0, $zero, 2 +/* ECB8F0 80241BF0 03E00008 */ jr $ra +/* ECB8F4 80241BF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ECAA80/func_80241BF8_ECB8F8.s b/asm/nonmatchings/code_ECAA80/func_80241BF8_ECB8F8.s new file mode 100644 index 0000000000..d7ead90b79 --- /dev/null +++ b/asm/nonmatchings/code_ECAA80/func_80241BF8_ECB8F8.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BF8_ECB8F8 +/* ECB8F8 80241BF8 2404005A */ addiu $a0, $zero, 0x5a +/* ECB8FC 80241BFC 3C038024 */ lui $v1, %hi(D_802465C8) +/* ECB900 80241C00 246365C8 */ addiu $v1, $v1, %lo(D_802465C8) +/* ECB904 80241C04 240200DA */ addiu $v0, $zero, 0xda +.L80241C08: +/* ECB908 80241C08 AC620000 */ sw $v0, ($v1) +/* ECB90C 80241C0C 2463FFFC */ addiu $v1, $v1, -4 +/* ECB910 80241C10 2484FFFF */ addiu $a0, $a0, -1 +/* ECB914 80241C14 0481FFFC */ bgez $a0, .L80241C08 +/* ECB918 80241C18 2442FFFF */ addiu $v0, $v0, -1 +/* ECB91C 80241C1C 3C018024 */ lui $at, %hi(D_802465CC) +/* ECB920 80241C20 AC2065CC */ sw $zero, %lo(D_802465CC)($at) +/* ECB924 80241C24 03E00008 */ jr $ra +/* ECB928 80241C28 24020002 */ addiu $v0, $zero, 2 +/* ECB92C 80241C2C 00000000 */ nop diff --git a/asm/nonmatchings/code_ECB930/func_80241C30_ECB930.s b/asm/nonmatchings/code_ECB930/func_80241C30_ECB930.s new file mode 100644 index 0000000000..69f9d71bf4 --- /dev/null +++ b/asm/nonmatchings/code_ECB930/func_80241C30_ECB930.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C30_ECB930 +/* ECB930 80241C30 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* ECB934 80241C34 F7B40018 */ sdc1 $f20, 0x18($sp) +/* ECB938 80241C38 4485A000 */ mtc1 $a1, $f20 +/* ECB93C 80241C3C F7B60020 */ sdc1 $f22, 0x20($sp) +/* ECB940 80241C40 4486B000 */ mtc1 $a2, $f22 +/* ECB944 80241C44 AFB00010 */ sw $s0, 0x10($sp) +/* ECB948 80241C48 F7B80028 */ sdc1 $f24, 0x28($sp) +/* ECB94C 80241C4C 4487C000 */ mtc1 $a3, $f24 +/* ECB950 80241C50 AFBF0014 */ sw $ra, 0x14($sp) +/* ECB954 80241C54 0C01B198 */ jal osGetCause +/* ECB958 80241C58 0080802D */ daddu $s0, $a0, $zero +/* ECB95C 80241C5C 4616A582 */ mul.s $f22, $f20, $f22 +/* ECB960 80241C60 00000000 */ nop +/* ECB964 80241C64 4618A502 */ mul.s $f20, $f20, $f24 +/* ECB968 80241C68 00000000 */ nop +/* ECB96C 80241C6C 3C013F80 */ lui $at, 0x3f80 +/* ECB970 80241C70 44810000 */ mtc1 $at, $f0 +/* ECB974 80241C74 00000000 */ nop +/* ECB978 80241C78 E6000014 */ swc1 $f0, 0x14($s0) +/* ECB97C 80241C7C E6160010 */ swc1 $f22, 0x10($s0) +/* ECB980 80241C80 E6140018 */ swc1 $f20, 0x18($s0) +/* ECB984 80241C84 8FBF0014 */ lw $ra, 0x14($sp) +/* ECB988 80241C88 8FB00010 */ lw $s0, 0x10($sp) +/* ECB98C 80241C8C D7B80028 */ ldc1 $f24, 0x28($sp) +/* ECB990 80241C90 D7B60020 */ ldc1 $f22, 0x20($sp) +/* ECB994 80241C94 D7B40018 */ ldc1 $f20, 0x18($sp) +/* ECB998 80241C98 03E00008 */ jr $ra +/* ECB99C 80241C9C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_ECB930/func_80241CA0_ECB9A0.s b/asm/nonmatchings/code_ECB930/func_80241CA0_ECB9A0.s new file mode 100644 index 0000000000..bf5aea9ef1 --- /dev/null +++ b/asm/nonmatchings/code_ECB930/func_80241CA0_ECB9A0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CA0_ECB9A0 +/* ECB9A0 80241CA0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* ECB9A4 80241CA4 AFB10054 */ sw $s1, 0x54($sp) +/* ECB9A8 80241CA8 0080882D */ daddu $s1, $a0, $zero +/* ECB9AC 80241CAC AFBF005C */ sw $ra, 0x5c($sp) +/* ECB9B0 80241CB0 AFB20058 */ sw $s2, 0x58($sp) +/* ECB9B4 80241CB4 AFB00050 */ sw $s0, 0x50($sp) +/* ECB9B8 80241CB8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* ECB9BC 80241CBC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* ECB9C0 80241CC0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* ECB9C4 80241CC4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* ECB9C8 80241CC8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* ECB9CC 80241CCC 8E30000C */ lw $s0, 0xc($s1) +/* ECB9D0 80241CD0 8E050000 */ lw $a1, ($s0) +/* ECB9D4 80241CD4 0C0B53A3 */ jal func_802D4E8C +/* ECB9D8 80241CD8 26100004 */ addiu $s0, $s0, 4 +/* ECB9DC 80241CDC 0C04949C */ jal func_80125270 +/* ECB9E0 80241CE0 0040202D */ daddu $a0, $v0, $zero +/* ECB9E4 80241CE4 8E050000 */ lw $a1, ($s0) +/* ECB9E8 80241CE8 26100004 */ addiu $s0, $s0, 4 +/* ECB9EC 80241CEC 0220202D */ daddu $a0, $s1, $zero +/* ECB9F0 80241CF0 0C0B55FF */ jal func_802D57FC +/* ECB9F4 80241CF4 0040902D */ daddu $s2, $v0, $zero +/* ECB9F8 80241CF8 8E050000 */ lw $a1, ($s0) +/* ECB9FC 80241CFC 26100004 */ addiu $s0, $s0, 4 +/* ECBA00 80241D00 0220202D */ daddu $a0, $s1, $zero +/* ECBA04 80241D04 0C0B55FF */ jal func_802D57FC +/* ECBA08 80241D08 46000706 */ mov.s $f28, $f0 +/* ECBA0C 80241D0C 8E050000 */ lw $a1, ($s0) +/* ECBA10 80241D10 26100004 */ addiu $s0, $s0, 4 +/* ECBA14 80241D14 0220202D */ daddu $a0, $s1, $zero +/* ECBA18 80241D18 0C0B55FF */ jal func_802D57FC +/* ECBA1C 80241D1C 46000686 */ mov.s $f26, $f0 +/* ECBA20 80241D20 0220202D */ daddu $a0, $s1, $zero +/* ECBA24 80241D24 8E050000 */ lw $a1, ($s0) +/* ECBA28 80241D28 0C0B55FF */ jal func_802D57FC +/* ECBA2C 80241D2C 46000586 */ mov.s $f22, $f0 +/* ECBA30 80241D30 0240202D */ daddu $a0, $s2, $zero +/* ECBA34 80241D34 0C0493D1 */ jal func_80124F44 +/* ECBA38 80241D38 46000606 */ mov.s $f24, $f0 +/* ECBA3C 80241D3C 0040882D */ daddu $s1, $v0, $zero +/* ECBA40 80241D40 96220000 */ lhu $v0, ($s1) +/* ECBA44 80241D44 30420400 */ andi $v0, $v0, 0x400 +/* ECBA48 80241D48 1440001E */ bnez $v0, .L80241DC4 +/* ECBA4C 80241D4C 26300058 */ addiu $s0, $s1, 0x58 +/* ECBA50 80241D50 4480A000 */ mtc1 $zero, $f20 +/* ECBA54 80241D54 4406B000 */ mfc1 $a2, $f22 +/* ECBA58 80241D58 4405A000 */ mfc1 $a1, $f20 +/* ECBA5C 80241D5C 4407A000 */ mfc1 $a3, $f20 +/* ECBA60 80241D60 0C01B2B0 */ jal func_8006CAC0 +/* ECBA64 80241D64 0200202D */ daddu $a0, $s0, $zero +/* ECBA68 80241D68 4405E000 */ mfc1 $a1, $f28 +/* ECBA6C 80241D6C 4406D000 */ mfc1 $a2, $f26 +/* ECBA70 80241D70 4407C000 */ mfc1 $a3, $f24 +/* ECBA74 80241D74 0C09070C */ jal func_80241C30_ECB930 +/* ECBA78 80241D78 27A40010 */ addiu $a0, $sp, 0x10 +/* ECBA7C 80241D7C 27A40010 */ addiu $a0, $sp, 0x10 +/* ECBA80 80241D80 0200282D */ daddu $a1, $s0, $zero +/* ECBA84 80241D84 0C01B1F0 */ jal osSiRawReadIo +/* ECBA88 80241D88 0200302D */ daddu $a2, $s0, $zero +/* ECBA8C 80241D8C 27A40010 */ addiu $a0, $sp, 0x10 +/* ECBA90 80241D90 4600B587 */ neg.s $f22, $f22 +/* ECBA94 80241D94 4405A000 */ mfc1 $a1, $f20 +/* ECBA98 80241D98 4406B000 */ mfc1 $a2, $f22 +/* ECBA9C 80241D9C 0C01B2B0 */ jal func_8006CAC0 +/* ECBAA0 80241DA0 00A0382D */ daddu $a3, $a1, $zero +/* ECBAA4 80241DA4 27A40010 */ addiu $a0, $sp, 0x10 +/* ECBAA8 80241DA8 0200282D */ daddu $a1, $s0, $zero +/* ECBAAC 80241DAC 0C01B1F0 */ jal osSiRawReadIo +/* ECBAB0 80241DB0 00A0302D */ daddu $a2, $a1, $zero +/* ECBAB4 80241DB4 96220000 */ lhu $v0, ($s1) +/* ECBAB8 80241DB8 34421400 */ ori $v0, $v0, 0x1400 +/* ECBABC 80241DBC 0809078F */ j .L80241E3C +/* ECBAC0 80241DC0 A6220000 */ sh $v0, ($s1) +.L80241DC4: +/* ECBAC4 80241DC4 4480A000 */ mtc1 $zero, $f20 +/* ECBAC8 80241DC8 4406B000 */ mfc1 $a2, $f22 +/* ECBACC 80241DCC 4405A000 */ mfc1 $a1, $f20 +/* ECBAD0 80241DD0 4407A000 */ mfc1 $a3, $f20 +/* ECBAD4 80241DD4 0C01B2B0 */ jal func_8006CAC0 +/* ECBAD8 80241DD8 27A40010 */ addiu $a0, $sp, 0x10 +/* ECBADC 80241DDC 27A40010 */ addiu $a0, $sp, 0x10 +/* ECBAE0 80241DE0 26300058 */ addiu $s0, $s1, 0x58 +/* ECBAE4 80241DE4 0200282D */ daddu $a1, $s0, $zero +/* ECBAE8 80241DE8 0C01B1F0 */ jal osSiRawReadIo +/* ECBAEC 80241DEC 0200302D */ daddu $a2, $s0, $zero +/* ECBAF0 80241DF0 4405E000 */ mfc1 $a1, $f28 +/* ECBAF4 80241DF4 4406D000 */ mfc1 $a2, $f26 +/* ECBAF8 80241DF8 4407C000 */ mfc1 $a3, $f24 +/* ECBAFC 80241DFC 0C09070C */ jal func_80241C30_ECB930 +/* ECBB00 80241E00 27A40010 */ addiu $a0, $sp, 0x10 +/* ECBB04 80241E04 27A40010 */ addiu $a0, $sp, 0x10 +/* ECBB08 80241E08 0200282D */ daddu $a1, $s0, $zero +/* ECBB0C 80241E0C 0C01B1F0 */ jal osSiRawReadIo +/* ECBB10 80241E10 0200302D */ daddu $a2, $s0, $zero +/* ECBB14 80241E14 27A40010 */ addiu $a0, $sp, 0x10 +/* ECBB18 80241E18 4600B587 */ neg.s $f22, $f22 +/* ECBB1C 80241E1C 4405A000 */ mfc1 $a1, $f20 +/* ECBB20 80241E20 4406B000 */ mfc1 $a2, $f22 +/* ECBB24 80241E24 0C01B2B0 */ jal func_8006CAC0 +/* ECBB28 80241E28 00A0382D */ daddu $a3, $a1, $zero +/* ECBB2C 80241E2C 27A40010 */ addiu $a0, $sp, 0x10 +/* ECBB30 80241E30 0200282D */ daddu $a1, $s0, $zero +/* ECBB34 80241E34 0C01B1F0 */ jal osSiRawReadIo +/* ECBB38 80241E38 00A0302D */ daddu $a2, $a1, $zero +.L80241E3C: +/* ECBB3C 80241E3C 8FBF005C */ lw $ra, 0x5c($sp) +/* ECBB40 80241E40 8FB20058 */ lw $s2, 0x58($sp) +/* ECBB44 80241E44 8FB10054 */ lw $s1, 0x54($sp) +/* ECBB48 80241E48 8FB00050 */ lw $s0, 0x50($sp) +/* ECBB4C 80241E4C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* ECBB50 80241E50 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* ECBB54 80241E54 D7B80070 */ ldc1 $f24, 0x70($sp) +/* ECBB58 80241E58 D7B60068 */ ldc1 $f22, 0x68($sp) +/* ECBB5C 80241E5C D7B40060 */ ldc1 $f20, 0x60($sp) +/* ECBB60 80241E60 24020002 */ addiu $v0, $zero, 2 +/* ECBB64 80241E64 03E00008 */ jr $ra +/* ECBB68 80241E68 27BD0088 */ addiu $sp, $sp, 0x88 +/* ECBB6C 80241E6C 00000000 */ nop diff --git a/asm/nonmatchings/code_ECBB70/func_80241E70_ECBB70.s b/asm/nonmatchings/code_ECBB70/func_80241E70_ECBB70.s new file mode 100644 index 0000000000..8a19a263bd --- /dev/null +++ b/asm/nonmatchings/code_ECBB70/func_80241E70_ECBB70.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E70_ECBB70 +/* ECBB70 80241E70 8C820084 */ lw $v0, 0x84($a0) +/* ECBB74 80241E74 8C830090 */ lw $v1, 0x90($a0) +/* ECBB78 80241E78 00431023 */ subu $v0, $v0, $v1 +/* ECBB7C 80241E7C 44821000 */ mtc1 $v0, $f2 +/* ECBB80 80241E80 00000000 */ nop +/* ECBB84 80241E84 468010A0 */ cvt.s.w $f2, $f2 +/* ECBB88 80241E88 8C820088 */ lw $v0, 0x88($a0) +/* ECBB8C 80241E8C 8C830094 */ lw $v1, 0x94($a0) +/* ECBB90 80241E90 46021082 */ mul.s $f2, $f2, $f2 +/* ECBB94 80241E94 00000000 */ nop +/* ECBB98 80241E98 00431023 */ subu $v0, $v0, $v1 +/* ECBB9C 80241E9C 44822000 */ mtc1 $v0, $f4 +/* ECBBA0 80241EA0 00000000 */ nop +/* ECBBA4 80241EA4 46802120 */ cvt.s.w $f4, $f4 +/* ECBBA8 80241EA8 8C82008C */ lw $v0, 0x8c($a0) +/* ECBBAC 80241EAC 46042102 */ mul.s $f4, $f4, $f4 +/* ECBBB0 80241EB0 00000000 */ nop +/* ECBBB4 80241EB4 8C830098 */ lw $v1, 0x98($a0) +/* ECBBB8 80241EB8 00431023 */ subu $v0, $v0, $v1 +/* ECBBBC 80241EBC 44820000 */ mtc1 $v0, $f0 +/* ECBBC0 80241EC0 00000000 */ nop +/* ECBBC4 80241EC4 46800020 */ cvt.s.w $f0, $f0 +/* ECBBC8 80241EC8 46000002 */ mul.s $f0, $f0, $f0 +/* ECBBCC 80241ECC 00000000 */ nop +/* ECBBD0 80241ED0 46041080 */ add.s $f2, $f2, $f4 +/* ECBBD4 80241ED4 46001080 */ add.s $f2, $f2, $f0 +/* ECBBD8 80241ED8 3C014561 */ lui $at, 0x4561 +/* ECBBDC 80241EDC 44810000 */ mtc1 $at, $f0 +/* ECBBE0 80241EE0 00000000 */ nop +/* ECBBE4 80241EE4 4600103C */ c.lt.s $f2, $f0 +/* ECBBE8 80241EE8 00000000 */ nop +/* ECBBEC 80241EEC 45010002 */ bc1t .L80241EF8 +/* ECBBF0 80241EF0 24020001 */ addiu $v0, $zero, 1 +/* ECBBF4 80241EF4 0000102D */ daddu $v0, $zero, $zero +.L80241EF8: +/* ECBBF8 80241EF8 AC820084 */ sw $v0, 0x84($a0) +/* ECBBFC 80241EFC 03E00008 */ jr $ra +/* ECBC00 80241F00 24020002 */ addiu $v0, $zero, 2 +/* ECBC04 80241F04 00000000 */ nop +/* ECBC08 80241F08 00000000 */ nop +/* ECBC0C 80241F0C 00000000 */ nop diff --git a/asm/nonmatchings/code_ECFFF0/func_80240000_ECFFF0.s b/asm/nonmatchings/code_ECFFF0/func_80240000_ECFFF0.s new file mode 100644 index 0000000000..83e0ec1f1b --- /dev/null +++ b/asm/nonmatchings/code_ECFFF0/func_80240000_ECFFF0.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_ECFFF0 +/* ECFFF0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ECFFF4 80240004 24040001 */ addiu $a0, $zero, 1 +/* ECFFF8 80240008 0000282D */ daddu $a1, $zero, $zero +/* ECFFFC 8024000C 00A0302D */ daddu $a2, $a1, $zero +/* ED0000 80240010 00A0382D */ daddu $a3, $a1, $zero +/* ED0004 80240014 AFBF0018 */ sw $ra, 0x18($sp) +/* ED0008 80240018 AFA00010 */ sw $zero, 0x10($sp) +/* ED000C 8024001C 0C01DEF4 */ jal func_80077BD0 +/* ED0010 80240020 AFA00014 */ sw $zero, 0x14($sp) +/* ED0014 80240024 8FBF0018 */ lw $ra, 0x18($sp) +/* ED0018 80240028 24020002 */ addiu $v0, $zero, 2 +/* ED001C 8024002C 03E00008 */ jr $ra +/* ED0020 80240030 27BD0020 */ addiu $sp, $sp, 0x20 +/* ED0024 80240034 00000000 */ nop +/* ED0028 80240038 00000000 */ nop +/* ED002C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED0030/func_80240040_ED0030.s b/asm/nonmatchings/code_ED0030/func_80240040_ED0030.s new file mode 100644 index 0000000000..0ce6494a1b --- /dev/null +++ b/asm/nonmatchings/code_ED0030/func_80240040_ED0030.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240040_ED0030 +/* ED0030 80240040 8C820084 */ lw $v0, 0x84($a0) +/* ED0034 80240044 8C830090 */ lw $v1, 0x90($a0) +/* ED0038 80240048 00431023 */ subu $v0, $v0, $v1 +/* ED003C 8024004C 44821000 */ mtc1 $v0, $f2 +/* ED0040 80240050 00000000 */ nop +/* ED0044 80240054 468010A0 */ cvt.s.w $f2, $f2 +/* ED0048 80240058 8C820088 */ lw $v0, 0x88($a0) +/* ED004C 8024005C 8C830094 */ lw $v1, 0x94($a0) +/* ED0050 80240060 46021082 */ mul.s $f2, $f2, $f2 +/* ED0054 80240064 00000000 */ nop +/* ED0058 80240068 00431023 */ subu $v0, $v0, $v1 +/* ED005C 8024006C 44822000 */ mtc1 $v0, $f4 +/* ED0060 80240070 00000000 */ nop +/* ED0064 80240074 46802120 */ cvt.s.w $f4, $f4 +/* ED0068 80240078 8C82008C */ lw $v0, 0x8c($a0) +/* ED006C 8024007C 46042102 */ mul.s $f4, $f4, $f4 +/* ED0070 80240080 00000000 */ nop +/* ED0074 80240084 8C830098 */ lw $v1, 0x98($a0) +/* ED0078 80240088 00431023 */ subu $v0, $v0, $v1 +/* ED007C 8024008C 44820000 */ mtc1 $v0, $f0 +/* ED0080 80240090 00000000 */ nop +/* ED0084 80240094 46800020 */ cvt.s.w $f0, $f0 +/* ED0088 80240098 46000002 */ mul.s $f0, $f0, $f0 +/* ED008C 8024009C 00000000 */ nop +/* ED0090 802400A0 46041080 */ add.s $f2, $f2, $f4 +/* ED0094 802400A4 46001080 */ add.s $f2, $f2, $f0 +/* ED0098 802400A8 3C014561 */ lui $at, 0x4561 +/* ED009C 802400AC 44810000 */ mtc1 $at, $f0 +/* ED00A0 802400B0 00000000 */ nop +/* ED00A4 802400B4 4600103C */ c.lt.s $f2, $f0 +/* ED00A8 802400B8 00000000 */ nop +/* ED00AC 802400BC 45010002 */ bc1t .L802400C8 +/* ED00B0 802400C0 24020001 */ addiu $v0, $zero, 1 +/* ED00B4 802400C4 0000102D */ daddu $v0, $zero, $zero +.L802400C8: +/* ED00B8 802400C8 AC820084 */ sw $v0, 0x84($a0) +/* ED00BC 802400CC 03E00008 */ jr $ra +/* ED00C0 802400D0 24020002 */ addiu $v0, $zero, 2 +/* ED00C4 802400D4 00000000 */ nop +/* ED00C8 802400D8 00000000 */ nop +/* ED00CC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/code_ED00D0/func_802400E0_ED00D0.s b/asm/nonmatchings/code_ED00D0/func_802400E0_ED00D0.s new file mode 100644 index 0000000000..997fc8c92a --- /dev/null +++ b/asm/nonmatchings/code_ED00D0/func_802400E0_ED00D0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400E0_ED00D0 +/* ED00D0 802400E0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* ED00D4 802400E4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* ED00D8 802400E8 4485A000 */ mtc1 $a1, $f20 +/* ED00DC 802400EC F7B60020 */ sdc1 $f22, 0x20($sp) +/* ED00E0 802400F0 4486B000 */ mtc1 $a2, $f22 +/* ED00E4 802400F4 AFB00010 */ sw $s0, 0x10($sp) +/* ED00E8 802400F8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* ED00EC 802400FC 4487C000 */ mtc1 $a3, $f24 +/* ED00F0 80240100 AFBF0014 */ sw $ra, 0x14($sp) +/* ED00F4 80240104 0C01B198 */ jal osGetCause +/* ED00F8 80240108 0080802D */ daddu $s0, $a0, $zero +/* ED00FC 8024010C 4616A582 */ mul.s $f22, $f20, $f22 +/* ED0100 80240110 00000000 */ nop +/* ED0104 80240114 4618A502 */ mul.s $f20, $f20, $f24 +/* ED0108 80240118 00000000 */ nop +/* ED010C 8024011C 3C013F80 */ lui $at, 0x3f80 +/* ED0110 80240120 44810000 */ mtc1 $at, $f0 +/* ED0114 80240124 00000000 */ nop +/* ED0118 80240128 E6000014 */ swc1 $f0, 0x14($s0) +/* ED011C 8024012C E6160010 */ swc1 $f22, 0x10($s0) +/* ED0120 80240130 E6140018 */ swc1 $f20, 0x18($s0) +/* ED0124 80240134 8FBF0014 */ lw $ra, 0x14($sp) +/* ED0128 80240138 8FB00010 */ lw $s0, 0x10($sp) +/* ED012C 8024013C D7B80028 */ ldc1 $f24, 0x28($sp) +/* ED0130 80240140 D7B60020 */ ldc1 $f22, 0x20($sp) +/* ED0134 80240144 D7B40018 */ ldc1 $f20, 0x18($sp) +/* ED0138 80240148 03E00008 */ jr $ra +/* ED013C 8024014C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_ED00D0/func_80240150_ED0140.s b/asm/nonmatchings/code_ED00D0/func_80240150_ED0140.s new file mode 100644 index 0000000000..14da34a28d --- /dev/null +++ b/asm/nonmatchings/code_ED00D0/func_80240150_ED0140.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240150_ED0140 +/* ED0140 80240150 27BDFF78 */ addiu $sp, $sp, -0x88 +/* ED0144 80240154 AFB10054 */ sw $s1, 0x54($sp) +/* ED0148 80240158 0080882D */ daddu $s1, $a0, $zero +/* ED014C 8024015C AFBF005C */ sw $ra, 0x5c($sp) +/* ED0150 80240160 AFB20058 */ sw $s2, 0x58($sp) +/* ED0154 80240164 AFB00050 */ sw $s0, 0x50($sp) +/* ED0158 80240168 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* ED015C 8024016C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* ED0160 80240170 F7B80070 */ sdc1 $f24, 0x70($sp) +/* ED0164 80240174 F7B60068 */ sdc1 $f22, 0x68($sp) +/* ED0168 80240178 F7B40060 */ sdc1 $f20, 0x60($sp) +/* ED016C 8024017C 8E30000C */ lw $s0, 0xc($s1) +/* ED0170 80240180 8E050000 */ lw $a1, ($s0) +/* ED0174 80240184 0C0B53A3 */ jal func_802D4E8C +/* ED0178 80240188 26100004 */ addiu $s0, $s0, 4 +/* ED017C 8024018C 0C04949C */ jal func_80125270 +/* ED0180 80240190 0040202D */ daddu $a0, $v0, $zero +/* ED0184 80240194 8E050000 */ lw $a1, ($s0) +/* ED0188 80240198 26100004 */ addiu $s0, $s0, 4 +/* ED018C 8024019C 0220202D */ daddu $a0, $s1, $zero +/* ED0190 802401A0 0C0B55FF */ jal func_802D57FC +/* ED0194 802401A4 0040902D */ daddu $s2, $v0, $zero +/* ED0198 802401A8 8E050000 */ lw $a1, ($s0) +/* ED019C 802401AC 26100004 */ addiu $s0, $s0, 4 +/* ED01A0 802401B0 0220202D */ daddu $a0, $s1, $zero +/* ED01A4 802401B4 0C0B55FF */ jal func_802D57FC +/* ED01A8 802401B8 46000706 */ mov.s $f28, $f0 +/* ED01AC 802401BC 8E050000 */ lw $a1, ($s0) +/* ED01B0 802401C0 26100004 */ addiu $s0, $s0, 4 +/* ED01B4 802401C4 0220202D */ daddu $a0, $s1, $zero +/* ED01B8 802401C8 0C0B55FF */ jal func_802D57FC +/* ED01BC 802401CC 46000686 */ mov.s $f26, $f0 +/* ED01C0 802401D0 0220202D */ daddu $a0, $s1, $zero +/* ED01C4 802401D4 8E050000 */ lw $a1, ($s0) +/* ED01C8 802401D8 0C0B55FF */ jal func_802D57FC +/* ED01CC 802401DC 46000586 */ mov.s $f22, $f0 +/* ED01D0 802401E0 0240202D */ daddu $a0, $s2, $zero +/* ED01D4 802401E4 0C0493D1 */ jal func_80124F44 +/* ED01D8 802401E8 46000606 */ mov.s $f24, $f0 +/* ED01DC 802401EC 0040882D */ daddu $s1, $v0, $zero +/* ED01E0 802401F0 96220000 */ lhu $v0, ($s1) +/* ED01E4 802401F4 30420400 */ andi $v0, $v0, 0x400 +/* ED01E8 802401F8 1440001E */ bnez $v0, .L80240274 +/* ED01EC 802401FC 26300058 */ addiu $s0, $s1, 0x58 +/* ED01F0 80240200 4480A000 */ mtc1 $zero, $f20 +/* ED01F4 80240204 4406B000 */ mfc1 $a2, $f22 +/* ED01F8 80240208 4405A000 */ mfc1 $a1, $f20 +/* ED01FC 8024020C 4407A000 */ mfc1 $a3, $f20 +/* ED0200 80240210 0C01B2B0 */ jal func_8006CAC0 +/* ED0204 80240214 0200202D */ daddu $a0, $s0, $zero +/* ED0208 80240218 4405E000 */ mfc1 $a1, $f28 +/* ED020C 8024021C 4406D000 */ mfc1 $a2, $f26 +/* ED0210 80240220 4407C000 */ mfc1 $a3, $f24 +/* ED0214 80240224 0C090038 */ jal func_802400E0_ED00D0 +/* ED0218 80240228 27A40010 */ addiu $a0, $sp, 0x10 +/* ED021C 8024022C 27A40010 */ addiu $a0, $sp, 0x10 +/* ED0220 80240230 0200282D */ daddu $a1, $s0, $zero +/* ED0224 80240234 0C01B1F0 */ jal osSiRawReadIo +/* ED0228 80240238 0200302D */ daddu $a2, $s0, $zero +/* ED022C 8024023C 27A40010 */ addiu $a0, $sp, 0x10 +/* ED0230 80240240 4600B587 */ neg.s $f22, $f22 +/* ED0234 80240244 4405A000 */ mfc1 $a1, $f20 +/* ED0238 80240248 4406B000 */ mfc1 $a2, $f22 +/* ED023C 8024024C 0C01B2B0 */ jal func_8006CAC0 +/* ED0240 80240250 00A0382D */ daddu $a3, $a1, $zero +/* ED0244 80240254 27A40010 */ addiu $a0, $sp, 0x10 +/* ED0248 80240258 0200282D */ daddu $a1, $s0, $zero +/* ED024C 8024025C 0C01B1F0 */ jal osSiRawReadIo +/* ED0250 80240260 00A0302D */ daddu $a2, $a1, $zero +/* ED0254 80240264 96220000 */ lhu $v0, ($s1) +/* ED0258 80240268 34421400 */ ori $v0, $v0, 0x1400 +/* ED025C 8024026C 080900BB */ j .L802402EC +/* ED0260 80240270 A6220000 */ sh $v0, ($s1) +.L80240274: +/* ED0264 80240274 4480A000 */ mtc1 $zero, $f20 +/* ED0268 80240278 4406B000 */ mfc1 $a2, $f22 +/* ED026C 8024027C 4405A000 */ mfc1 $a1, $f20 +/* ED0270 80240280 4407A000 */ mfc1 $a3, $f20 +/* ED0274 80240284 0C01B2B0 */ jal func_8006CAC0 +/* ED0278 80240288 27A40010 */ addiu $a0, $sp, 0x10 +/* ED027C 8024028C 27A40010 */ addiu $a0, $sp, 0x10 +/* ED0280 80240290 26300058 */ addiu $s0, $s1, 0x58 +/* ED0284 80240294 0200282D */ daddu $a1, $s0, $zero +/* ED0288 80240298 0C01B1F0 */ jal osSiRawReadIo +/* ED028C 8024029C 0200302D */ daddu $a2, $s0, $zero +/* ED0290 802402A0 4405E000 */ mfc1 $a1, $f28 +/* ED0294 802402A4 4406D000 */ mfc1 $a2, $f26 +/* ED0298 802402A8 4407C000 */ mfc1 $a3, $f24 +/* ED029C 802402AC 0C090038 */ jal func_802400E0_ED00D0 +/* ED02A0 802402B0 27A40010 */ addiu $a0, $sp, 0x10 +/* ED02A4 802402B4 27A40010 */ addiu $a0, $sp, 0x10 +/* ED02A8 802402B8 0200282D */ daddu $a1, $s0, $zero +/* ED02AC 802402BC 0C01B1F0 */ jal osSiRawReadIo +/* ED02B0 802402C0 0200302D */ daddu $a2, $s0, $zero +/* ED02B4 802402C4 27A40010 */ addiu $a0, $sp, 0x10 +/* ED02B8 802402C8 4600B587 */ neg.s $f22, $f22 +/* ED02BC 802402CC 4405A000 */ mfc1 $a1, $f20 +/* ED02C0 802402D0 4406B000 */ mfc1 $a2, $f22 +/* ED02C4 802402D4 0C01B2B0 */ jal func_8006CAC0 +/* ED02C8 802402D8 00A0382D */ daddu $a3, $a1, $zero +/* ED02CC 802402DC 27A40010 */ addiu $a0, $sp, 0x10 +/* ED02D0 802402E0 0200282D */ daddu $a1, $s0, $zero +/* ED02D4 802402E4 0C01B1F0 */ jal osSiRawReadIo +/* ED02D8 802402E8 00A0302D */ daddu $a2, $a1, $zero +.L802402EC: +/* ED02DC 802402EC 8FBF005C */ lw $ra, 0x5c($sp) +/* ED02E0 802402F0 8FB20058 */ lw $s2, 0x58($sp) +/* ED02E4 802402F4 8FB10054 */ lw $s1, 0x54($sp) +/* ED02E8 802402F8 8FB00050 */ lw $s0, 0x50($sp) +/* ED02EC 802402FC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* ED02F0 80240300 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* ED02F4 80240304 D7B80070 */ ldc1 $f24, 0x70($sp) +/* ED02F8 80240308 D7B60068 */ ldc1 $f22, 0x68($sp) +/* ED02FC 8024030C D7B40060 */ ldc1 $f20, 0x60($sp) +/* ED0300 80240310 24020002 */ addiu $v0, $zero, 2 +/* ED0304 80240314 03E00008 */ jr $ra +/* ED0308 80240318 27BD0088 */ addiu $sp, $sp, 0x88 +/* ED030C 8024031C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED0310/func_80240320_ED0310.s b/asm/nonmatchings/code_ED0310/func_80240320_ED0310.s new file mode 100644 index 0000000000..3564114aaf --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_80240320_ED0310.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240320_ED0310 +/* ED0310 80240320 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* ED0314 80240324 AFB3002C */ sw $s3, 0x2c($sp) +/* ED0318 80240328 0080982D */ daddu $s3, $a0, $zero +/* ED031C 8024032C AFBF0030 */ sw $ra, 0x30($sp) +/* ED0320 80240330 AFB20028 */ sw $s2, 0x28($sp) +/* ED0324 80240334 AFB10024 */ sw $s1, 0x24($sp) +/* ED0328 80240338 AFB00020 */ sw $s0, 0x20($sp) +/* ED032C 8024033C 8E710148 */ lw $s1, 0x148($s3) +/* ED0330 80240340 86240008 */ lh $a0, 8($s1) +/* ED0334 80240344 0C00F92F */ jal func_8003E4BC +/* ED0338 80240348 00A0902D */ daddu $s2, $a1, $zero +/* ED033C 8024034C 8E440004 */ lw $a0, 4($s2) +/* ED0340 80240350 0040802D */ daddu $s0, $v0, $zero +/* ED0344 80240354 00041FC2 */ srl $v1, $a0, 0x1f +/* ED0348 80240358 00832021 */ addu $a0, $a0, $v1 +/* ED034C 8024035C 00042043 */ sra $a0, $a0, 1 +/* ED0350 80240360 0C00AB3B */ jal func_8002ACEC +/* ED0354 80240364 24840001 */ addiu $a0, $a0, 1 +/* ED0358 80240368 8E430004 */ lw $v1, 4($s2) +/* ED035C 8024036C 000327C2 */ srl $a0, $v1, 0x1f +/* ED0360 80240370 00641821 */ addu $v1, $v1, $a0 +/* ED0364 80240374 00031843 */ sra $v1, $v1, 1 +/* ED0368 80240378 00621821 */ addu $v1, $v1, $v0 +/* ED036C 8024037C A603008E */ sh $v1, 0x8e($s0) +/* ED0370 80240380 8E2300D0 */ lw $v1, 0xd0($s1) +/* ED0374 80240384 C6000040 */ lwc1 $f0, 0x40($s0) +/* ED0378 80240388 C4640000 */ lwc1 $f4, ($v1) +/* ED037C 8024038C 46802120 */ cvt.s.w $f4, $f4 +/* ED0380 80240390 C4620008 */ lwc1 $f2, 8($v1) +/* ED0384 80240394 468010A0 */ cvt.s.w $f2, $f2 +/* ED0388 80240398 E7A00010 */ swc1 $f0, 0x10($sp) +/* ED038C 8024039C 8E2200D0 */ lw $v0, 0xd0($s1) +/* ED0390 802403A0 44061000 */ mfc1 $a2, $f2 +/* ED0394 802403A4 C440000C */ lwc1 $f0, 0xc($v0) +/* ED0398 802403A8 46800020 */ cvt.s.w $f0, $f0 +/* ED039C 802403AC E7A00014 */ swc1 $f0, 0x14($sp) +/* ED03A0 802403B0 8E2200D0 */ lw $v0, 0xd0($s1) +/* ED03A4 802403B4 44052000 */ mfc1 $a1, $f4 +/* ED03A8 802403B8 C4400010 */ lwc1 $f0, 0x10($v0) +/* ED03AC 802403BC 46800020 */ cvt.s.w $f0, $f0 +/* ED03B0 802403C0 E7A00018 */ swc1 $f0, 0x18($sp) +/* ED03B4 802403C4 8C640018 */ lw $a0, 0x18($v1) +/* ED03B8 802403C8 0C013431 */ jal func_8004D0C4 +/* ED03BC 802403CC 8E070038 */ lw $a3, 0x38($s0) +/* ED03C0 802403D0 1040000E */ beqz $v0, .L8024040C +/* ED03C4 802403D4 00000000 */ nop +/* ED03C8 802403D8 8E2200D0 */ lw $v0, 0xd0($s1) +/* ED03CC 802403DC C60C0038 */ lwc1 $f12, 0x38($s0) +/* ED03D0 802403E0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ED03D4 802403E4 C4460000 */ lwc1 $f6, ($v0) +/* ED03D8 802403E8 468031A0 */ cvt.s.w $f6, $f6 +/* ED03DC 802403EC 44063000 */ mfc1 $a2, $f6 +/* ED03E0 802403F0 C4460008 */ lwc1 $f6, 8($v0) +/* ED03E4 802403F4 468031A0 */ cvt.s.w $f6, $f6 +/* ED03E8 802403F8 44073000 */ mfc1 $a3, $f6 +/* ED03EC 802403FC 0C00ABDC */ jal fio_validate_header_checksums +/* ED03F0 80240400 00000000 */ nop +/* ED03F4 80240404 0809010F */ j .L8024043C +/* ED03F8 80240408 E600000C */ swc1 $f0, 0xc($s0) +.L8024040C: +/* ED03FC 8024040C 0C00AB3B */ jal func_8002ACEC +/* ED0400 80240410 2404003C */ addiu $a0, $zero, 0x3c +/* ED0404 80240414 C60C000C */ lwc1 $f12, 0xc($s0) +/* ED0408 80240418 44820000 */ mtc1 $v0, $f0 +/* ED040C 8024041C 00000000 */ nop +/* ED0410 80240420 46800020 */ cvt.s.w $f0, $f0 +/* ED0414 80240424 46006300 */ add.s $f12, $f12, $f0 +/* ED0418 80240428 3C0141F0 */ lui $at, 0x41f0 +/* ED041C 8024042C 44810000 */ mtc1 $at, $f0 +/* ED0420 80240430 0C00AB85 */ jal func_8002AE14 +/* ED0424 80240434 46006301 */ sub.s $f12, $f12, $f0 +/* ED0428 80240438 E600000C */ swc1 $f0, 0xc($s0) +.L8024043C: +/* ED042C 8024043C 8E2200CC */ lw $v0, 0xcc($s1) +/* ED0430 80240440 8C420004 */ lw $v0, 4($v0) +/* ED0434 80240444 AE020028 */ sw $v0, 0x28($s0) +/* ED0438 80240448 AE600074 */ sw $zero, 0x74($s3) +/* ED043C 8024044C 8E2200D0 */ lw $v0, 0xd0($s1) +/* ED0440 80240450 8C420014 */ lw $v0, 0x14($v0) +/* ED0444 80240454 04410004 */ bgez $v0, .L80240468 +/* ED0448 80240458 00000000 */ nop +/* ED044C 8024045C C6400000 */ lwc1 $f0, ($s2) +/* ED0450 80240460 08090122 */ j .L80240488 +/* ED0454 80240464 E6000018 */ swc1 $f0, 0x18($s0) +.L80240468: +/* ED0458 80240468 3C018024 */ lui $at, %hi(D_802441D0) +/* ED045C 8024046C D42241D0 */ ldc1 $f2, %lo(D_802441D0)($at) +/* ED0460 80240470 44820000 */ mtc1 $v0, $f0 +/* ED0464 80240474 00000000 */ nop +/* ED0468 80240478 46800021 */ cvt.d.w $f0, $f0 +/* ED046C 8024047C 46220003 */ div.d $f0, $f0, $f2 +/* ED0470 80240480 46200020 */ cvt.s.d $f0, $f0 +/* ED0474 80240484 E6000018 */ swc1 $f0, 0x18($s0) +.L80240488: +/* ED0478 80240488 C600003C */ lwc1 $f0, 0x3c($s0) +/* ED047C 8024048C 3C014059 */ lui $at, 0x4059 +/* ED0480 80240490 44811800 */ mtc1 $at, $f3 +/* ED0484 80240494 44801000 */ mtc1 $zero, $f2 +/* ED0488 80240498 46000021 */ cvt.d.s $f0, $f0 +/* ED048C 8024049C 46220002 */ mul.d $f0, $f0, $f2 +/* ED0490 802404A0 00000000 */ nop +/* ED0494 802404A4 24020001 */ addiu $v0, $zero, 1 +/* ED0498 802404A8 4620018D */ trunc.w.d $f6, $f0 +/* ED049C 802404AC E626007C */ swc1 $f6, 0x7c($s1) +/* ED04A0 802404B0 AE620070 */ sw $v0, 0x70($s3) +/* ED04A4 802404B4 8FBF0030 */ lw $ra, 0x30($sp) +/* ED04A8 802404B8 8FB3002C */ lw $s3, 0x2c($sp) +/* ED04AC 802404BC 8FB20028 */ lw $s2, 0x28($sp) +/* ED04B0 802404C0 8FB10024 */ lw $s1, 0x24($sp) +/* ED04B4 802404C4 8FB00020 */ lw $s0, 0x20($sp) +/* ED04B8 802404C8 03E00008 */ jr $ra +/* ED04BC 802404CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_ED0310/func_802404D0_ED04C0.s b/asm/nonmatchings/code_ED0310/func_802404D0_ED04C0.s new file mode 100644 index 0000000000..b4492012af --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_802404D0_ED04C0.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404D0_ED04C0 +/* ED04C0 802404D0 27BDFF80 */ addiu $sp, $sp, -0x80 +/* ED04C4 802404D4 AFB3004C */ sw $s3, 0x4c($sp) +/* ED04C8 802404D8 0080982D */ daddu $s3, $a0, $zero +/* ED04CC 802404DC AFBF0058 */ sw $ra, 0x58($sp) +/* ED04D0 802404E0 AFB50054 */ sw $s5, 0x54($sp) +/* ED04D4 802404E4 AFB40050 */ sw $s4, 0x50($sp) +/* ED04D8 802404E8 AFB20048 */ sw $s2, 0x48($sp) +/* ED04DC 802404EC AFB10044 */ sw $s1, 0x44($sp) +/* ED04E0 802404F0 AFB00040 */ sw $s0, 0x40($sp) +/* ED04E4 802404F4 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* ED04E8 802404F8 F7B80070 */ sdc1 $f24, 0x70($sp) +/* ED04EC 802404FC F7B60068 */ sdc1 $f22, 0x68($sp) +/* ED04F0 80240500 F7B40060 */ sdc1 $f20, 0x60($sp) +/* ED04F4 80240504 8E710148 */ lw $s1, 0x148($s3) +/* ED04F8 80240508 00A0902D */ daddu $s2, $a1, $zero +/* ED04FC 8024050C 86240008 */ lh $a0, 8($s1) +/* ED0500 80240510 0C00F92F */ jal func_8003E4BC +/* ED0504 80240514 00C0A82D */ daddu $s5, $a2, $zero +/* ED0508 80240518 0040802D */ daddu $s0, $v0, $zero +/* ED050C 8024051C 0000A02D */ daddu $s4, $zero, $zero +/* ED0510 80240520 C624007C */ lwc1 $f4, 0x7c($s1) +/* ED0514 80240524 46802120 */ cvt.s.w $f4, $f4 +/* ED0518 80240528 C6220088 */ lwc1 $f2, 0x88($s1) +/* ED051C 8024052C 468010A0 */ cvt.s.w $f2, $f2 +/* ED0520 80240530 460010A1 */ cvt.d.s $f2, $f2 +/* ED0524 80240534 46002121 */ cvt.d.s $f4, $f4 +/* ED0528 80240538 C600003C */ lwc1 $f0, 0x3c($s0) +/* ED052C 8024053C 3C014059 */ lui $at, 0x4059 +/* ED0530 80240540 44813800 */ mtc1 $at, $f7 +/* ED0534 80240544 44803000 */ mtc1 $zero, $f6 +/* ED0538 80240548 46000021 */ cvt.d.s $f0, $f0 +/* ED053C 8024054C 46260002 */ mul.d $f0, $f0, $f6 +/* ED0540 80240550 00000000 */ nop +/* ED0544 80240554 24020001 */ addiu $v0, $zero, 1 +/* ED0548 80240558 8E24006C */ lw $a0, 0x6c($s1) +/* ED054C 8024055C 46261083 */ div.d $f2, $f2, $f6 +/* ED0550 80240560 462010A0 */ cvt.s.d $f2, $f2 +/* ED0554 80240564 46262103 */ div.d $f4, $f4, $f6 +/* ED0558 80240568 46202520 */ cvt.s.d $f20, $f4 +/* ED055C 8024056C 30830011 */ andi $v1, $a0, 0x11 +/* ED0560 80240570 4620020D */ trunc.w.d $f8, $f0 +/* ED0564 80240574 E628007C */ swc1 $f8, 0x7c($s1) +/* ED0568 80240578 C6200078 */ lwc1 $f0, 0x78($s1) +/* ED056C 8024057C 46800020 */ cvt.s.w $f0, $f0 +/* ED0570 80240580 46000021 */ cvt.d.s $f0, $f0 +/* ED0574 80240584 46260003 */ div.d $f0, $f0, $f6 +/* ED0578 80240588 462006A0 */ cvt.s.d $f26, $f0 +/* ED057C 8024058C C6200070 */ lwc1 $f0, 0x70($s1) +/* ED0580 80240590 46800020 */ cvt.s.w $f0, $f0 +/* ED0584 80240594 46000021 */ cvt.d.s $f0, $f0 +/* ED0588 80240598 46260003 */ div.d $f0, $f0, $f6 +/* ED058C 8024059C 462005A0 */ cvt.s.d $f22, $f0 +/* ED0590 802405A0 14620025 */ bne $v1, $v0, .L80240638 +/* ED0594 802405A4 4602D600 */ add.s $f24, $f26, $f2 +/* ED0598 802405A8 8E020000 */ lw $v0, ($s0) +/* ED059C 802405AC 30420008 */ andi $v0, $v0, 8 +/* ED05A0 802405B0 10400009 */ beqz $v0, .L802405D8 +/* ED05A4 802405B4 27A50028 */ addiu $a1, $sp, 0x28 +/* ED05A8 802405B8 C600003C */ lwc1 $f0, 0x3c($s0) +/* ED05AC 802405BC 4600C001 */ sub.s $f0, $f24, $f0 +/* ED05B0 802405C0 4600B03C */ c.lt.s $f22, $f0 +/* ED05B4 802405C4 00000000 */ nop +/* ED05B8 802405C8 4500001B */ bc1f .L80240638 +/* ED05BC 802405CC 34820010 */ ori $v0, $a0, 0x10 +/* ED05C0 802405D0 0809018E */ j .L80240638 +/* ED05C4 802405D4 AE22006C */ sw $v0, 0x6c($s1) +.L802405D8: +/* ED05C8 802405D8 27A6002C */ addiu $a2, $sp, 0x2c +/* ED05CC 802405DC C6000038 */ lwc1 $f0, 0x38($s0) +/* ED05D0 802405E0 C602003C */ lwc1 $f2, 0x3c($s0) +/* ED05D4 802405E4 C6040040 */ lwc1 $f4, 0x40($s0) +/* ED05D8 802405E8 3C01447A */ lui $at, 0x447a +/* ED05DC 802405EC 44813000 */ mtc1 $at, $f6 +/* ED05E0 802405F0 27A20034 */ addiu $v0, $sp, 0x34 +/* ED05E4 802405F4 E7A00028 */ swc1 $f0, 0x28($sp) +/* ED05E8 802405F8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* ED05EC 802405FC E7A40030 */ swc1 $f4, 0x30($sp) +/* ED05F0 80240600 E7A60034 */ swc1 $f6, 0x34($sp) +/* ED05F4 80240604 AFA20010 */ sw $v0, 0x10($sp) +/* ED05F8 80240608 8E040080 */ lw $a0, 0x80($s0) +/* ED05FC 8024060C 0C03908F */ jal func_800E423C +/* ED0600 80240610 27A70030 */ addiu $a3, $sp, 0x30 +/* ED0604 80240614 C7A00034 */ lwc1 $f0, 0x34($sp) +/* ED0608 80240618 4600D001 */ sub.s $f0, $f26, $f0 +/* ED060C 8024061C 4600B03C */ c.lt.s $f22, $f0 +/* ED0610 80240620 00000000 */ nop +/* ED0614 80240624 45000004 */ bc1f .L80240638 +/* ED0618 80240628 00000000 */ nop +/* ED061C 8024062C 8E22006C */ lw $v0, 0x6c($s1) +/* ED0620 80240630 34420010 */ ori $v0, $v0, 0x10 +/* ED0624 80240634 AE22006C */ sw $v0, 0x6c($s1) +.L80240638: +/* ED0628 80240638 8E22006C */ lw $v0, 0x6c($s1) +/* ED062C 8024063C 24030011 */ addiu $v1, $zero, 0x11 +/* ED0630 80240640 30420011 */ andi $v0, $v0, 0x11 +/* ED0634 80240644 14430039 */ bne $v0, $v1, .L8024072C +/* ED0638 80240648 00000000 */ nop +/* ED063C 8024064C 8E020000 */ lw $v0, ($s0) +/* ED0640 80240650 30420008 */ andi $v0, $v0, 8 +/* ED0644 80240654 1040000A */ beqz $v0, .L80240680 +/* ED0648 80240658 4600C106 */ mov.s $f4, $f24 +/* ED064C 8024065C 4614C081 */ sub.s $f2, $f24, $f20 +/* ED0650 80240660 3C018024 */ lui $at, %hi(D_802441D8) +/* ED0654 80240664 D42041D8 */ ldc1 $f0, %lo(D_802441D8)($at) +/* ED0658 80240668 460010A1 */ cvt.d.s $f2, $f2 +/* ED065C 8024066C 46201082 */ mul.d $f2, $f2, $f0 +/* ED0660 80240670 00000000 */ nop +/* ED0664 80240674 4600A021 */ cvt.d.s $f0, $f20 +/* ED0668 80240678 080901B9 */ j .L802406E4 +/* ED066C 8024067C 46220000 */ add.d $f0, $f0, $f2 +.L80240680: +/* ED0670 80240680 27A50028 */ addiu $a1, $sp, 0x28 +/* ED0674 80240684 27A6002C */ addiu $a2, $sp, 0x2c +/* ED0678 80240688 C6000038 */ lwc1 $f0, 0x38($s0) +/* ED067C 8024068C C6020040 */ lwc1 $f2, 0x40($s0) +/* ED0680 80240690 3C01447A */ lui $at, 0x447a +/* ED0684 80240694 44812000 */ mtc1 $at, $f4 +/* ED0688 80240698 27A20034 */ addiu $v0, $sp, 0x34 +/* ED068C 8024069C E7B4002C */ swc1 $f20, 0x2c($sp) +/* ED0690 802406A0 E7A00028 */ swc1 $f0, 0x28($sp) +/* ED0694 802406A4 E7A20030 */ swc1 $f2, 0x30($sp) +/* ED0698 802406A8 E7A40034 */ swc1 $f4, 0x34($sp) +/* ED069C 802406AC AFA20010 */ sw $v0, 0x10($sp) +/* ED06A0 802406B0 8E040080 */ lw $a0, 0x80($s0) +/* ED06A4 802406B4 0C03908F */ jal func_800E423C +/* ED06A8 802406B8 27A70030 */ addiu $a3, $sp, 0x30 +/* ED06AC 802406BC C7A4002C */ lwc1 $f4, 0x2c($sp) +/* ED06B0 802406C0 461A2100 */ add.s $f4, $f4, $f26 +/* ED06B4 802406C4 46142081 */ sub.s $f2, $f4, $f20 +/* ED06B8 802406C8 3C018024 */ lui $at, %hi(D_802441E0) +/* ED06BC 802406CC D42041E0 */ ldc1 $f0, %lo(D_802441E0)($at) +/* ED06C0 802406D0 460010A1 */ cvt.d.s $f2, $f2 +/* ED06C4 802406D4 46201082 */ mul.d $f2, $f2, $f0 +/* ED06C8 802406D8 00000000 */ nop +/* ED06CC 802406DC 4600A021 */ cvt.d.s $f0, $f20 +/* ED06D0 802406E0 46220000 */ add.d $f0, $f0, $f2 +.L802406E4: +/* ED06D4 802406E4 46200020 */ cvt.s.d $f0, $f0 +/* ED06D8 802406E8 E600003C */ swc1 $f0, 0x3c($s0) +/* ED06DC 802406EC C600003C */ lwc1 $f0, 0x3c($s0) +/* ED06E0 802406F0 46002001 */ sub.s $f0, $f4, $f0 +/* ED06E4 802406F4 3C013FF0 */ lui $at, 0x3ff0 +/* ED06E8 802406F8 44811800 */ mtc1 $at, $f3 +/* ED06EC 802406FC 44801000 */ mtc1 $zero, $f2 +/* ED06F0 80240700 46000005 */ abs.s $f0, $f0 +/* ED06F4 80240704 46000021 */ cvt.d.s $f0, $f0 +/* ED06F8 80240708 4622003C */ c.lt.d $f0, $f2 +/* ED06FC 8024070C 00000000 */ nop +/* ED0700 80240710 45000036 */ bc1f .L802407EC +/* ED0704 80240714 2403FFEF */ addiu $v1, $zero, -0x11 +/* ED0708 80240718 E604003C */ swc1 $f4, 0x3c($s0) +/* ED070C 8024071C 8E22006C */ lw $v0, 0x6c($s1) +/* ED0710 80240720 00431024 */ and $v0, $v0, $v1 +/* ED0714 80240724 080901FB */ j .L802407EC +/* ED0718 80240728 AE22006C */ sw $v0, 0x6c($s1) +.L8024072C: +/* ED071C 8024072C 8E220070 */ lw $v0, 0x70($s1) +/* ED0720 80240730 1840002E */ blez $v0, .L802407EC +/* ED0724 80240734 00000000 */ nop +/* ED0728 80240738 C62C0074 */ lwc1 $f12, 0x74($s1) +/* ED072C 8024073C 0C00AD77 */ jal func_8002B5DC +/* ED0730 80240740 46806320 */ cvt.s.w $f12, $f12 +/* ED0734 80240744 8E020000 */ lw $v0, ($s0) +/* ED0738 80240748 30420008 */ andi $v0, $v0, 8 +/* ED073C 8024074C 10400003 */ beqz $v0, .L8024075C +/* ED0740 80240750 46000506 */ mov.s $f20, $f0 +/* ED0744 80240754 080901E7 */ j .L8024079C +/* ED0748 80240758 0000102D */ daddu $v0, $zero, $zero +.L8024075C: +/* ED074C 8024075C 27A50028 */ addiu $a1, $sp, 0x28 +/* ED0750 80240760 27A6002C */ addiu $a2, $sp, 0x2c +/* ED0754 80240764 C6000038 */ lwc1 $f0, 0x38($s0) +/* ED0758 80240768 C602003C */ lwc1 $f2, 0x3c($s0) +/* ED075C 8024076C C6040040 */ lwc1 $f4, 0x40($s0) +/* ED0760 80240770 3C01447A */ lui $at, 0x447a +/* ED0764 80240774 44813000 */ mtc1 $at, $f6 +/* ED0768 80240778 27A20034 */ addiu $v0, $sp, 0x34 +/* ED076C 8024077C E7A00028 */ swc1 $f0, 0x28($sp) +/* ED0770 80240780 E7A2002C */ swc1 $f2, 0x2c($sp) +/* ED0774 80240784 E7A40030 */ swc1 $f4, 0x30($sp) +/* ED0778 80240788 E7A60034 */ swc1 $f6, 0x34($sp) +/* ED077C 8024078C AFA20010 */ sw $v0, 0x10($sp) +/* ED0780 80240790 8E040080 */ lw $a0, 0x80($s0) +/* ED0784 80240794 0C03908F */ jal func_800E423C +/* ED0788 80240798 27A70030 */ addiu $a3, $sp, 0x30 +.L8024079C: +/* ED078C 8024079C 10400007 */ beqz $v0, .L802407BC +/* ED0790 802407A0 00000000 */ nop +/* ED0794 802407A4 4616A082 */ mul.s $f2, $f20, $f22 +/* ED0798 802407A8 00000000 */ nop +/* ED079C 802407AC C7A0002C */ lwc1 $f0, 0x2c($sp) +/* ED07A0 802407B0 461A0000 */ add.s $f0, $f0, $f26 +/* ED07A4 802407B4 080901F2 */ j .L802407C8 +/* ED07A8 802407B8 46020000 */ add.s $f0, $f0, $f2 +.L802407BC: +/* ED07AC 802407BC 4616A002 */ mul.s $f0, $f20, $f22 +/* ED07B0 802407C0 00000000 */ nop +/* ED07B4 802407C4 4600C000 */ add.s $f0, $f24, $f0 +.L802407C8: +/* ED07B8 802407C8 E600003C */ swc1 $f0, 0x3c($s0) +/* ED07BC 802407CC 8E220074 */ lw $v0, 0x74($s1) +/* ED07C0 802407D0 2442000A */ addiu $v0, $v0, 0xa +/* ED07C4 802407D4 44826000 */ mtc1 $v0, $f12 +/* ED07C8 802407D8 00000000 */ nop +/* ED07CC 802407DC 0C00AB85 */ jal func_8002AE14 +/* ED07D0 802407E0 46806320 */ cvt.s.w $f12, $f12 +/* ED07D4 802407E4 4600020D */ trunc.w.s $f8, $f0 +/* ED07D8 802407E8 E6280074 */ swc1 $f8, 0x74($s1) +.L802407EC: +/* ED07DC 802407EC 8E220090 */ lw $v0, 0x90($s1) +/* ED07E0 802407F0 1C40004A */ bgtz $v0, .L8024091C +/* ED07E4 802407F4 2442FFFF */ addiu $v0, $v0, -1 +/* ED07E8 802407F8 8E430014 */ lw $v1, 0x14($s2) +/* ED07EC 802407FC 04600048 */ bltz $v1, .L80240920 +/* ED07F0 80240800 00000000 */ nop +/* ED07F4 80240804 8E620074 */ lw $v0, 0x74($s3) +/* ED07F8 80240808 1C400042 */ bgtz $v0, .L80240914 +/* ED07FC 8024080C 2442FFFF */ addiu $v0, $v0, -1 +/* ED0800 80240810 AE630074 */ sw $v1, 0x74($s3) +/* ED0804 80240814 860200A8 */ lh $v0, 0xa8($s0) +/* ED0808 80240818 C602003C */ lwc1 $f2, 0x3c($s0) +/* ED080C 8024081C 44820000 */ mtc1 $v0, $f0 +/* ED0810 80240820 00000000 */ nop +/* ED0814 80240824 46800020 */ cvt.s.w $f0, $f0 +/* ED0818 80240828 46001080 */ add.s $f2, $f2, $f0 +/* ED081C 8024082C 3C014024 */ lui $at, 0x4024 +/* ED0820 80240830 44810800 */ mtc1 $at, $f1 +/* ED0824 80240834 44800000 */ mtc1 $zero, $f0 +/* ED0828 80240838 3C028010 */ lui $v0, %hi(D_800FFC90) +/* ED082C 8024083C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* ED0830 80240840 460010A1 */ cvt.d.s $f2, $f2 +/* ED0834 80240844 46201080 */ add.d $f2, $f2, $f0 +/* ED0838 80240848 C440002C */ lwc1 $f0, 0x2c($v0) +/* ED083C 8024084C 46000021 */ cvt.d.s $f0, $f0 +/* ED0840 80240850 4622003C */ c.lt.d $f0, $f2 +/* ED0844 80240854 00000000 */ nop +/* ED0848 80240858 4500002C */ bc1f .L8024090C +/* ED084C 8024085C 02A0202D */ daddu $a0, $s5, $zero +/* ED0850 80240860 AFA00010 */ sw $zero, 0x10($sp) +/* ED0854 80240864 8E46000C */ lw $a2, 0xc($s2) +/* ED0858 80240868 8E470010 */ lw $a3, 0x10($s2) +/* ED085C 8024086C 0C013469 */ jal func_8004D1A4 +/* ED0860 80240870 0220282D */ daddu $a1, $s1, $zero +/* ED0864 80240874 10400025 */ beqz $v0, .L8024090C +/* ED0868 80240878 0000202D */ daddu $a0, $zero, $zero +/* ED086C 8024087C 0200282D */ daddu $a1, $s0, $zero +/* ED0870 80240880 0000302D */ daddu $a2, $zero, $zero +/* ED0874 80240884 2412000C */ addiu $s2, $zero, 0xc +/* ED0878 80240888 860300A8 */ lh $v1, 0xa8($s0) +/* ED087C 8024088C 3C013F80 */ lui $at, 0x3f80 +/* ED0880 80240890 44810000 */ mtc1 $at, $f0 +/* ED0884 80240894 3C014000 */ lui $at, 0x4000 +/* ED0888 80240898 44811000 */ mtc1 $at, $f2 +/* ED088C 8024089C 3C01C1A0 */ lui $at, 0xc1a0 +/* ED0890 802408A0 44812000 */ mtc1 $at, $f4 +/* ED0894 802408A4 44834000 */ mtc1 $v1, $f8 +/* ED0898 802408A8 00000000 */ nop +/* ED089C 802408AC 46804220 */ cvt.s.w $f8, $f8 +/* ED08A0 802408B0 44074000 */ mfc1 $a3, $f8 +/* ED08A4 802408B4 27A20038 */ addiu $v0, $sp, 0x38 +/* ED08A8 802408B8 AFB2001C */ sw $s2, 0x1c($sp) +/* ED08AC 802408BC AFA20020 */ sw $v0, 0x20($sp) +/* ED08B0 802408C0 E7A00010 */ swc1 $f0, 0x10($sp) +/* ED08B4 802408C4 E7A20014 */ swc1 $f2, 0x14($sp) +/* ED08B8 802408C8 0C01D444 */ jal func_80075110 +/* ED08BC 802408CC E7A40018 */ swc1 $f4, 0x18($sp) +/* ED08C0 802408D0 0200202D */ daddu $a0, $s0, $zero +/* ED08C4 802408D4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* ED08C8 802408D8 C480003C */ lwc1 $f0, 0x3c($a0) +/* ED08CC 802408DC 3C060020 */ lui $a2, 0x20 +/* ED08D0 802408E0 0C013600 */ jal func_8004D800 +/* ED08D4 802408E4 E4800064 */ swc1 $f0, 0x64($a0) +/* ED08D8 802408E8 8E220018 */ lw $v0, 0x18($s1) +/* ED08DC 802408EC 9442002A */ lhu $v0, 0x2a($v0) +/* ED08E0 802408F0 30420001 */ andi $v0, $v0, 1 +/* ED08E4 802408F4 10400003 */ beqz $v0, .L80240904 +/* ED08E8 802408F8 2402000A */ addiu $v0, $zero, 0xa +/* ED08EC 802408FC 080902B1 */ j .L80240AC4 +/* ED08F0 80240900 AE620070 */ sw $v0, 0x70($s3) +.L80240904: +/* ED08F4 80240904 080902B1 */ j .L80240AC4 +/* ED08F8 80240908 AE720070 */ sw $s2, 0x70($s3) +.L8024090C: +/* ED08FC 8024090C 8E620074 */ lw $v0, 0x74($s3) +/* ED0900 80240910 2442FFFF */ addiu $v0, $v0, -1 +.L80240914: +/* ED0904 80240914 08090248 */ j .L80240920 +/* ED0908 80240918 AE620074 */ sw $v0, 0x74($s3) +.L8024091C: +/* ED090C 8024091C AE220090 */ sw $v0, 0x90($s1) +.L80240920: +/* ED0910 80240920 8E2300D0 */ lw $v1, 0xd0($s1) +/* ED0914 80240924 C6000040 */ lwc1 $f0, 0x40($s0) +/* ED0918 80240928 C4620000 */ lwc1 $f2, ($v1) +/* ED091C 8024092C 468010A0 */ cvt.s.w $f2, $f2 +/* ED0920 80240930 C4640008 */ lwc1 $f4, 8($v1) +/* ED0924 80240934 46802120 */ cvt.s.w $f4, $f4 +/* ED0928 80240938 E7A00010 */ swc1 $f0, 0x10($sp) +/* ED092C 8024093C 8E2200D0 */ lw $v0, 0xd0($s1) +/* ED0930 80240940 44051000 */ mfc1 $a1, $f2 +/* ED0934 80240944 C440000C */ lwc1 $f0, 0xc($v0) +/* ED0938 80240948 46800020 */ cvt.s.w $f0, $f0 +/* ED093C 8024094C E7A00014 */ swc1 $f0, 0x14($sp) +/* ED0940 80240950 8E2200D0 */ lw $v0, 0xd0($s1) +/* ED0944 80240954 44062000 */ mfc1 $a2, $f4 +/* ED0948 80240958 C4400010 */ lwc1 $f0, 0x10($v0) +/* ED094C 8024095C 46800020 */ cvt.s.w $f0, $f0 +/* ED0950 80240960 E7A00018 */ swc1 $f0, 0x18($sp) +/* ED0954 80240964 8C640018 */ lw $a0, 0x18($v1) +/* ED0958 80240968 0C013431 */ jal func_8004D0C4 +/* ED095C 8024096C 8E070038 */ lw $a3, 0x38($s0) +/* ED0960 80240970 1040001A */ beqz $v0, .L802409DC +/* ED0964 80240974 00000000 */ nop +/* ED0968 80240978 8E060038 */ lw $a2, 0x38($s0) +/* ED096C 8024097C 8E2200D0 */ lw $v0, 0xd0($s1) +/* ED0970 80240980 8E070040 */ lw $a3, 0x40($s0) +/* ED0974 80240984 C44C0000 */ lwc1 $f12, ($v0) +/* ED0978 80240988 46806320 */ cvt.s.w $f12, $f12 +/* ED097C 8024098C C44E0008 */ lwc1 $f14, 8($v0) +/* ED0980 80240990 0C00AC71 */ jal func_8002B1C4 +/* ED0984 80240994 468073A0 */ cvt.s.w $f14, $f14 +/* ED0988 80240998 C6020018 */ lwc1 $f2, 0x18($s0) +/* ED098C 8024099C 4600103C */ c.lt.s $f2, $f0 +/* ED0990 802409A0 00000000 */ nop +/* ED0994 802409A4 4500000D */ bc1f .L802409DC +/* ED0998 802409A8 E7A00034 */ swc1 $f0, 0x34($sp) +/* ED099C 802409AC C60C0038 */ lwc1 $f12, 0x38($s0) +/* ED09A0 802409B0 8E2200D0 */ lw $v0, 0xd0($s1) +/* ED09A4 802409B4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ED09A8 802409B8 C4480000 */ lwc1 $f8, ($v0) +/* ED09AC 802409BC 46804220 */ cvt.s.w $f8, $f8 +/* ED09B0 802409C0 44064000 */ mfc1 $a2, $f8 +/* ED09B4 802409C4 C4480008 */ lwc1 $f8, 8($v0) +/* ED09B8 802409C8 46804220 */ cvt.s.w $f8, $f8 +/* ED09BC 802409CC 44074000 */ mfc1 $a3, $f8 +/* ED09C0 802409D0 0C00ABDC */ jal fio_validate_header_checksums +/* ED09C4 802409D4 24140001 */ addiu $s4, $zero, 1 +/* ED09C8 802409D8 E600000C */ swc1 $f0, 0xc($s0) +.L802409DC: +/* ED09CC 802409DC 8E2200D0 */ lw $v0, 0xd0($s1) +/* ED09D0 802409E0 8C43000C */ lw $v1, 0xc($v0) +/* ED09D4 802409E4 8C420010 */ lw $v0, 0x10($v0) +/* ED09D8 802409E8 00621825 */ or $v1, $v1, $v0 +/* ED09DC 802409EC 00741825 */ or $v1, $v1, $s4 +/* ED09E0 802409F0 10600008 */ beqz $v1, .L80240A14 +/* ED09E4 802409F4 00000000 */ nop +/* ED09E8 802409F8 8602008C */ lh $v0, 0x8c($s0) +/* ED09EC 802409FC 14400031 */ bnez $v0, .L80240AC4 +/* ED09F0 80240A00 00000000 */ nop +/* ED09F4 80240A04 8E050018 */ lw $a1, 0x18($s0) +/* ED09F8 80240A08 8E06000C */ lw $a2, 0xc($s0) +/* ED09FC 80240A0C 0C00F909 */ jal func_8003E424 +/* ED0A00 80240A10 0200202D */ daddu $a0, $s0, $zero +.L80240A14: +/* ED0A04 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) +/* ED0A08 80240A18 3C014059 */ lui $at, 0x4059 +/* ED0A0C 80240A1C 44811800 */ mtc1 $at, $f3 +/* ED0A10 80240A20 44801000 */ mtc1 $zero, $f2 +/* ED0A14 80240A24 46000021 */ cvt.d.s $f0, $f0 +/* ED0A18 80240A28 46220002 */ mul.d $f0, $f0, $f2 +/* ED0A1C 80240A2C 00000000 */ nop +/* ED0A20 80240A30 4620020D */ trunc.w.d $f8, $f0 +/* ED0A24 80240A34 E628007C */ swc1 $f8, 0x7c($s1) +/* ED0A28 80240A38 8E420004 */ lw $v0, 4($s2) +/* ED0A2C 80240A3C 18400021 */ blez $v0, .L80240AC4 +/* ED0A30 80240A40 00000000 */ nop +/* ED0A34 80240A44 8602008E */ lh $v0, 0x8e($s0) +/* ED0A38 80240A48 9603008E */ lhu $v1, 0x8e($s0) +/* ED0A3C 80240A4C 18400005 */ blez $v0, .L80240A64 +/* ED0A40 80240A50 2462FFFF */ addiu $v0, $v1, -1 +/* ED0A44 80240A54 A602008E */ sh $v0, 0x8e($s0) +/* ED0A48 80240A58 00021400 */ sll $v0, $v0, 0x10 +/* ED0A4C 80240A5C 1C400019 */ bgtz $v0, .L80240AC4 +/* ED0A50 80240A60 00000000 */ nop +.L80240A64: +/* ED0A54 80240A64 240403E8 */ addiu $a0, $zero, 0x3e8 +/* ED0A58 80240A68 24020002 */ addiu $v0, $zero, 2 +/* ED0A5C 80240A6C 0C00AB3B */ jal func_8002ACEC +/* ED0A60 80240A70 AE620070 */ sw $v0, 0x70($s3) +/* ED0A64 80240A74 3C035555 */ lui $v1, 0x5555 +/* ED0A68 80240A78 34635556 */ ori $v1, $v1, 0x5556 +/* ED0A6C 80240A7C 00430018 */ mult $v0, $v1 +/* ED0A70 80240A80 000227C3 */ sra $a0, $v0, 0x1f +/* ED0A74 80240A84 00004010 */ mfhi $t0 +/* ED0A78 80240A88 01042023 */ subu $a0, $t0, $a0 +/* ED0A7C 80240A8C 00041840 */ sll $v1, $a0, 1 +/* ED0A80 80240A90 00641821 */ addu $v1, $v1, $a0 +/* ED0A84 80240A94 00431023 */ subu $v0, $v0, $v1 +/* ED0A88 80240A98 24430002 */ addiu $v1, $v0, 2 +/* ED0A8C 80240A9C AE630074 */ sw $v1, 0x74($s3) +/* ED0A90 80240AA0 8E42002C */ lw $v0, 0x2c($s2) +/* ED0A94 80240AA4 58400007 */ blezl $v0, .L80240AC4 +/* ED0A98 80240AA8 AE600070 */ sw $zero, 0x70($s3) +/* ED0A9C 80240AAC 8E420008 */ lw $v0, 8($s2) +/* ED0AA0 80240AB0 18400003 */ blez $v0, .L80240AC0 +/* ED0AA4 80240AB4 28620003 */ slti $v0, $v1, 3 +/* ED0AA8 80240AB8 10400002 */ beqz $v0, .L80240AC4 +/* ED0AAC 80240ABC 00000000 */ nop +.L80240AC0: +/* ED0AB0 80240AC0 AE600070 */ sw $zero, 0x70($s3) +.L80240AC4: +/* ED0AB4 80240AC4 8FBF0058 */ lw $ra, 0x58($sp) +/* ED0AB8 80240AC8 8FB50054 */ lw $s5, 0x54($sp) +/* ED0ABC 80240ACC 8FB40050 */ lw $s4, 0x50($sp) +/* ED0AC0 80240AD0 8FB3004C */ lw $s3, 0x4c($sp) +/* ED0AC4 80240AD4 8FB20048 */ lw $s2, 0x48($sp) +/* ED0AC8 80240AD8 8FB10044 */ lw $s1, 0x44($sp) +/* ED0ACC 80240ADC 8FB00040 */ lw $s0, 0x40($sp) +/* ED0AD0 80240AE0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* ED0AD4 80240AE4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* ED0AD8 80240AE8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* ED0ADC 80240AEC D7B40060 */ ldc1 $f20, 0x60($sp) +/* ED0AE0 80240AF0 03E00008 */ jr $ra +/* ED0AE4 80240AF4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/code_ED0310/func_80240AF8_ED0AE8.s b/asm/nonmatchings/code_ED0310/func_80240AF8_ED0AE8.s new file mode 100644 index 0000000000..d3f1d7e153 --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_80240AF8_ED0AE8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AF8_ED0AE8 +/* ED0AE8 80240AF8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* ED0AEC 80240AFC AFB3001C */ sw $s3, 0x1c($sp) +/* ED0AF0 80240B00 0080982D */ daddu $s3, $a0, $zero +/* ED0AF4 80240B04 AFBF0020 */ sw $ra, 0x20($sp) +/* ED0AF8 80240B08 AFB20018 */ sw $s2, 0x18($sp) +/* ED0AFC 80240B0C AFB10014 */ sw $s1, 0x14($sp) +/* ED0B00 80240B10 AFB00010 */ sw $s0, 0x10($sp) +/* ED0B04 80240B14 8E720148 */ lw $s2, 0x148($s3) +/* ED0B08 80240B18 86440008 */ lh $a0, 8($s2) +/* ED0B0C 80240B1C 0C00F92F */ jal func_8003E4BC +/* ED0B10 80240B20 00A0882D */ daddu $s1, $a1, $zero +/* ED0B14 80240B24 8E240008 */ lw $a0, 8($s1) +/* ED0B18 80240B28 0040802D */ daddu $s0, $v0, $zero +/* ED0B1C 80240B2C 00041FC2 */ srl $v1, $a0, 0x1f +/* ED0B20 80240B30 00832021 */ addu $a0, $a0, $v1 +/* ED0B24 80240B34 00042043 */ sra $a0, $a0, 1 +/* ED0B28 80240B38 0C00AB3B */ jal func_8002ACEC +/* ED0B2C 80240B3C 24840001 */ addiu $a0, $a0, 1 +/* ED0B30 80240B40 8E230008 */ lw $v1, 8($s1) +/* ED0B34 80240B44 240400B4 */ addiu $a0, $zero, 0xb4 +/* ED0B38 80240B48 00032FC2 */ srl $a1, $v1, 0x1f +/* ED0B3C 80240B4C 00651821 */ addu $v1, $v1, $a1 +/* ED0B40 80240B50 00031843 */ sra $v1, $v1, 1 +/* ED0B44 80240B54 00621821 */ addu $v1, $v1, $v0 +/* ED0B48 80240B58 0C00AB3B */ jal func_8002ACEC +/* ED0B4C 80240B5C A603008E */ sh $v1, 0x8e($s0) +/* ED0B50 80240B60 C60C000C */ lwc1 $f12, 0xc($s0) +/* ED0B54 80240B64 44820000 */ mtc1 $v0, $f0 +/* ED0B58 80240B68 00000000 */ nop +/* ED0B5C 80240B6C 46800020 */ cvt.s.w $f0, $f0 +/* ED0B60 80240B70 46006300 */ add.s $f12, $f12, $f0 +/* ED0B64 80240B74 3C0142B4 */ lui $at, 0x42b4 +/* ED0B68 80240B78 44810000 */ mtc1 $at, $f0 +/* ED0B6C 80240B7C 0C00AB85 */ jal func_8002AE14 +/* ED0B70 80240B80 46006301 */ sub.s $f12, $f12, $f0 +/* ED0B74 80240B84 E600000C */ swc1 $f0, 0xc($s0) +/* ED0B78 80240B88 8E4200CC */ lw $v0, 0xcc($s2) +/* ED0B7C 80240B8C 8C420000 */ lw $v0, ($v0) +/* ED0B80 80240B90 AE020028 */ sw $v0, 0x28($s0) +/* ED0B84 80240B94 24020003 */ addiu $v0, $zero, 3 +/* ED0B88 80240B98 AE620070 */ sw $v0, 0x70($s3) +/* ED0B8C 80240B9C 8FBF0020 */ lw $ra, 0x20($sp) +/* ED0B90 80240BA0 8FB3001C */ lw $s3, 0x1c($sp) +/* ED0B94 80240BA4 8FB20018 */ lw $s2, 0x18($sp) +/* ED0B98 80240BA8 8FB10014 */ lw $s1, 0x14($sp) +/* ED0B9C 80240BAC 8FB00010 */ lw $s0, 0x10($sp) +/* ED0BA0 80240BB0 03E00008 */ jr $ra +/* ED0BA4 80240BB4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_ED0310/func_80240BB8_ED0BA8.s b/asm/nonmatchings/code_ED0310/func_80240BB8_ED0BA8.s new file mode 100644 index 0000000000..cba11646f2 --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_80240BB8_ED0BA8.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BB8_ED0BA8 +/* ED0BA8 80240BB8 27BDFF88 */ addiu $sp, $sp, -0x78 +/* ED0BAC 80240BBC AFB3004C */ sw $s3, 0x4c($sp) +/* ED0BB0 80240BC0 0080982D */ daddu $s3, $a0, $zero +/* ED0BB4 80240BC4 AFBF0054 */ sw $ra, 0x54($sp) +/* ED0BB8 80240BC8 AFB40050 */ sw $s4, 0x50($sp) +/* ED0BBC 80240BCC AFB20048 */ sw $s2, 0x48($sp) +/* ED0BC0 80240BD0 AFB10044 */ sw $s1, 0x44($sp) +/* ED0BC4 80240BD4 AFB00040 */ sw $s0, 0x40($sp) +/* ED0BC8 80240BD8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* ED0BCC 80240BDC F7B80068 */ sdc1 $f24, 0x68($sp) +/* ED0BD0 80240BE0 F7B60060 */ sdc1 $f22, 0x60($sp) +/* ED0BD4 80240BE4 F7B40058 */ sdc1 $f20, 0x58($sp) +/* ED0BD8 80240BE8 8E710148 */ lw $s1, 0x148($s3) +/* ED0BDC 80240BEC 00A0902D */ daddu $s2, $a1, $zero +/* ED0BE0 80240BF0 86240008 */ lh $a0, 8($s1) +/* ED0BE4 80240BF4 0C00F92F */ jal func_8003E4BC +/* ED0BE8 80240BF8 00C0A02D */ daddu $s4, $a2, $zero +/* ED0BEC 80240BFC 0040802D */ daddu $s0, $v0, $zero +/* ED0BF0 80240C00 C6200078 */ lwc1 $f0, 0x78($s1) +/* ED0BF4 80240C04 46800020 */ cvt.s.w $f0, $f0 +/* ED0BF8 80240C08 46000021 */ cvt.d.s $f0, $f0 +/* ED0BFC 80240C0C 3C014059 */ lui $at, 0x4059 +/* ED0C00 80240C10 44811800 */ mtc1 $at, $f3 +/* ED0C04 80240C14 44801000 */ mtc1 $zero, $f2 +/* ED0C08 80240C18 8602008E */ lh $v0, 0x8e($s0) +/* ED0C0C 80240C1C 9603008E */ lhu $v1, 0x8e($s0) +/* ED0C10 80240C20 46220003 */ div.d $f0, $f0, $f2 +/* ED0C14 80240C24 46200620 */ cvt.s.d $f24, $f0 +/* ED0C18 80240C28 C6200088 */ lwc1 $f0, 0x88($s1) +/* ED0C1C 80240C2C 46800020 */ cvt.s.w $f0, $f0 +/* ED0C20 80240C30 46000021 */ cvt.d.s $f0, $f0 +/* ED0C24 80240C34 46220003 */ div.d $f0, $f0, $f2 +/* ED0C28 80240C38 46200020 */ cvt.s.d $f0, $f0 +/* ED0C2C 80240C3C 18400003 */ blez $v0, .L80240C4C +/* ED0C30 80240C40 4600C680 */ add.s $f26, $f24, $f0 +/* ED0C34 80240C44 2462FFFF */ addiu $v0, $v1, -1 +/* ED0C38 80240C48 A602008E */ sh $v0, 0x8e($s0) +.L80240C4C: +/* ED0C3C 80240C4C 8E220070 */ lw $v0, 0x70($s1) +/* ED0C40 80240C50 18400034 */ blez $v0, .L80240D24 +/* ED0C44 80240C54 00000000 */ nop +/* ED0C48 80240C58 C62C0074 */ lwc1 $f12, 0x74($s1) +/* ED0C4C 80240C5C 46806320 */ cvt.s.w $f12, $f12 +/* ED0C50 80240C60 44820000 */ mtc1 $v0, $f0 +/* ED0C54 80240C64 00000000 */ nop +/* ED0C58 80240C68 46800020 */ cvt.s.w $f0, $f0 +/* ED0C5C 80240C6C 46000021 */ cvt.d.s $f0, $f0 +/* ED0C60 80240C70 46220003 */ div.d $f0, $f0, $f2 +/* ED0C64 80240C74 0C00AD77 */ jal func_8002B5DC +/* ED0C68 80240C78 462005A0 */ cvt.s.d $f22, $f0 +/* ED0C6C 80240C7C 8E020000 */ lw $v0, ($s0) +/* ED0C70 80240C80 30420008 */ andi $v0, $v0, 8 +/* ED0C74 80240C84 10400003 */ beqz $v0, .L80240C94 +/* ED0C78 80240C88 46000506 */ mov.s $f20, $f0 +/* ED0C7C 80240C8C 08090335 */ j .L80240CD4 +/* ED0C80 80240C90 0000102D */ daddu $v0, $zero, $zero +.L80240C94: +/* ED0C84 80240C94 27A50028 */ addiu $a1, $sp, 0x28 +/* ED0C88 80240C98 27A6002C */ addiu $a2, $sp, 0x2c +/* ED0C8C 80240C9C C6000038 */ lwc1 $f0, 0x38($s0) +/* ED0C90 80240CA0 C602003C */ lwc1 $f2, 0x3c($s0) +/* ED0C94 80240CA4 C6040040 */ lwc1 $f4, 0x40($s0) +/* ED0C98 80240CA8 3C01447A */ lui $at, 0x447a +/* ED0C9C 80240CAC 44813000 */ mtc1 $at, $f6 +/* ED0CA0 80240CB0 27A20034 */ addiu $v0, $sp, 0x34 +/* ED0CA4 80240CB4 E7A00028 */ swc1 $f0, 0x28($sp) +/* ED0CA8 80240CB8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* ED0CAC 80240CBC E7A40030 */ swc1 $f4, 0x30($sp) +/* ED0CB0 80240CC0 E7A60034 */ swc1 $f6, 0x34($sp) +/* ED0CB4 80240CC4 AFA20010 */ sw $v0, 0x10($sp) +/* ED0CB8 80240CC8 8E040080 */ lw $a0, 0x80($s0) +/* ED0CBC 80240CCC 0C03908F */ jal func_800E423C +/* ED0CC0 80240CD0 27A70030 */ addiu $a3, $sp, 0x30 +.L80240CD4: +/* ED0CC4 80240CD4 10400007 */ beqz $v0, .L80240CF4 +/* ED0CC8 80240CD8 00000000 */ nop +/* ED0CCC 80240CDC 4616A082 */ mul.s $f2, $f20, $f22 +/* ED0CD0 80240CE0 00000000 */ nop +/* ED0CD4 80240CE4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* ED0CD8 80240CE8 46180000 */ add.s $f0, $f0, $f24 +/* ED0CDC 80240CEC 08090340 */ j .L80240D00 +/* ED0CE0 80240CF0 46020000 */ add.s $f0, $f0, $f2 +.L80240CF4: +/* ED0CE4 80240CF4 4616A002 */ mul.s $f0, $f20, $f22 +/* ED0CE8 80240CF8 00000000 */ nop +/* ED0CEC 80240CFC 4600D000 */ add.s $f0, $f26, $f0 +.L80240D00: +/* ED0CF0 80240D00 E600003C */ swc1 $f0, 0x3c($s0) +/* ED0CF4 80240D04 8E220074 */ lw $v0, 0x74($s1) +/* ED0CF8 80240D08 2442000A */ addiu $v0, $v0, 0xa +/* ED0CFC 80240D0C 44826000 */ mtc1 $v0, $f12 +/* ED0D00 80240D10 00000000 */ nop +/* ED0D04 80240D14 0C00AB85 */ jal func_8002AE14 +/* ED0D08 80240D18 46806320 */ cvt.s.w $f12, $f12 +/* ED0D0C 80240D1C 4600020D */ trunc.w.s $f8, $f0 +/* ED0D10 80240D20 E6280074 */ swc1 $f8, 0x74($s1) +.L80240D24: +/* ED0D14 80240D24 8E220090 */ lw $v0, 0x90($s1) +/* ED0D18 80240D28 1C400040 */ bgtz $v0, .L80240E2C +/* ED0D1C 80240D2C 2442FFFF */ addiu $v0, $v0, -1 +/* ED0D20 80240D30 860200A8 */ lh $v0, 0xa8($s0) +/* ED0D24 80240D34 C600003C */ lwc1 $f0, 0x3c($s0) +/* ED0D28 80240D38 44821000 */ mtc1 $v0, $f2 +/* ED0D2C 80240D3C 00000000 */ nop +/* ED0D30 80240D40 468010A0 */ cvt.s.w $f2, $f2 +/* ED0D34 80240D44 3C028010 */ lui $v0, %hi(D_800FFC90) +/* ED0D38 80240D48 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* ED0D3C 80240D4C 46020000 */ add.s $f0, $f0, $f2 +/* ED0D40 80240D50 3C014024 */ lui $at, 0x4024 +/* ED0D44 80240D54 44812800 */ mtc1 $at, $f5 +/* ED0D48 80240D58 44802000 */ mtc1 $zero, $f4 +/* ED0D4C 80240D5C C442002C */ lwc1 $f2, 0x2c($v0) +/* ED0D50 80240D60 46000021 */ cvt.d.s $f0, $f0 +/* ED0D54 80240D64 46240000 */ add.d $f0, $f0, $f4 +/* ED0D58 80240D68 460010A1 */ cvt.d.s $f2, $f2 +/* ED0D5C 80240D6C 4620103C */ c.lt.d $f2, $f0 +/* ED0D60 80240D70 00000000 */ nop +/* ED0D64 80240D74 4500002E */ bc1f .L80240E30 +/* ED0D68 80240D78 0280202D */ daddu $a0, $s4, $zero +/* ED0D6C 80240D7C 24020001 */ addiu $v0, $zero, 1 +/* ED0D70 80240D80 AFA20010 */ sw $v0, 0x10($sp) +/* ED0D74 80240D84 8E460024 */ lw $a2, 0x24($s2) +/* ED0D78 80240D88 8E470028 */ lw $a3, 0x28($s2) +/* ED0D7C 80240D8C 0C013469 */ jal func_8004D1A4 +/* ED0D80 80240D90 0220282D */ daddu $a1, $s1, $zero +/* ED0D84 80240D94 10400026 */ beqz $v0, .L80240E30 +/* ED0D88 80240D98 0000202D */ daddu $a0, $zero, $zero +/* ED0D8C 80240D9C 0200282D */ daddu $a1, $s0, $zero +/* ED0D90 80240DA0 0000302D */ daddu $a2, $zero, $zero +/* ED0D94 80240DA4 2412000C */ addiu $s2, $zero, 0xc +/* ED0D98 80240DA8 860300A8 */ lh $v1, 0xa8($s0) +/* ED0D9C 80240DAC 3C013F80 */ lui $at, 0x3f80 +/* ED0DA0 80240DB0 44810000 */ mtc1 $at, $f0 +/* ED0DA4 80240DB4 3C014000 */ lui $at, 0x4000 +/* ED0DA8 80240DB8 44811000 */ mtc1 $at, $f2 +/* ED0DAC 80240DBC 3C01C1A0 */ lui $at, 0xc1a0 +/* ED0DB0 80240DC0 44812000 */ mtc1 $at, $f4 +/* ED0DB4 80240DC4 44834000 */ mtc1 $v1, $f8 +/* ED0DB8 80240DC8 00000000 */ nop +/* ED0DBC 80240DCC 46804220 */ cvt.s.w $f8, $f8 +/* ED0DC0 80240DD0 44074000 */ mfc1 $a3, $f8 +/* ED0DC4 80240DD4 27A20038 */ addiu $v0, $sp, 0x38 +/* ED0DC8 80240DD8 AFB2001C */ sw $s2, 0x1c($sp) +/* ED0DCC 80240DDC AFA20020 */ sw $v0, 0x20($sp) +/* ED0DD0 80240DE0 E7A00010 */ swc1 $f0, 0x10($sp) +/* ED0DD4 80240DE4 E7A20014 */ swc1 $f2, 0x14($sp) +/* ED0DD8 80240DE8 0C01D444 */ jal func_80075110 +/* ED0DDC 80240DEC E7A40018 */ swc1 $f4, 0x18($sp) +/* ED0DE0 80240DF0 0200202D */ daddu $a0, $s0, $zero +/* ED0DE4 80240DF4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* ED0DE8 80240DF8 C480003C */ lwc1 $f0, 0x3c($a0) +/* ED0DEC 80240DFC 3C060020 */ lui $a2, 0x20 +/* ED0DF0 80240E00 0C013600 */ jal func_8004D800 +/* ED0DF4 80240E04 E4800064 */ swc1 $f0, 0x64($a0) +/* ED0DF8 80240E08 8E220018 */ lw $v0, 0x18($s1) +/* ED0DFC 80240E0C 9442002A */ lhu $v0, 0x2a($v0) +/* ED0E00 80240E10 30420001 */ andi $v0, $v0, 1 +/* ED0E04 80240E14 10400003 */ beqz $v0, .L80240E24 +/* ED0E08 80240E18 2402000A */ addiu $v0, $zero, 0xa +/* ED0E0C 80240E1C 080903B3 */ j .L80240ECC +/* ED0E10 80240E20 AE620070 */ sw $v0, 0x70($s3) +.L80240E24: +/* ED0E14 80240E24 080903B3 */ j .L80240ECC +/* ED0E18 80240E28 AE720070 */ sw $s2, 0x70($s3) +.L80240E2C: +/* ED0E1C 80240E2C AE220090 */ sw $v0, 0x90($s1) +.L80240E30: +/* ED0E20 80240E30 8602008C */ lh $v0, 0x8c($s0) +/* ED0E24 80240E34 14400025 */ bnez $v0, .L80240ECC +/* ED0E28 80240E38 00000000 */ nop +/* ED0E2C 80240E3C 8602008E */ lh $v0, 0x8e($s0) +/* ED0E30 80240E40 1C400022 */ bgtz $v0, .L80240ECC +/* ED0E34 80240E44 00000000 */ nop +/* ED0E38 80240E48 8E620074 */ lw $v0, 0x74($s3) +/* ED0E3C 80240E4C 2442FFFF */ addiu $v0, $v0, -1 +/* ED0E40 80240E50 1840001D */ blez $v0, .L80240EC8 +/* ED0E44 80240E54 AE620074 */ sw $v0, 0x74($s3) +/* ED0E48 80240E58 8E220018 */ lw $v0, 0x18($s1) +/* ED0E4C 80240E5C 9442002A */ lhu $v0, 0x2a($v0) +/* ED0E50 80240E60 30420010 */ andi $v0, $v0, 0x10 +/* ED0E54 80240E64 14400007 */ bnez $v0, .L80240E84 +/* ED0E58 80240E68 00000000 */ nop +/* ED0E5C 80240E6C C600000C */ lwc1 $f0, 0xc($s0) +/* ED0E60 80240E70 3C014334 */ lui $at, 0x4334 +/* ED0E64 80240E74 44816000 */ mtc1 $at, $f12 +/* ED0E68 80240E78 0C00AB85 */ jal func_8002AE14 +/* ED0E6C 80240E7C 460C0300 */ add.s $f12, $f0, $f12 +/* ED0E70 80240E80 E600000C */ swc1 $f0, 0xc($s0) +.L80240E84: +/* ED0E74 80240E84 0C00AB3B */ jal func_8002ACEC +/* ED0E78 80240E88 240403E8 */ addiu $a0, $zero, 0x3e8 +/* ED0E7C 80240E8C 3C032E8B */ lui $v1, 0x2e8b +/* ED0E80 80240E90 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* ED0E84 80240E94 00430018 */ mult $v0, $v1 +/* ED0E88 80240E98 00021FC3 */ sra $v1, $v0, 0x1f +/* ED0E8C 80240E9C 00004010 */ mfhi $t0 +/* ED0E90 80240EA0 00082043 */ sra $a0, $t0, 1 +/* ED0E94 80240EA4 00832023 */ subu $a0, $a0, $v1 +/* ED0E98 80240EA8 00041840 */ sll $v1, $a0, 1 +/* ED0E9C 80240EAC 00641821 */ addu $v1, $v1, $a0 +/* ED0EA0 80240EB0 00031880 */ sll $v1, $v1, 2 +/* ED0EA4 80240EB4 00641823 */ subu $v1, $v1, $a0 +/* ED0EA8 80240EB8 00431023 */ subu $v0, $v0, $v1 +/* ED0EAC 80240EBC 24420005 */ addiu $v0, $v0, 5 +/* ED0EB0 80240EC0 080903B3 */ j .L80240ECC +/* ED0EB4 80240EC4 A602008E */ sh $v0, 0x8e($s0) +.L80240EC8: +/* ED0EB8 80240EC8 AE600070 */ sw $zero, 0x70($s3) +.L80240ECC: +/* ED0EBC 80240ECC 8FBF0054 */ lw $ra, 0x54($sp) +/* ED0EC0 80240ED0 8FB40050 */ lw $s4, 0x50($sp) +/* ED0EC4 80240ED4 8FB3004C */ lw $s3, 0x4c($sp) +/* ED0EC8 80240ED8 8FB20048 */ lw $s2, 0x48($sp) +/* ED0ECC 80240EDC 8FB10044 */ lw $s1, 0x44($sp) +/* ED0ED0 80240EE0 8FB00040 */ lw $s0, 0x40($sp) +/* ED0ED4 80240EE4 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* ED0ED8 80240EE8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* ED0EDC 80240EEC D7B60060 */ ldc1 $f22, 0x60($sp) +/* ED0EE0 80240EF0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* ED0EE4 80240EF4 03E00008 */ jr $ra +/* ED0EE8 80240EF8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/code_ED0310/func_80240EFC_ED0EEC.s b/asm/nonmatchings/code_ED0310/func_80240EFC_ED0EEC.s new file mode 100644 index 0000000000..346f28d378 --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_80240EFC_ED0EEC.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EFC_ED0EEC +/* ED0EEC 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ED0EF0 80240F00 AFB20018 */ sw $s2, 0x18($sp) +/* ED0EF4 80240F04 0080902D */ daddu $s2, $a0, $zero +/* ED0EF8 80240F08 AFBF001C */ sw $ra, 0x1c($sp) +/* ED0EFC 80240F0C AFB10014 */ sw $s1, 0x14($sp) +/* ED0F00 80240F10 AFB00010 */ sw $s0, 0x10($sp) +/* ED0F04 80240F14 8E510148 */ lw $s1, 0x148($s2) +/* ED0F08 80240F18 0C00F92F */ jal func_8003E4BC +/* ED0F0C 80240F1C 86240008 */ lh $a0, 8($s1) +/* ED0F10 80240F20 0040802D */ daddu $s0, $v0, $zero +/* ED0F14 80240F24 3C028010 */ lui $v0, %hi(D_800FFC90) +/* ED0F18 80240F28 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* ED0F1C 80240F2C C60C0038 */ lwc1 $f12, 0x38($s0) +/* ED0F20 80240F30 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ED0F24 80240F34 A600008E */ sh $zero, 0x8e($s0) +/* ED0F28 80240F38 8C460028 */ lw $a2, 0x28($v0) +/* ED0F2C 80240F3C 0C00ABDC */ jal fio_validate_header_checksums +/* ED0F30 80240F40 8C470030 */ lw $a3, 0x30($v0) +/* ED0F34 80240F44 E600000C */ swc1 $f0, 0xc($s0) +/* ED0F38 80240F48 8E2200CC */ lw $v0, 0xcc($s1) +/* ED0F3C 80240F4C 8C420020 */ lw $v0, 0x20($v0) +/* ED0F40 80240F50 AE020028 */ sw $v0, 0x28($s0) +/* ED0F44 80240F54 2402000B */ addiu $v0, $zero, 0xb +/* ED0F48 80240F58 AE420070 */ sw $v0, 0x70($s2) +/* ED0F4C 80240F5C 8FBF001C */ lw $ra, 0x1c($sp) +/* ED0F50 80240F60 8FB20018 */ lw $s2, 0x18($sp) +/* ED0F54 80240F64 8FB10014 */ lw $s1, 0x14($sp) +/* ED0F58 80240F68 8FB00010 */ lw $s0, 0x10($sp) +/* ED0F5C 80240F6C 03E00008 */ jr $ra +/* ED0F60 80240F70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_ED0310/func_80240F74_ED0F64.s b/asm/nonmatchings/code_ED0310/func_80240F74_ED0F64.s new file mode 100644 index 0000000000..1d131c3ee8 --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_80240F74_ED0F64.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F74_ED0F64 +/* ED0F64 80240F74 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ED0F68 80240F78 AFB00010 */ sw $s0, 0x10($sp) +/* ED0F6C 80240F7C 0080802D */ daddu $s0, $a0, $zero +/* ED0F70 80240F80 AFBF0014 */ sw $ra, 0x14($sp) +/* ED0F74 80240F84 8E020148 */ lw $v0, 0x148($s0) +/* ED0F78 80240F88 0C00F92F */ jal func_8003E4BC +/* ED0F7C 80240F8C 84440008 */ lh $a0, 8($v0) +/* ED0F80 80240F90 9443008E */ lhu $v1, 0x8e($v0) +/* ED0F84 80240F94 C440003C */ lwc1 $f0, 0x3c($v0) +/* ED0F88 80240F98 24640001 */ addiu $a0, $v1, 1 +/* ED0F8C 80240F9C 00031C00 */ sll $v1, $v1, 0x10 +/* ED0F90 80240FA0 00031B83 */ sra $v1, $v1, 0xe +/* ED0F94 80240FA4 A444008E */ sh $a0, 0x8e($v0) +/* ED0F98 80240FA8 3C018024 */ lui $at, %hi(D_8024365C) +/* ED0F9C 80240FAC 00230821 */ addu $at, $at, $v1 +/* ED0FA0 80240FB0 C422365C */ lwc1 $f2, %lo(D_8024365C)($at) +/* ED0FA4 80240FB4 8443008E */ lh $v1, 0x8e($v0) +/* ED0FA8 80240FB8 46020000 */ add.s $f0, $f0, $f2 +/* ED0FAC 80240FBC 28630005 */ slti $v1, $v1, 5 +/* ED0FB0 80240FC0 14600003 */ bnez $v1, .L80240FD0 +/* ED0FB4 80240FC4 E440003C */ swc1 $f0, 0x3c($v0) +/* ED0FB8 80240FC8 2402000C */ addiu $v0, $zero, 0xc +/* ED0FBC 80240FCC AE020070 */ sw $v0, 0x70($s0) +.L80240FD0: +/* ED0FC0 80240FD0 8FBF0014 */ lw $ra, 0x14($sp) +/* ED0FC4 80240FD4 8FB00010 */ lw $s0, 0x10($sp) +/* ED0FC8 80240FD8 03E00008 */ jr $ra +/* ED0FCC 80240FDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s b/asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s new file mode 100644 index 0000000000..f27f1fc605 --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_80240FE0_ED0FD0.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FE0_ED0FD0 +/* ED0FD0 80240FE0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* ED0FD4 80240FE4 AFB3001C */ sw $s3, 0x1c($sp) +/* ED0FD8 80240FE8 0080982D */ daddu $s3, $a0, $zero +/* ED0FDC 80240FEC AFBF0020 */ sw $ra, 0x20($sp) +/* ED0FE0 80240FF0 AFB20018 */ sw $s2, 0x18($sp) +/* ED0FE4 80240FF4 AFB10014 */ sw $s1, 0x14($sp) +/* ED0FE8 80240FF8 AFB00010 */ sw $s0, 0x10($sp) +/* ED0FEC 80240FFC 8E720148 */ lw $s2, 0x148($s3) +/* ED0FF0 80241000 86440008 */ lh $a0, 8($s2) +/* ED0FF4 80241004 0C00F92F */ jal func_8003E4BC +/* ED0FF8 80241008 00A0802D */ daddu $s0, $a1, $zero +/* ED0FFC 8024100C 0040882D */ daddu $s1, $v0, $zero +/* ED1000 80241010 C6420080 */ lwc1 $f2, 0x80($s2) +/* ED1004 80241014 468010A0 */ cvt.s.w $f2, $f2 +/* ED1008 80241018 460010A1 */ cvt.d.s $f2, $f2 +/* ED100C 8024101C C6400084 */ lwc1 $f0, 0x84($s2) +/* ED1010 80241020 46800020 */ cvt.s.w $f0, $f0 +/* ED1014 80241024 46000021 */ cvt.d.s $f0, $f0 +/* ED1018 80241028 3C014059 */ lui $at, 0x4059 +/* ED101C 8024102C 44812800 */ mtc1 $at, $f5 +/* ED1020 80241030 44802000 */ mtc1 $zero, $f4 +/* ED1024 80241034 8E4200CC */ lw $v0, 0xcc($s2) +/* ED1028 80241038 C62C0038 */ lwc1 $f12, 0x38($s1) +/* ED102C 8024103C C62E0040 */ lwc1 $f14, 0x40($s1) +/* ED1030 80241040 46241083 */ div.d $f2, $f2, $f4 +/* ED1034 80241044 462010A0 */ cvt.s.d $f2, $f2 +/* ED1038 80241048 46240003 */ div.d $f0, $f0, $f4 +/* ED103C 8024104C 8C420020 */ lw $v0, 0x20($v0) +/* ED1040 80241050 46200020 */ cvt.s.d $f0, $f0 +/* ED1044 80241054 E622001C */ swc1 $f2, 0x1c($s1) +/* ED1048 80241058 E6200014 */ swc1 $f0, 0x14($s1) +/* ED104C 8024105C AE220028 */ sw $v0, 0x28($s1) +/* ED1050 80241060 C6000018 */ lwc1 $f0, 0x18($s0) +/* ED1054 80241064 3C028010 */ lui $v0, %hi(D_800FFC90) +/* ED1058 80241068 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* ED105C 8024106C E6200018 */ swc1 $f0, 0x18($s1) +/* ED1060 80241070 8C460028 */ lw $a2, 0x28($v0) +/* ED1064 80241074 0C00ABDC */ jal fio_validate_header_checksums +/* ED1068 80241078 8C470030 */ lw $a3, 0x30($v0) +/* ED106C 8024107C E620000C */ swc1 $f0, 0xc($s1) +/* ED1070 80241080 8E420018 */ lw $v0, 0x18($s2) +/* ED1074 80241084 AE400074 */ sw $zero, 0x74($s2) +/* ED1078 80241088 9442002A */ lhu $v0, 0x2a($v0) +/* ED107C 8024108C 30420002 */ andi $v0, $v0, 2 +/* ED1080 80241090 10400005 */ beqz $v0, .L802410A8 +/* ED1084 80241094 24020003 */ addiu $v0, $zero, 3 +/* ED1088 80241098 A622008E */ sh $v0, 0x8e($s1) +/* ED108C 8024109C 2402000D */ addiu $v0, $zero, 0xd +/* ED1090 802410A0 0809043E */ j .L802410F8 +/* ED1094 802410A4 AE620070 */ sw $v0, 0x70($s3) +.L802410A8: +/* ED1098 802410A8 24030001 */ addiu $v1, $zero, 1 +/* ED109C 802410AC 2402000E */ addiu $v0, $zero, 0xe +/* ED10A0 802410B0 A623008E */ sh $v1, 0x8e($s1) +/* ED10A4 802410B4 AE620070 */ sw $v0, 0x70($s3) +/* ED10A8 802410B8 C6200038 */ lwc1 $f0, 0x38($s1) +/* ED10AC 802410BC 4600018D */ trunc.w.s $f6, $f0 +/* ED10B0 802410C0 44023000 */ mfc1 $v0, $f6 +/* ED10B4 802410C4 00000000 */ nop +/* ED10B8 802410C8 A6420010 */ sh $v0, 0x10($s2) +/* ED10BC 802410CC C620003C */ lwc1 $f0, 0x3c($s1) +/* ED10C0 802410D0 4600018D */ trunc.w.s $f6, $f0 +/* ED10C4 802410D4 44023000 */ mfc1 $v0, $f6 +/* ED10C8 802410D8 00000000 */ nop +/* ED10CC 802410DC A6420012 */ sh $v0, 0x12($s2) +/* ED10D0 802410E0 C6200040 */ lwc1 $f0, 0x40($s1) +/* ED10D4 802410E4 A2430007 */ sb $v1, 7($s2) +/* ED10D8 802410E8 4600018D */ trunc.w.s $f6, $f0 +/* ED10DC 802410EC 44023000 */ mfc1 $v0, $f6 +/* ED10E0 802410F0 00000000 */ nop +/* ED10E4 802410F4 A6420014 */ sh $v0, 0x14($s2) +.L802410F8: +/* ED10E8 802410F8 8FBF0020 */ lw $ra, 0x20($sp) +/* ED10EC 802410FC 8FB3001C */ lw $s3, 0x1c($sp) +/* ED10F0 80241100 8FB20018 */ lw $s2, 0x18($sp) +/* ED10F4 80241104 8FB10014 */ lw $s1, 0x14($sp) +/* ED10F8 80241108 8FB00010 */ lw $s0, 0x10($sp) +/* ED10FC 8024110C 03E00008 */ jr $ra +/* ED1100 80241110 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_ED0310/func_80241114_ED1104.s b/asm/nonmatchings/code_ED0310/func_80241114_ED1104.s new file mode 100644 index 0000000000..208c73878d --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_80241114_ED1104.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241114_ED1104 +/* ED1104 80241114 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ED1108 80241118 AFB00010 */ sw $s0, 0x10($sp) +/* ED110C 8024111C 0080802D */ daddu $s0, $a0, $zero +/* ED1110 80241120 AFBF0014 */ sw $ra, 0x14($sp) +/* ED1114 80241124 8E020148 */ lw $v0, 0x148($s0) +/* ED1118 80241128 0C00F92F */ jal func_8003E4BC +/* ED111C 8024112C 84440008 */ lh $a0, 8($v0) +/* ED1120 80241130 0040202D */ daddu $a0, $v0, $zero +/* ED1124 80241134 8482008E */ lh $v0, 0x8e($a0) +/* ED1128 80241138 9483008E */ lhu $v1, 0x8e($a0) +/* ED112C 8024113C 18400005 */ blez $v0, .L80241154 +/* ED1130 80241140 2462FFFF */ addiu $v0, $v1, -1 +/* ED1134 80241144 A482008E */ sh $v0, 0x8e($a0) +/* ED1138 80241148 00021400 */ sll $v0, $v0, 0x10 +/* ED113C 8024114C 1C400006 */ bgtz $v0, .L80241168 +/* ED1140 80241150 00000000 */ nop +.L80241154: +/* ED1144 80241154 8482008C */ lh $v0, 0x8c($a0) +/* ED1148 80241158 14400003 */ bnez $v0, .L80241168 +/* ED114C 8024115C 2402000E */ addiu $v0, $zero, 0xe +/* ED1150 80241160 A480008E */ sh $zero, 0x8e($a0) +/* ED1154 80241164 AE020070 */ sw $v0, 0x70($s0) +.L80241168: +/* ED1158 80241168 8FBF0014 */ lw $ra, 0x14($sp) +/* ED115C 8024116C 8FB00010 */ lw $s0, 0x10($sp) +/* ED1160 80241170 03E00008 */ jr $ra +/* ED1164 80241174 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ED0310/func_80241178_ED1168.s b/asm/nonmatchings/code_ED0310/func_80241178_ED1168.s new file mode 100644 index 0000000000..f13c4e20fe --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_80241178_ED1168.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241178_ED1168 +/* ED1168 80241178 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* ED116C 8024117C AFB20030 */ sw $s2, 0x30($sp) +/* ED1170 80241180 0080902D */ daddu $s2, $a0, $zero +/* ED1174 80241184 AFBF0038 */ sw $ra, 0x38($sp) +/* ED1178 80241188 AFB30034 */ sw $s3, 0x34($sp) +/* ED117C 8024118C AFB1002C */ sw $s1, 0x2c($sp) +/* ED1180 80241190 AFB00028 */ sw $s0, 0x28($sp) +/* ED1184 80241194 F7B60048 */ sdc1 $f22, 0x48($sp) +/* ED1188 80241198 F7B40040 */ sdc1 $f20, 0x40($sp) +/* ED118C 8024119C 8E510148 */ lw $s1, 0x148($s2) +/* ED1190 802411A0 86240008 */ lh $a0, 8($s1) +/* ED1194 802411A4 0C00F92F */ jal func_8003E4BC +/* ED1198 802411A8 00A0982D */ daddu $s3, $a1, $zero +/* ED119C 802411AC 0040802D */ daddu $s0, $v0, $zero +/* ED11A0 802411B0 0200202D */ daddu $a0, $s0, $zero +/* ED11A4 802411B4 C6220088 */ lwc1 $f2, 0x88($s1) +/* ED11A8 802411B8 468010A0 */ cvt.s.w $f2, $f2 +/* ED11AC 802411BC 460010A1 */ cvt.d.s $f2, $f2 +/* ED11B0 802411C0 C604001C */ lwc1 $f4, 0x1c($s0) +/* ED11B4 802411C4 C6000014 */ lwc1 $f0, 0x14($s0) +/* ED11B8 802411C8 8E050018 */ lw $a1, 0x18($s0) +/* ED11BC 802411CC 46002100 */ add.s $f4, $f4, $f0 +/* ED11C0 802411D0 8E06000C */ lw $a2, 0xc($s0) +/* ED11C4 802411D4 C6200078 */ lwc1 $f0, 0x78($s1) +/* ED11C8 802411D8 46800020 */ cvt.s.w $f0, $f0 +/* ED11CC 802411DC E604001C */ swc1 $f4, 0x1c($s0) +/* ED11D0 802411E0 3C014059 */ lui $at, 0x4059 +/* ED11D4 802411E4 44812800 */ mtc1 $at, $f5 +/* ED11D8 802411E8 44802000 */ mtc1 $zero, $f4 +/* ED11DC 802411EC 46000021 */ cvt.d.s $f0, $f0 +/* ED11E0 802411F0 46240003 */ div.d $f0, $f0, $f4 +/* ED11E4 802411F4 46200520 */ cvt.s.d $f20, $f0 +/* ED11E8 802411F8 46241083 */ div.d $f2, $f2, $f4 +/* ED11EC 802411FC 0C00F909 */ jal func_8003E424 +/* ED11F0 80241200 462015A0 */ cvt.s.d $f22, $f2 +/* ED11F4 80241204 C604001C */ lwc1 $f4, 0x1c($s0) +/* ED11F8 80241208 44801000 */ mtc1 $zero, $f2 +/* ED11FC 8024120C 44801800 */ mtc1 $zero, $f3 +/* ED1200 80241210 46002021 */ cvt.d.s $f0, $f4 +/* ED1204 80241214 4620103E */ c.le.d $f2, $f0 +/* ED1208 80241218 00000000 */ nop +/* ED120C 8024121C 45000030 */ bc1f .L802412E0 +/* ED1210 80241220 00000000 */ nop +/* ED1214 80241224 C600003C */ lwc1 $f0, 0x3c($s0) +/* ED1218 80241228 46040000 */ add.s $f0, $f0, $f4 +/* ED121C 8024122C E600003C */ swc1 $f0, 0x3c($s0) +/* ED1220 80241230 8E2200CC */ lw $v0, 0xcc($s1) +/* ED1224 80241234 8C420024 */ lw $v0, 0x24($v0) +/* ED1228 80241238 AE020028 */ sw $v0, 0x28($s0) +/* ED122C 8024123C A2200007 */ sb $zero, 7($s1) +/* ED1230 80241240 8E020000 */ lw $v0, ($s0) +/* ED1234 80241244 30420008 */ andi $v0, $v0, 8 +/* ED1238 80241248 14400011 */ bnez $v0, .L80241290 +/* ED123C 8024124C 0000102D */ daddu $v0, $zero, $zero +/* ED1240 80241250 27A50018 */ addiu $a1, $sp, 0x18 +/* ED1244 80241254 27A6001C */ addiu $a2, $sp, 0x1c +/* ED1248 80241258 C6000038 */ lwc1 $f0, 0x38($s0) +/* ED124C 8024125C C602003C */ lwc1 $f2, 0x3c($s0) +/* ED1250 80241260 C6040040 */ lwc1 $f4, 0x40($s0) +/* ED1254 80241264 3C01447A */ lui $at, 0x447a +/* ED1258 80241268 44813000 */ mtc1 $at, $f6 +/* ED125C 8024126C 27A20024 */ addiu $v0, $sp, 0x24 +/* ED1260 80241270 E7A00018 */ swc1 $f0, 0x18($sp) +/* ED1264 80241274 E7A2001C */ swc1 $f2, 0x1c($sp) +/* ED1268 80241278 E7A40020 */ swc1 $f4, 0x20($sp) +/* ED126C 8024127C E7A60024 */ swc1 $f6, 0x24($sp) +/* ED1270 80241280 AFA20010 */ sw $v0, 0x10($sp) +/* ED1274 80241284 8E040080 */ lw $a0, 0x80($s0) +/* ED1278 80241288 0C03908F */ jal func_800E423C +/* ED127C 8024128C 27A70020 */ addiu $a3, $sp, 0x20 +.L80241290: +/* ED1280 80241290 1040000B */ beqz $v0, .L802412C0 +/* ED1284 80241294 00000000 */ nop +/* ED1288 80241298 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* ED128C 8024129C 46140080 */ add.s $f2, $f0, $f20 +/* ED1290 802412A0 C600003C */ lwc1 $f0, 0x3c($s0) +/* ED1294 802412A4 4600103E */ c.le.s $f2, $f0 +/* ED1298 802412A8 00000000 */ nop +/* ED129C 802412AC 4500008D */ bc1f .L802414E4 +/* ED12A0 802412B0 00000000 */ nop +/* ED12A4 802412B4 E602003C */ swc1 $f2, 0x3c($s0) +/* ED12A8 802412B8 08090539 */ j .L802414E4 +/* ED12AC 802412BC AE400070 */ sw $zero, 0x70($s2) +.L802412C0: +/* ED12B0 802412C0 C602003C */ lwc1 $f2, 0x3c($s0) +/* ED12B4 802412C4 C6000064 */ lwc1 $f0, 0x64($s0) +/* ED12B8 802412C8 4602003E */ c.le.s $f0, $f2 +/* ED12BC 802412CC 00000000 */ nop +/* ED12C0 802412D0 45030084 */ bc1tl .L802414E4 +/* ED12C4 802412D4 AE400070 */ sw $zero, 0x70($s2) +/* ED12C8 802412D8 08090539 */ j .L802414E4 +/* ED12CC 802412DC 00000000 */ nop +.L802412E0: +/* ED12D0 802412E0 4622003C */ c.lt.d $f0, $f2 +/* ED12D4 802412E4 00000000 */ nop +/* ED12D8 802412E8 4500007E */ bc1f .L802414E4 +/* ED12DC 802412EC 00000000 */ nop +/* ED12E0 802412F0 9602008E */ lhu $v0, 0x8e($s0) +/* ED12E4 802412F4 24420001 */ addiu $v0, $v0, 1 +/* ED12E8 802412F8 A602008E */ sh $v0, 0x8e($s0) +/* ED12EC 802412FC 00021400 */ sll $v0, $v0, 0x10 +/* ED12F0 80241300 8E630020 */ lw $v1, 0x20($s3) +/* ED12F4 80241304 00021403 */ sra $v0, $v0, 0x10 +/* ED12F8 80241308 0043102A */ slt $v0, $v0, $v1 +/* ED12FC 8024130C 14400026 */ bnez $v0, .L802413A8 +/* ED1300 80241310 00000000 */ nop +/* ED1304 80241314 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ED1308 80241318 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ED130C 8024131C 3C028010 */ lui $v0, %hi(D_800FFC90) +/* ED1310 80241320 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* ED1314 80241324 A600008E */ sh $zero, 0x8e($s0) +/* ED1318 80241328 8C460028 */ lw $a2, 0x28($v0) +/* ED131C 8024132C 0C00ABDC */ jal fio_validate_header_checksums +/* ED1320 80241330 8C470030 */ lw $a3, 0x30($v0) +/* ED1324 80241334 46000506 */ mov.s $f20, $f0 +/* ED1328 80241338 C60C000C */ lwc1 $f12, 0xc($s0) +/* ED132C 8024133C 0C00ABC6 */ jal func_8002AF18 +/* ED1330 80241340 4600A386 */ mov.s $f14, $f20 +/* ED1334 80241344 46000086 */ mov.s $f2, $f0 +/* ED1338 80241348 8E62001C */ lw $v0, 0x1c($s3) +/* ED133C 8024134C 46001005 */ abs.s $f0, $f2 +/* ED1340 80241350 44822000 */ mtc1 $v0, $f4 +/* ED1344 80241354 00000000 */ nop +/* ED1348 80241358 46802120 */ cvt.s.w $f4, $f4 +/* ED134C 8024135C 4600203C */ c.lt.s $f4, $f0 +/* ED1350 80241360 00000000 */ nop +/* ED1354 80241364 4500000D */ bc1f .L8024139C +/* ED1358 80241368 00000000 */ nop +/* ED135C 8024136C 44800000 */ mtc1 $zero, $f0 +/* ED1360 80241370 C614000C */ lwc1 $f20, 0xc($s0) +/* ED1364 80241374 4600103C */ c.lt.s $f2, $f0 +/* ED1368 80241378 00000000 */ nop +/* ED136C 8024137C 45000006 */ bc1f .L80241398 +/* ED1370 80241380 00021023 */ negu $v0, $v0 +/* ED1374 80241384 44820000 */ mtc1 $v0, $f0 +/* ED1378 80241388 00000000 */ nop +/* ED137C 8024138C 46800020 */ cvt.s.w $f0, $f0 +/* ED1380 80241390 080904E7 */ j .L8024139C +/* ED1384 80241394 4600A500 */ add.s $f20, $f20, $f0 +.L80241398: +/* ED1388 80241398 4604A500 */ add.s $f20, $f20, $f4 +.L8024139C: +/* ED138C 8024139C 0C00AB85 */ jal func_8002AE14 +/* ED1390 802413A0 4600A306 */ mov.s $f12, $f20 +/* ED1394 802413A4 E600000C */ swc1 $f0, 0xc($s0) +.L802413A8: +/* ED1398 802413A8 8E020000 */ lw $v0, ($s0) +/* ED139C 802413AC 30420008 */ andi $v0, $v0, 8 +/* ED13A0 802413B0 1040000A */ beqz $v0, .L802413DC +/* ED13A4 802413B4 27A50018 */ addiu $a1, $sp, 0x18 +/* ED13A8 802413B8 C602003C */ lwc1 $f2, 0x3c($s0) +/* ED13AC 802413BC C600001C */ lwc1 $f0, 0x1c($s0) +/* ED13B0 802413C0 46001080 */ add.s $f2, $f2, $f0 +/* ED13B4 802413C4 4616103C */ c.lt.s $f2, $f22 +/* ED13B8 802413C8 00000000 */ nop +/* ED13BC 802413CC 45020045 */ bc1fl .L802414E4 +/* ED13C0 802413D0 E602003C */ swc1 $f2, 0x3c($s0) +/* ED13C4 802413D4 08090538 */ j .L802414E0 +/* ED13C8 802413D8 E616003C */ swc1 $f22, 0x3c($s0) +.L802413DC: +/* ED13CC 802413DC C6000038 */ lwc1 $f0, 0x38($s0) +/* ED13D0 802413E0 27A6001C */ addiu $a2, $sp, 0x1c +/* ED13D4 802413E4 E7A00018 */ swc1 $f0, 0x18($sp) +/* ED13D8 802413E8 860200A8 */ lh $v0, 0xa8($s0) +/* ED13DC 802413EC C600001C */ lwc1 $f0, 0x1c($s0) +/* ED13E0 802413F0 C604003C */ lwc1 $f4, 0x3c($s0) +/* ED13E4 802413F4 44821000 */ mtc1 $v0, $f2 +/* ED13E8 802413F8 00000000 */ nop +/* ED13EC 802413FC 468010A0 */ cvt.s.w $f2, $f2 +/* ED13F0 80241400 46000005 */ abs.s $f0, $f0 +/* ED13F4 80241404 46020000 */ add.s $f0, $f0, $f2 +/* ED13F8 80241408 C6060040 */ lwc1 $f6, 0x40($s0) +/* ED13FC 8024140C 27A20024 */ addiu $v0, $sp, 0x24 +/* ED1400 80241410 46022100 */ add.s $f4, $f4, $f2 +/* ED1404 80241414 3C014024 */ lui $at, 0x4024 +/* ED1408 80241418 44811800 */ mtc1 $at, $f3 +/* ED140C 8024141C 44801000 */ mtc1 $zero, $f2 +/* ED1410 80241420 46000021 */ cvt.d.s $f0, $f0 +/* ED1414 80241424 46220000 */ add.d $f0, $f0, $f2 +/* ED1418 80241428 E7A60020 */ swc1 $f6, 0x20($sp) +/* ED141C 8024142C E7A4001C */ swc1 $f4, 0x1c($sp) +/* ED1420 80241430 46200020 */ cvt.s.d $f0, $f0 +/* ED1424 80241434 E7A00024 */ swc1 $f0, 0x24($sp) +/* ED1428 80241438 AFA20010 */ sw $v0, 0x10($sp) +/* ED142C 8024143C 8E040080 */ lw $a0, 0x80($s0) +/* ED1430 80241440 0C03908F */ jal func_800E423C +/* ED1434 80241444 27A70020 */ addiu $a3, $sp, 0x20 +/* ED1438 80241448 10400015 */ beqz $v0, .L802414A0 +/* ED143C 8024144C 00000000 */ nop +/* ED1440 80241450 860200A8 */ lh $v0, 0xa8($s0) +/* ED1444 80241454 C604001C */ lwc1 $f4, 0x1c($s0) +/* ED1448 80241458 44820000 */ mtc1 $v0, $f0 +/* ED144C 8024145C 00000000 */ nop +/* ED1450 80241460 46800020 */ cvt.s.w $f0, $f0 +/* ED1454 80241464 46002085 */ abs.s $f2, $f4 +/* ED1458 80241468 46020000 */ add.s $f0, $f0, $f2 +/* ED145C 8024146C C7A20024 */ lwc1 $f2, 0x24($sp) +/* ED1460 80241470 4600103E */ c.le.s $f2, $f0 +/* ED1464 80241474 00000000 */ nop +/* ED1468 80241478 45000005 */ bc1f .L80241490 +/* ED146C 8024147C 00000000 */ nop +/* ED1470 80241480 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* ED1474 80241484 AE00001C */ sw $zero, 0x1c($s0) +/* ED1478 80241488 08090539 */ j .L802414E4 +/* ED147C 8024148C E600003C */ swc1 $f0, 0x3c($s0) +.L80241490: +/* ED1480 80241490 C600003C */ lwc1 $f0, 0x3c($s0) +/* ED1484 80241494 46040000 */ add.s $f0, $f0, $f4 +/* ED1488 80241498 08090539 */ j .L802414E4 +/* ED148C 8024149C E600003C */ swc1 $f0, 0x3c($s0) +.L802414A0: +/* ED1490 802414A0 C606003C */ lwc1 $f6, 0x3c($s0) +/* ED1494 802414A4 860200A8 */ lh $v0, 0xa8($s0) +/* ED1498 802414A8 46163081 */ sub.s $f2, $f6, $f22 +/* ED149C 802414AC 44820000 */ mtc1 $v0, $f0 +/* ED14A0 802414B0 00000000 */ nop +/* ED14A4 802414B4 46800020 */ cvt.s.w $f0, $f0 +/* ED14A8 802414B8 46001080 */ add.s $f2, $f2, $f0 +/* ED14AC 802414BC C604001C */ lwc1 $f4, 0x1c($s0) +/* ED14B0 802414C0 46002005 */ abs.s $f0, $f4 +/* ED14B4 802414C4 4602003C */ c.lt.s $f0, $f2 +/* ED14B8 802414C8 00000000 */ nop +/* ED14BC 802414CC 45020005 */ bc1fl .L802414E4 +/* ED14C0 802414D0 AE00001C */ sw $zero, 0x1c($s0) +/* ED14C4 802414D4 46043000 */ add.s $f0, $f6, $f4 +/* ED14C8 802414D8 08090539 */ j .L802414E4 +/* ED14CC 802414DC E600003C */ swc1 $f0, 0x3c($s0) +.L802414E0: +/* ED14D0 802414E0 AE00001C */ sw $zero, 0x1c($s0) +.L802414E4: +/* ED14D4 802414E4 8FBF0038 */ lw $ra, 0x38($sp) +/* ED14D8 802414E8 8FB30034 */ lw $s3, 0x34($sp) +/* ED14DC 802414EC 8FB20030 */ lw $s2, 0x30($sp) +/* ED14E0 802414F0 8FB1002C */ lw $s1, 0x2c($sp) +/* ED14E4 802414F4 8FB00028 */ lw $s0, 0x28($sp) +/* ED14E8 802414F8 D7B60048 */ ldc1 $f22, 0x48($sp) +/* ED14EC 802414FC D7B40040 */ ldc1 $f20, 0x40($sp) +/* ED14F0 80241500 03E00008 */ jr $ra +/* ED14F4 80241504 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_ED0310/func_80241508_ED14F8.s b/asm/nonmatchings/code_ED0310/func_80241508_ED14F8.s new file mode 100644 index 0000000000..72d0d93c02 --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_80241508_ED14F8.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241508_ED14F8 +/* ED14F8 80241508 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* ED14FC 8024150C AFB00028 */ sw $s0, 0x28($sp) +/* ED1500 80241510 00A0802D */ daddu $s0, $a1, $zero +/* ED1504 80241514 AFB1002C */ sw $s1, 0x2c($sp) +/* ED1508 80241518 00C0882D */ daddu $s1, $a2, $zero +/* ED150C 8024151C AFBF0034 */ sw $ra, 0x34($sp) +/* ED1510 80241520 AFB20030 */ sw $s2, 0x30($sp) +/* ED1514 80241524 AE200070 */ sw $zero, 0x70($s1) +/* ED1518 80241528 8C830000 */ lw $v1, ($a0) +/* ED151C 8024152C 2402FDFF */ addiu $v0, $zero, -0x201 +/* ED1520 80241530 A480008E */ sh $zero, 0x8e($a0) +/* ED1524 80241534 00621824 */ and $v1, $v1, $v0 +/* ED1528 80241538 34650800 */ ori $a1, $v1, 0x800 +/* ED152C 8024153C AC850000 */ sw $a1, ($a0) +/* ED1530 80241540 8E0200D0 */ lw $v0, 0xd0($s0) +/* ED1534 80241544 8C420034 */ lw $v0, 0x34($v0) +/* ED1538 80241548 10400003 */ beqz $v0, .L80241558 +/* ED153C 8024154C 00E0902D */ daddu $s2, $a3, $zero +/* ED1540 80241550 08090558 */ j .L80241560 +/* ED1544 80241554 34620808 */ ori $v0, $v1, 0x808 +.L80241558: +/* ED1548 80241558 2402FFF7 */ addiu $v0, $zero, -9 +/* ED154C 8024155C 00A21024 */ and $v0, $a1, $v0 +.L80241560: +/* ED1550 80241560 AC820000 */ sw $v0, ($a0) +/* ED1554 80241564 27A20024 */ addiu $v0, $sp, 0x24 +/* ED1558 80241568 27A50018 */ addiu $a1, $sp, 0x18 +/* ED155C 8024156C C4800038 */ lwc1 $f0, 0x38($a0) +/* ED1560 80241570 C482003C */ lwc1 $f2, 0x3c($a0) +/* ED1564 80241574 C4840040 */ lwc1 $f4, 0x40($a0) +/* ED1568 80241578 3C01447A */ lui $at, 0x447a +/* ED156C 8024157C 44813000 */ mtc1 $at, $f6 +/* ED1570 80241580 27A6001C */ addiu $a2, $sp, 0x1c +/* ED1574 80241584 E7A00018 */ swc1 $f0, 0x18($sp) +/* ED1578 80241588 E7A2001C */ swc1 $f2, 0x1c($sp) +/* ED157C 8024158C E7A40020 */ swc1 $f4, 0x20($sp) +/* ED1580 80241590 E7A60024 */ swc1 $f6, 0x24($sp) +/* ED1584 80241594 AFA20010 */ sw $v0, 0x10($sp) +/* ED1588 80241598 8C840080 */ lw $a0, 0x80($a0) +/* ED158C 8024159C 0C03908F */ jal func_800E423C +/* ED1590 802415A0 27A70020 */ addiu $a3, $sp, 0x20 +/* ED1594 802415A4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* ED1598 802415A8 3C014059 */ lui $at, 0x4059 +/* ED159C 802415AC 44812800 */ mtc1 $at, $f5 +/* ED15A0 802415B0 44802000 */ mtc1 $zero, $f4 +/* ED15A4 802415B4 460010A1 */ cvt.d.s $f2, $f2 +/* ED15A8 802415B8 46241082 */ mul.d $f2, $f2, $f4 +/* ED15AC 802415BC 00000000 */ nop +/* ED15B0 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* ED15B4 802415C4 46000021 */ cvt.d.s $f0, $f0 +/* ED15B8 802415C8 46240002 */ mul.d $f0, $f0, $f4 +/* ED15BC 802415CC 00000000 */ nop +/* ED15C0 802415D0 3C013FE0 */ lui $at, 0x3fe0 +/* ED15C4 802415D4 44812800 */ mtc1 $at, $f5 +/* ED15C8 802415D8 44802000 */ mtc1 $zero, $f4 +/* ED15CC 802415DC 00000000 */ nop +/* ED15D0 802415E0 46241080 */ add.d $f2, $f2, $f4 +/* ED15D4 802415E4 AE000074 */ sw $zero, 0x74($s0) +/* ED15D8 802415E8 46240000 */ add.d $f0, $f0, $f4 +/* ED15DC 802415EC AE000090 */ sw $zero, 0x90($s0) +/* ED15E0 802415F0 4620120D */ trunc.w.d $f8, $f2 +/* ED15E4 802415F4 E6080078 */ swc1 $f8, 0x78($s0) +/* ED15E8 802415F8 4620020D */ trunc.w.d $f8, $f0 +/* ED15EC 802415FC E6080088 */ swc1 $f8, 0x88($s0) +/* ED15F0 80241600 8E420014 */ lw $v0, 0x14($s2) +/* ED15F4 80241604 AE220074 */ sw $v0, 0x74($s1) +/* ED15F8 80241608 8E0200B0 */ lw $v0, 0xb0($s0) +/* ED15FC 8024160C 34420010 */ ori $v0, $v0, 0x10 +/* ED1600 80241610 AE0200B0 */ sw $v0, 0xb0($s0) +/* ED1604 80241614 8FBF0034 */ lw $ra, 0x34($sp) +/* ED1608 80241618 8FB20030 */ lw $s2, 0x30($sp) +/* ED160C 8024161C 8FB1002C */ lw $s1, 0x2c($sp) +/* ED1610 80241620 8FB00028 */ lw $s0, 0x28($sp) +/* ED1614 80241624 03E00008 */ jr $ra +/* ED1618 80241628 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s b/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s new file mode 100644 index 0000000000..91796ca693 --- /dev/null +++ b/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s @@ -0,0 +1,145 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024162C_ED161C +/* ED161C 8024162C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* ED1620 80241630 AFB50044 */ sw $s5, 0x44($sp) +/* ED1624 80241634 0080A82D */ daddu $s5, $a0, $zero +/* ED1628 80241638 AFBF0048 */ sw $ra, 0x48($sp) +/* ED162C 8024163C AFB40040 */ sw $s4, 0x40($sp) +/* ED1630 80241640 AFB3003C */ sw $s3, 0x3c($sp) +/* ED1634 80241644 AFB20038 */ sw $s2, 0x38($sp) +/* ED1638 80241648 AFB10034 */ sw $s1, 0x34($sp) +/* ED163C 8024164C AFB00030 */ sw $s0, 0x30($sp) +/* ED1640 80241650 8EB20148 */ lw $s2, 0x148($s5) +/* ED1644 80241654 86440008 */ lh $a0, 8($s2) +/* ED1648 80241658 8EB0000C */ lw $s0, 0xc($s5) +/* ED164C 8024165C 0C00F92F */ jal func_8003E4BC +/* ED1650 80241660 00A0882D */ daddu $s1, $a1, $zero +/* ED1654 80241664 02A0202D */ daddu $a0, $s5, $zero +/* ED1658 80241668 8E050000 */ lw $a1, ($s0) +/* ED165C 8024166C 0C0B53A3 */ jal func_802D4E8C +/* ED1660 80241670 0040A02D */ daddu $s4, $v0, $zero +/* ED1664 80241674 AFA00010 */ sw $zero, 0x10($sp) +/* ED1668 80241678 8E4300D0 */ lw $v1, 0xd0($s2) +/* ED166C 8024167C 8C630030 */ lw $v1, 0x30($v1) +/* ED1670 80241680 AFA30014 */ sw $v1, 0x14($sp) +/* ED1674 80241684 8E4300D0 */ lw $v1, 0xd0($s2) +/* ED1678 80241688 8C63001C */ lw $v1, 0x1c($v1) +/* ED167C 8024168C AFA30018 */ sw $v1, 0x18($sp) +/* ED1680 80241690 8E4300D0 */ lw $v1, 0xd0($s2) +/* ED1684 80241694 8C630024 */ lw $v1, 0x24($v1) +/* ED1688 80241698 AFA3001C */ sw $v1, 0x1c($sp) +/* ED168C 8024169C 8E4300D0 */ lw $v1, 0xd0($s2) +/* ED1690 802416A0 8C630028 */ lw $v1, 0x28($v1) +/* ED1694 802416A4 AFA30020 */ sw $v1, 0x20($sp) +/* ED1698 802416A8 8E4300D0 */ lw $v1, 0xd0($s2) +/* ED169C 802416AC 3C0142F0 */ lui $at, 0x42f0 +/* ED16A0 802416B0 44810000 */ mtc1 $at, $f0 +/* ED16A4 802416B4 8C63002C */ lw $v1, 0x2c($v1) +/* ED16A8 802416B8 E7A00028 */ swc1 $f0, 0x28($sp) +/* ED16AC 802416BC A7A0002C */ sh $zero, 0x2c($sp) +/* ED16B0 802416C0 AFA30024 */ sw $v1, 0x24($sp) +/* ED16B4 802416C4 C6800038 */ lwc1 $f0, 0x38($s4) +/* ED16B8 802416C8 E6400108 */ swc1 $f0, 0x108($s2) +/* ED16BC 802416CC C680003C */ lwc1 $f0, 0x3c($s4) +/* ED16C0 802416D0 27B30010 */ addiu $s3, $sp, 0x10 +/* ED16C4 802416D4 E640010C */ swc1 $f0, 0x10c($s2) +/* ED16C8 802416D8 3C0138D1 */ lui $at, 0x38d1 +/* ED16CC 802416DC 3421B717 */ ori $at, $at, 0xb717 +/* ED16D0 802416E0 44810000 */ mtc1 $at, $f0 +/* ED16D4 802416E4 C6820040 */ lwc1 $f2, 0x40($s4) +/* ED16D8 802416E8 0040802D */ daddu $s0, $v0, $zero +/* ED16DC 802416EC E6400114 */ swc1 $f0, 0x114($s2) +/* ED16E0 802416F0 E6400118 */ swc1 $f0, 0x118($s2) +/* ED16E4 802416F4 12200006 */ beqz $s1, .L80241710 +/* ED16E8 802416F8 E6420110 */ swc1 $f2, 0x110($s2) +/* ED16EC 802416FC 0280202D */ daddu $a0, $s4, $zero +/* ED16F0 80241700 0240282D */ daddu $a1, $s2, $zero +/* ED16F4 80241704 02A0302D */ daddu $a2, $s5, $zero +/* ED16F8 80241708 0C090542 */ jal func_80241508_ED14F8 +/* ED16FC 8024170C 0200382D */ daddu $a3, $s0, $zero +.L80241710: +/* ED1700 80241710 2402FFFE */ addiu $v0, $zero, -2 +/* ED1704 80241714 A28200AB */ sb $v0, 0xab($s4) +/* ED1708 80241718 8E4300B0 */ lw $v1, 0xb0($s2) +/* ED170C 8024171C 30620004 */ andi $v0, $v1, 4 +/* ED1710 80241720 10400007 */ beqz $v0, .L80241740 +/* ED1714 80241724 00000000 */ nop +/* ED1718 80241728 824200B4 */ lb $v0, 0xb4($s2) +/* ED171C 8024172C 1440003C */ bnez $v0, .L80241820 +/* ED1720 80241730 0000102D */ daddu $v0, $zero, $zero +/* ED1724 80241734 2402FFFB */ addiu $v0, $zero, -5 +/* ED1728 80241738 00621024 */ and $v0, $v1, $v0 +/* ED172C 8024173C AE4200B0 */ sw $v0, 0xb0($s2) +.L80241740: +/* ED1730 80241740 8EA30070 */ lw $v1, 0x70($s5) +/* ED1734 80241744 2C62000F */ sltiu $v0, $v1, 0xf +/* ED1738 80241748 10400034 */ beqz $v0, .L8024181C +/* ED173C 8024174C 00031080 */ sll $v0, $v1, 2 +/* ED1740 80241750 3C018024 */ lui $at, %hi(D_802441E8) +/* ED1744 80241754 00220821 */ addu $at, $at, $v0 +/* ED1748 80241758 8C2241E8 */ lw $v0, %lo(D_802441E8)($at) +/* ED174C 8024175C 00400008 */ jr $v0 +/* ED1750 80241760 00000000 */ nop +/* ED1754 80241764 02A0202D */ daddu $a0, $s5, $zero +/* ED1758 80241768 0200282D */ daddu $a1, $s0, $zero +/* ED175C 8024176C 0C0900C8 */ jal func_80240320_ED0310 +/* ED1760 80241770 0260302D */ daddu $a2, $s3, $zero +/* ED1764 80241774 02A0202D */ daddu $a0, $s5, $zero +/* ED1768 80241778 0200282D */ daddu $a1, $s0, $zero +/* ED176C 8024177C 0C090134 */ jal func_802404D0_ED04C0 +/* ED1770 80241780 0260302D */ daddu $a2, $s3, $zero +/* ED1774 80241784 08090608 */ j .L80241820 +/* ED1778 80241788 0000102D */ daddu $v0, $zero, $zero +/* ED177C 8024178C 02A0202D */ daddu $a0, $s5, $zero +/* ED1780 80241790 0200282D */ daddu $a1, $s0, $zero +/* ED1784 80241794 0C0902BE */ jal func_80240AF8_ED0AE8 +/* ED1788 80241798 0260302D */ daddu $a2, $s3, $zero +/* ED178C 8024179C 02A0202D */ daddu $a0, $s5, $zero +/* ED1790 802417A0 0200282D */ daddu $a1, $s0, $zero +/* ED1794 802417A4 0C0902EE */ jal func_80240BB8_ED0BA8 +/* ED1798 802417A8 0260302D */ daddu $a2, $s3, $zero +/* ED179C 802417AC 08090608 */ j .L80241820 +/* ED17A0 802417B0 0000102D */ daddu $v0, $zero, $zero +/* ED17A4 802417B4 02A0202D */ daddu $a0, $s5, $zero +/* ED17A8 802417B8 0200282D */ daddu $a1, $s0, $zero +/* ED17AC 802417BC 0C0903BF */ jal func_80240EFC_ED0EEC +/* ED17B0 802417C0 0260302D */ daddu $a2, $s3, $zero +/* ED17B4 802417C4 02A0202D */ daddu $a0, $s5, $zero +/* ED17B8 802417C8 0200282D */ daddu $a1, $s0, $zero +/* ED17BC 802417CC 0C0903DD */ jal func_80240F74_ED0F64 +/* ED17C0 802417D0 0260302D */ daddu $a2, $s3, $zero +/* ED17C4 802417D4 08090608 */ j .L80241820 +/* ED17C8 802417D8 0000102D */ daddu $v0, $zero, $zero +/* ED17CC 802417DC 02A0202D */ daddu $a0, $s5, $zero +/* ED17D0 802417E0 0200282D */ daddu $a1, $s0, $zero +/* ED17D4 802417E4 0C0903F8 */ jal func_80240FE0_ED0FD0 +/* ED17D8 802417E8 0260302D */ daddu $a2, $s3, $zero +/* ED17DC 802417EC 08090608 */ j .L80241820 +/* ED17E0 802417F0 0000102D */ daddu $v0, $zero, $zero +/* ED17E4 802417F4 02A0202D */ daddu $a0, $s5, $zero +/* ED17E8 802417F8 0200282D */ daddu $a1, $s0, $zero +/* ED17EC 802417FC 0C090445 */ jal func_80241114_ED1104 +/* ED17F0 80241800 0260302D */ daddu $a2, $s3, $zero +/* ED17F4 80241804 08090608 */ j .L80241820 +/* ED17F8 80241808 0000102D */ daddu $v0, $zero, $zero +/* ED17FC 8024180C 02A0202D */ daddu $a0, $s5, $zero +/* ED1800 80241810 0200282D */ daddu $a1, $s0, $zero +/* ED1804 80241814 0C09045E */ jal func_80241178_ED1168 +/* ED1808 80241818 0260302D */ daddu $a2, $s3, $zero +.L8024181C: +/* ED180C 8024181C 0000102D */ daddu $v0, $zero, $zero +.L80241820: +/* ED1810 80241820 8FBF0048 */ lw $ra, 0x48($sp) +/* ED1814 80241824 8FB50044 */ lw $s5, 0x44($sp) +/* ED1818 80241828 8FB40040 */ lw $s4, 0x40($sp) +/* ED181C 8024182C 8FB3003C */ lw $s3, 0x3c($sp) +/* ED1820 80241830 8FB20038 */ lw $s2, 0x38($sp) +/* ED1824 80241834 8FB10034 */ lw $s1, 0x34($sp) +/* ED1828 80241838 8FB00030 */ lw $s0, 0x30($sp) +/* ED182C 8024183C 03E00008 */ jr $ra +/* ED1830 80241840 27BD0050 */ addiu $sp, $sp, 0x50 +/* ED1834 80241844 00000000 */ nop +/* ED1838 80241848 00000000 */ nop +/* ED183C 8024184C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED4220/func_80240000_ED4220.s b/asm/nonmatchings/code_ED4220/func_80240000_ED4220.s new file mode 100644 index 0000000000..f8e1bb04de --- /dev/null +++ b/asm/nonmatchings/code_ED4220/func_80240000_ED4220.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_ED4220 +/* ED4220 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ED4224 80240004 AFBF0010 */ sw $ra, 0x10($sp) +/* ED4228 80240008 3C05F5DE */ lui $a1, 0xf5de +/* ED422C 8024000C 34A50180 */ ori $a1, $a1, 0x180 +/* ED4230 80240010 0C0B53A3 */ jal func_802D4E8C +/* ED4234 80240014 0000202D */ daddu $a0, $zero, $zero +/* ED4238 80240018 28430031 */ slti $v1, $v0, 0x31 +/* ED423C 8024001C 3C020019 */ lui $v0, 0x19 +/* ED4240 80240020 14600003 */ bnez $v1, .L80240030 +/* ED4244 80240024 34420119 */ ori $v0, $v0, 0x119 +/* ED4248 80240028 3C020019 */ lui $v0, 0x19 +/* ED424C 8024002C 3442011A */ ori $v0, $v0, 0x11a +.L80240030: +/* ED4250 80240030 8FBF0010 */ lw $ra, 0x10($sp) +/* ED4254 80240034 03E00008 */ jr $ra +/* ED4258 80240038 27BD0018 */ addiu $sp, $sp, 0x18 +/* ED425C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED4260/func_80240040_ED4260.s b/asm/nonmatchings/code_ED4260/func_80240040_ED4260.s new file mode 100644 index 0000000000..966950ed24 --- /dev/null +++ b/asm/nonmatchings/code_ED4260/func_80240040_ED4260.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240040_ED4260 +/* ED4260 80240040 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ED4264 80240044 24040001 */ addiu $a0, $zero, 1 +/* ED4268 80240048 0000282D */ daddu $a1, $zero, $zero +/* ED426C 8024004C 00A0302D */ daddu $a2, $a1, $zero +/* ED4270 80240050 00A0382D */ daddu $a3, $a1, $zero +/* ED4274 80240054 AFBF0018 */ sw $ra, 0x18($sp) +/* ED4278 80240058 AFA00010 */ sw $zero, 0x10($sp) +/* ED427C 8024005C 0C01DEF4 */ jal func_80077BD0 +/* ED4280 80240060 AFA00014 */ sw $zero, 0x14($sp) +/* ED4284 80240064 8FBF0018 */ lw $ra, 0x18($sp) +/* ED4288 80240068 24020002 */ addiu $v0, $zero, 2 +/* ED428C 8024006C 03E00008 */ jr $ra +/* ED4290 80240070 27BD0020 */ addiu $sp, $sp, 0x20 +/* ED4294 80240074 00000000 */ nop +/* ED4298 80240078 00000000 */ nop +/* ED429C 8024007C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED42A0/func_80240080_ED42A0.s b/asm/nonmatchings/code_ED42A0/func_80240080_ED42A0.s new file mode 100644 index 0000000000..1f88e408dd --- /dev/null +++ b/asm/nonmatchings/code_ED42A0/func_80240080_ED42A0.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240080_ED42A0 +/* ED42A0 80240080 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ED42A4 80240084 AFB00010 */ sw $s0, 0x10($sp) +/* ED42A8 80240088 3C108024 */ lui $s0, %hi(func_80241DA0_7ECAB0) +/* ED42AC 8024008C 26101DA0 */ addiu $s0, $s0, %lo(func_80241DA0_7ECAB0) +/* ED42B0 80240090 AFBF0018 */ sw $ra, 0x18($sp) +/* ED42B4 80240094 AFB10014 */ sw $s1, 0x14($sp) +/* ED42B8 80240098 8E020000 */ lw $v0, ($s0) +/* ED42BC 8024009C 14400010 */ bnez $v0, .L802400E0 +/* ED42C0 802400A0 0080882D */ daddu $s1, $a0, $zero +/* ED42C4 802400A4 0C00AFF5 */ jal func_8002BFD4 +/* ED42C8 802400A8 24040040 */ addiu $a0, $zero, 0x40 +/* ED42CC 802400AC AE020000 */ sw $v0, ($s0) +/* ED42D0 802400B0 0000182D */ daddu $v1, $zero, $zero +/* ED42D4 802400B4 0040282D */ daddu $a1, $v0, $zero +/* ED42D8 802400B8 0220202D */ daddu $a0, $s1, $zero +.L802400BC: +/* ED42DC 802400BC 8C820084 */ lw $v0, 0x84($a0) +/* ED42E0 802400C0 24840004 */ addiu $a0, $a0, 4 +/* ED42E4 802400C4 24630001 */ addiu $v1, $v1, 1 +/* ED42E8 802400C8 ACA20000 */ sw $v0, ($a1) +/* ED42EC 802400CC 28620010 */ slti $v0, $v1, 0x10 +/* ED42F0 802400D0 1440FFFA */ bnez $v0, .L802400BC +/* ED42F4 802400D4 24A50004 */ addiu $a1, $a1, 4 +/* ED42F8 802400D8 08090047 */ j .L8024011C +/* ED42FC 802400DC 00000000 */ nop +.L802400E0: +/* ED4300 802400E0 0000182D */ daddu $v1, $zero, $zero +/* ED4304 802400E4 0040282D */ daddu $a1, $v0, $zero +/* ED4308 802400E8 0220202D */ daddu $a0, $s1, $zero +.L802400EC: +/* ED430C 802400EC 8CA20000 */ lw $v0, ($a1) +/* ED4310 802400F0 24A50004 */ addiu $a1, $a1, 4 +/* ED4314 802400F4 24630001 */ addiu $v1, $v1, 1 +/* ED4318 802400F8 AC820084 */ sw $v0, 0x84($a0) +/* ED431C 802400FC 28620010 */ slti $v0, $v1, 0x10 +/* ED4320 80240100 1440FFFA */ bnez $v0, .L802400EC +/* ED4324 80240104 24840004 */ addiu $a0, $a0, 4 +/* ED4328 80240108 3C108024 */ lui $s0, %hi(func_80241DA0_7ECAB0) +/* ED432C 8024010C 26101DA0 */ addiu $s0, $s0, %lo(func_80241DA0_7ECAB0) +/* ED4330 80240110 0C00B007 */ jal func_8002C01C +/* ED4334 80240114 8E040000 */ lw $a0, ($s0) +/* ED4338 80240118 AE000000 */ sw $zero, ($s0) +.L8024011C: +/* ED433C 8024011C 8FBF0018 */ lw $ra, 0x18($sp) +/* ED4340 80240120 8FB10014 */ lw $s1, 0x14($sp) +/* ED4344 80240124 8FB00010 */ lw $s0, 0x10($sp) +/* ED4348 80240128 24020002 */ addiu $v0, $zero, 2 +/* ED434C 8024012C 03E00008 */ jr $ra +/* ED4350 80240130 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_ED42A0/func_80240134_ED4354.s b/asm/nonmatchings/code_ED42A0/func_80240134_ED4354.s new file mode 100644 index 0000000000..d7d1c84594 --- /dev/null +++ b/asm/nonmatchings/code_ED42A0/func_80240134_ED4354.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240134_ED4354 +/* ED4354 80240134 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ED4358 80240138 AFB00010 */ sw $s0, 0x10($sp) +/* ED435C 8024013C 0080802D */ daddu $s0, $a0, $zero +/* ED4360 80240140 AFBF0018 */ sw $ra, 0x18($sp) +/* ED4364 80240144 AFB10014 */ sw $s1, 0x14($sp) +/* ED4368 80240148 8E02000C */ lw $v0, 0xc($s0) +/* ED436C 8024014C 8C510000 */ lw $s1, ($v0) +/* ED4370 80240150 0C0B53A3 */ jal func_802D4E8C +/* ED4374 80240154 0220282D */ daddu $a1, $s1, $zero +/* ED4378 80240158 3C03FFF0 */ lui $v1, 0xfff0 +/* ED437C 8024015C 3463FFFF */ ori $v1, $v1, 0xffff +/* ED4380 80240160 0200202D */ daddu $a0, $s0, $zero +/* ED4384 80240164 00431024 */ and $v0, $v0, $v1 +/* ED4388 80240168 00021140 */ sll $v0, $v0, 5 +/* ED438C 8024016C 3C068009 */ lui $a2, %hi(D_8008D2C0) +/* ED4390 80240170 00C23021 */ addu $a2, $a2, $v0 +/* ED4394 80240174 8CC6D2C0 */ lw $a2, %lo(D_8008D2C0)($a2) +/* ED4398 80240178 0C0B551A */ jal func_802D5468 +/* ED439C 8024017C 0220282D */ daddu $a1, $s1, $zero +/* ED43A0 80240180 8FBF0018 */ lw $ra, 0x18($sp) +/* ED43A4 80240184 8FB10014 */ lw $s1, 0x14($sp) +/* ED43A8 80240188 8FB00010 */ lw $s0, 0x10($sp) +/* ED43AC 8024018C 24020002 */ addiu $v0, $zero, 2 +/* ED43B0 80240190 03E00008 */ jr $ra +/* ED43B4 80240194 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_ED42A0/func_80240198_ED43B8.s b/asm/nonmatchings/code_ED42A0/func_80240198_ED43B8.s new file mode 100644 index 0000000000..aba6a2898c --- /dev/null +++ b/asm/nonmatchings/code_ED42A0/func_80240198_ED43B8.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240198_ED43B8 +/* ED43B8 80240198 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ED43BC 8024019C AFB00010 */ sw $s0, 0x10($sp) +/* ED43C0 802401A0 0080802D */ daddu $s0, $a0, $zero +/* ED43C4 802401A4 AFBF0014 */ sw $ra, 0x14($sp) +/* ED43C8 802401A8 8E0300A8 */ lw $v1, 0xa8($s0) +/* ED43CC 802401AC 8E020088 */ lw $v0, 0x88($s0) +/* ED43D0 802401B0 00621821 */ addu $v1, $v1, $v0 +/* ED43D4 802401B4 04610004 */ bgez $v1, .L802401C8 +/* ED43D8 802401B8 AE0300A8 */ sw $v1, 0xa8($s0) +/* ED43DC 802401BC 3C020002 */ lui $v0, 2 +/* ED43E0 802401C0 08090076 */ j .L802401D8 +/* ED43E4 802401C4 00621021 */ addu $v0, $v1, $v0 +.L802401C8: +/* ED43E8 802401C8 3C040002 */ lui $a0, 2 +/* ED43EC 802401CC 0083102A */ slt $v0, $a0, $v1 +/* ED43F0 802401D0 10400002 */ beqz $v0, .L802401DC +/* ED43F4 802401D4 00641023 */ subu $v0, $v1, $a0 +.L802401D8: +/* ED43F8 802401D8 AE0200A8 */ sw $v0, 0xa8($s0) +.L802401DC: +/* ED43FC 802401DC 8E0300AC */ lw $v1, 0xac($s0) +/* ED4400 802401E0 8E02008C */ lw $v0, 0x8c($s0) +/* ED4404 802401E4 00621821 */ addu $v1, $v1, $v0 +/* ED4408 802401E8 04610004 */ bgez $v1, .L802401FC +/* ED440C 802401EC AE0300AC */ sw $v1, 0xac($s0) +/* ED4410 802401F0 3C020002 */ lui $v0, 2 +/* ED4414 802401F4 08090083 */ j .L8024020C +/* ED4418 802401F8 00621021 */ addu $v0, $v1, $v0 +.L802401FC: +/* ED441C 802401FC 3C040002 */ lui $a0, 2 +/* ED4420 80240200 0083102A */ slt $v0, $a0, $v1 +/* ED4424 80240204 10400002 */ beqz $v0, .L80240210 +/* ED4428 80240208 00641023 */ subu $v0, $v1, $a0 +.L8024020C: +/* ED442C 8024020C AE0200AC */ sw $v0, 0xac($s0) +.L80240210: +/* ED4430 80240210 8E0300B0 */ lw $v1, 0xb0($s0) +/* ED4434 80240214 8E020090 */ lw $v0, 0x90($s0) +/* ED4438 80240218 00621821 */ addu $v1, $v1, $v0 +/* ED443C 8024021C 04610004 */ bgez $v1, .L80240230 +/* ED4440 80240220 AE0300B0 */ sw $v1, 0xb0($s0) +/* ED4444 80240224 3C020002 */ lui $v0, 2 +/* ED4448 80240228 08090090 */ j .L80240240 +/* ED444C 8024022C 00621021 */ addu $v0, $v1, $v0 +.L80240230: +/* ED4450 80240230 3C040002 */ lui $a0, 2 +/* ED4454 80240234 0083102A */ slt $v0, $a0, $v1 +/* ED4458 80240238 10400002 */ beqz $v0, .L80240244 +/* ED445C 8024023C 00641023 */ subu $v0, $v1, $a0 +.L80240240: +/* ED4460 80240240 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240244: +/* ED4464 80240244 8E0300B4 */ lw $v1, 0xb4($s0) +/* ED4468 80240248 8E020094 */ lw $v0, 0x94($s0) +/* ED446C 8024024C 00621821 */ addu $v1, $v1, $v0 +/* ED4470 80240250 04610004 */ bgez $v1, .L80240264 +/* ED4474 80240254 AE0300B4 */ sw $v1, 0xb4($s0) +/* ED4478 80240258 3C020002 */ lui $v0, 2 +/* ED447C 8024025C 0809009D */ j .L80240274 +/* ED4480 80240260 00621021 */ addu $v0, $v1, $v0 +.L80240264: +/* ED4484 80240264 3C040002 */ lui $a0, 2 +/* ED4488 80240268 0083102A */ slt $v0, $a0, $v1 +/* ED448C 8024026C 10400002 */ beqz $v0, .L80240278 +/* ED4490 80240270 00641023 */ subu $v0, $v1, $a0 +.L80240274: +/* ED4494 80240274 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240278: +/* ED4498 80240278 8E040084 */ lw $a0, 0x84($s0) +/* ED449C 8024027C 0C049819 */ jal func_80126064 +/* ED44A0 80240280 8E0500A8 */ lw $a1, 0xa8($s0) +/* ED44A4 80240284 8E040084 */ lw $a0, 0x84($s0) +/* ED44A8 80240288 0C04981F */ jal func_8012607C +/* ED44AC 8024028C 8E0500AC */ lw $a1, 0xac($s0) +/* ED44B0 80240290 8E040084 */ lw $a0, 0x84($s0) +/* ED44B4 80240294 0C049825 */ jal func_80126094 +/* ED44B8 80240298 8E0500B0 */ lw $a1, 0xb0($s0) +/* ED44BC 8024029C 8E040084 */ lw $a0, 0x84($s0) +/* ED44C0 802402A0 0C04982B */ jal func_801260AC +/* ED44C4 802402A4 8E0500B4 */ lw $a1, 0xb4($s0) +/* ED44C8 802402A8 8FBF0014 */ lw $ra, 0x14($sp) +/* ED44CC 802402AC 8FB00010 */ lw $s0, 0x10($sp) +/* ED44D0 802402B0 0000102D */ daddu $v0, $zero, $zero +/* ED44D4 802402B4 03E00008 */ jr $ra +/* ED44D8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ED42A0/func_802402BC_ED44DC.s b/asm/nonmatchings/code_ED42A0/func_802402BC_ED44DC.s new file mode 100644 index 0000000000..cdc3bb8b88 --- /dev/null +++ b/asm/nonmatchings/code_ED42A0/func_802402BC_ED44DC.s @@ -0,0 +1,146 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402BC_ED44DC +/* ED44DC 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ED44E0 802402C0 AFB00010 */ sw $s0, 0x10($sp) +/* ED44E4 802402C4 0080802D */ daddu $s0, $a0, $zero +/* ED44E8 802402C8 10A00005 */ beqz $a1, .L802402E0 +/* ED44EC 802402CC AFBF0014 */ sw $ra, 0x14($sp) +/* ED44F0 802402D0 AE000070 */ sw $zero, 0x70($s0) +/* ED44F4 802402D4 AE000074 */ sw $zero, 0x74($s0) +/* ED44F8 802402D8 AE000078 */ sw $zero, 0x78($s0) +/* ED44FC 802402DC AE00007C */ sw $zero, 0x7c($s0) +.L802402E0: +/* ED4500 802402E0 8E020070 */ lw $v0, 0x70($s0) +/* ED4504 802402E4 1440000E */ bnez $v0, .L80240320 +/* ED4508 802402E8 00000000 */ nop +/* ED450C 802402EC 8E0300A8 */ lw $v1, 0xa8($s0) +/* ED4510 802402F0 8E020088 */ lw $v0, 0x88($s0) +/* ED4514 802402F4 00621821 */ addu $v1, $v1, $v0 +/* ED4518 802402F8 04610004 */ bgez $v1, .L8024030C +/* ED451C 802402FC AE0300A8 */ sw $v1, 0xa8($s0) +/* ED4520 80240300 3C020002 */ lui $v0, 2 +/* ED4524 80240304 080900C7 */ j .L8024031C +/* ED4528 80240308 00621021 */ addu $v0, $v1, $v0 +.L8024030C: +/* ED452C 8024030C 3C040002 */ lui $a0, 2 +/* ED4530 80240310 0083102A */ slt $v0, $a0, $v1 +/* ED4534 80240314 10400002 */ beqz $v0, .L80240320 +/* ED4538 80240318 00641023 */ subu $v0, $v1, $a0 +.L8024031C: +/* ED453C 8024031C AE0200A8 */ sw $v0, 0xa8($s0) +.L80240320: +/* ED4540 80240320 8E020074 */ lw $v0, 0x74($s0) +/* ED4544 80240324 1440000E */ bnez $v0, .L80240360 +/* ED4548 80240328 00000000 */ nop +/* ED454C 8024032C 8E0300AC */ lw $v1, 0xac($s0) +/* ED4550 80240330 8E02008C */ lw $v0, 0x8c($s0) +/* ED4554 80240334 00621821 */ addu $v1, $v1, $v0 +/* ED4558 80240338 04610004 */ bgez $v1, .L8024034C +/* ED455C 8024033C AE0300AC */ sw $v1, 0xac($s0) +/* ED4560 80240340 3C020002 */ lui $v0, 2 +/* ED4564 80240344 080900D7 */ j .L8024035C +/* ED4568 80240348 00621021 */ addu $v0, $v1, $v0 +.L8024034C: +/* ED456C 8024034C 3C040002 */ lui $a0, 2 +/* ED4570 80240350 0083102A */ slt $v0, $a0, $v1 +/* ED4574 80240354 10400002 */ beqz $v0, .L80240360 +/* ED4578 80240358 00641023 */ subu $v0, $v1, $a0 +.L8024035C: +/* ED457C 8024035C AE0200AC */ sw $v0, 0xac($s0) +.L80240360: +/* ED4580 80240360 8E020078 */ lw $v0, 0x78($s0) +/* ED4584 80240364 1440000E */ bnez $v0, .L802403A0 +/* ED4588 80240368 00000000 */ nop +/* ED458C 8024036C 8E0300B0 */ lw $v1, 0xb0($s0) +/* ED4590 80240370 8E020090 */ lw $v0, 0x90($s0) +/* ED4594 80240374 00621821 */ addu $v1, $v1, $v0 +/* ED4598 80240378 04610004 */ bgez $v1, .L8024038C +/* ED459C 8024037C AE0300B0 */ sw $v1, 0xb0($s0) +/* ED45A0 80240380 3C020002 */ lui $v0, 2 +/* ED45A4 80240384 080900E7 */ j .L8024039C +/* ED45A8 80240388 00621021 */ addu $v0, $v1, $v0 +.L8024038C: +/* ED45AC 8024038C 3C040002 */ lui $a0, 2 +/* ED45B0 80240390 0083102A */ slt $v0, $a0, $v1 +/* ED45B4 80240394 10400002 */ beqz $v0, .L802403A0 +/* ED45B8 80240398 00641023 */ subu $v0, $v1, $a0 +.L8024039C: +/* ED45BC 8024039C AE0200B0 */ sw $v0, 0xb0($s0) +.L802403A0: +/* ED45C0 802403A0 8E02007C */ lw $v0, 0x7c($s0) +/* ED45C4 802403A4 1440000E */ bnez $v0, .L802403E0 +/* ED45C8 802403A8 00000000 */ nop +/* ED45CC 802403AC 8E0300B4 */ lw $v1, 0xb4($s0) +/* ED45D0 802403B0 8E020094 */ lw $v0, 0x94($s0) +/* ED45D4 802403B4 00621821 */ addu $v1, $v1, $v0 +/* ED45D8 802403B8 04610004 */ bgez $v1, .L802403CC +/* ED45DC 802403BC AE0300B4 */ sw $v1, 0xb4($s0) +/* ED45E0 802403C0 3C020002 */ lui $v0, 2 +/* ED45E4 802403C4 080900F7 */ j .L802403DC +/* ED45E8 802403C8 00621021 */ addu $v0, $v1, $v0 +.L802403CC: +/* ED45EC 802403CC 3C040002 */ lui $a0, 2 +/* ED45F0 802403D0 0083102A */ slt $v0, $a0, $v1 +/* ED45F4 802403D4 10400002 */ beqz $v0, .L802403E0 +/* ED45F8 802403D8 00641023 */ subu $v0, $v1, $a0 +.L802403DC: +/* ED45FC 802403DC AE0200B4 */ sw $v0, 0xb4($s0) +.L802403E0: +/* ED4600 802403E0 8E040084 */ lw $a0, 0x84($s0) +/* ED4604 802403E4 0C049819 */ jal func_80126064 +/* ED4608 802403E8 8E0500A8 */ lw $a1, 0xa8($s0) +/* ED460C 802403EC 8E040084 */ lw $a0, 0x84($s0) +/* ED4610 802403F0 0C04981F */ jal func_8012607C +/* ED4614 802403F4 8E0500AC */ lw $a1, 0xac($s0) +/* ED4618 802403F8 8E040084 */ lw $a0, 0x84($s0) +/* ED461C 802403FC 0C049825 */ jal func_80126094 +/* ED4620 80240400 8E0500B0 */ lw $a1, 0xb0($s0) +/* ED4624 80240404 8E040084 */ lw $a0, 0x84($s0) +/* ED4628 80240408 0C04982B */ jal func_801260AC +/* ED462C 8024040C 8E0500B4 */ lw $a1, 0xb4($s0) +/* ED4630 80240410 8E020070 */ lw $v0, 0x70($s0) +/* ED4634 80240414 8E030078 */ lw $v1, 0x78($s0) +/* ED4638 80240418 8E040098 */ lw $a0, 0x98($s0) +/* ED463C 8024041C 24420001 */ addiu $v0, $v0, 1 +/* ED4640 80240420 AE020070 */ sw $v0, 0x70($s0) +/* ED4644 80240424 8E020074 */ lw $v0, 0x74($s0) +/* ED4648 80240428 24630001 */ addiu $v1, $v1, 1 +/* ED464C 8024042C AE030078 */ sw $v1, 0x78($s0) +/* ED4650 80240430 8E030070 */ lw $v1, 0x70($s0) +/* ED4654 80240434 24420001 */ addiu $v0, $v0, 1 +/* ED4658 80240438 AE020074 */ sw $v0, 0x74($s0) +/* ED465C 8024043C 8E02007C */ lw $v0, 0x7c($s0) +/* ED4660 80240440 0064182A */ slt $v1, $v1, $a0 +/* ED4664 80240444 24420001 */ addiu $v0, $v0, 1 +/* ED4668 80240448 14600002 */ bnez $v1, .L80240454 +/* ED466C 8024044C AE02007C */ sw $v0, 0x7c($s0) +/* ED4670 80240450 AE000070 */ sw $zero, 0x70($s0) +.L80240454: +/* ED4674 80240454 8E020074 */ lw $v0, 0x74($s0) +/* ED4678 80240458 8E03009C */ lw $v1, 0x9c($s0) +/* ED467C 8024045C 0043102A */ slt $v0, $v0, $v1 +/* ED4680 80240460 50400001 */ beql $v0, $zero, .L80240468 +/* ED4684 80240464 AE000074 */ sw $zero, 0x74($s0) +.L80240468: +/* ED4688 80240468 8E020078 */ lw $v0, 0x78($s0) +/* ED468C 8024046C 8E0300A0 */ lw $v1, 0xa0($s0) +/* ED4690 80240470 0043102A */ slt $v0, $v0, $v1 +/* ED4694 80240474 50400001 */ beql $v0, $zero, .L8024047C +/* ED4698 80240478 AE000078 */ sw $zero, 0x78($s0) +.L8024047C: +/* ED469C 8024047C 8E02007C */ lw $v0, 0x7c($s0) +/* ED46A0 80240480 8E0300A4 */ lw $v1, 0xa4($s0) +/* ED46A4 80240484 0043102A */ slt $v0, $v0, $v1 +/* ED46A8 80240488 50400001 */ beql $v0, $zero, .L80240490 +/* ED46AC 8024048C AE00007C */ sw $zero, 0x7c($s0) +.L80240490: +/* ED46B0 80240490 8FBF0014 */ lw $ra, 0x14($sp) +/* ED46B4 80240494 8FB00010 */ lw $s0, 0x10($sp) +/* ED46B8 80240498 0000102D */ daddu $v0, $zero, $zero +/* ED46BC 8024049C 03E00008 */ jr $ra +/* ED46C0 802404A0 27BD0018 */ addiu $sp, $sp, 0x18 +/* ED46C4 802404A4 00000000 */ nop +/* ED46C8 802404A8 00000000 */ nop +/* ED46CC 802404AC 00000000 */ nop diff --git a/asm/nonmatchings/code_ED46D0/func_802404B0_ED46D0.s b/asm/nonmatchings/code_ED46D0/func_802404B0_ED46D0.s new file mode 100644 index 0000000000..a236be4c2a --- /dev/null +++ b/asm/nonmatchings/code_ED46D0/func_802404B0_ED46D0.s @@ -0,0 +1,430 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404B0_ED46D0 +/* ED46D0 802404B0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* ED46D4 802404B4 AFB60040 */ sw $s6, 0x40($sp) +/* ED46D8 802404B8 0080B02D */ daddu $s6, $a0, $zero +/* ED46DC 802404BC 3C028024 */ lui $v0, %hi(D_80244160) +/* ED46E0 802404C0 24424160 */ addiu $v0, $v0, %lo(D_80244160) +/* ED46E4 802404C4 AFBF004C */ sw $ra, 0x4c($sp) +/* ED46E8 802404C8 AFBE0048 */ sw $fp, 0x48($sp) +/* ED46EC 802404CC AFB70044 */ sw $s7, 0x44($sp) +/* ED46F0 802404D0 AFB5003C */ sw $s5, 0x3c($sp) +/* ED46F4 802404D4 AFB40038 */ sw $s4, 0x38($sp) +/* ED46F8 802404D8 AFB30034 */ sw $s3, 0x34($sp) +/* ED46FC 802404DC AFB20030 */ sw $s2, 0x30($sp) +/* ED4700 802404E0 AFB1002C */ sw $s1, 0x2c($sp) +/* ED4704 802404E4 AFB00028 */ sw $s0, 0x28($sp) +/* ED4708 802404E8 AFA50054 */ sw $a1, 0x54($sp) +/* ED470C 802404EC 8C430000 */ lw $v1, ($v0) +/* ED4710 802404F0 00C0A02D */ daddu $s4, $a2, $zero +/* ED4714 802404F4 24630005 */ addiu $v1, $v1, 5 +/* ED4718 802404F8 AC430000 */ sw $v1, ($v0) +/* ED471C 802404FC 02D4102A */ slt $v0, $s6, $s4 +/* ED4720 80240500 10400177 */ beqz $v0, .L80240AE0 +/* ED4724 80240504 00000000 */ nop +/* ED4728 80240508 8FAA0054 */ lw $t2, 0x54($sp) +/* ED472C 8024050C 0147102A */ slt $v0, $t2, $a3 +/* ED4730 80240510 10400173 */ beqz $v0, .L80240AE0 +/* ED4734 80240514 00000000 */ nop +/* ED4738 80240518 06C20002 */ bltzl $s6, .L80240524 +/* ED473C 8024051C 0000B02D */ daddu $s6, $zero, $zero +/* ED4740 80240520 8FAA0054 */ lw $t2, 0x54($sp) +.L80240524: +/* ED4744 80240524 05420001 */ bltzl $t2, .L8024052C +/* ED4748 80240528 AFA00054 */ sw $zero, 0x54($sp) +.L8024052C: +/* ED474C 8024052C 06820001 */ bltzl $s4, .L80240534 +/* ED4750 80240530 0000A02D */ daddu $s4, $zero, $zero +.L80240534: +/* ED4754 80240534 04E20001 */ bltzl $a3, .L8024053C +/* ED4758 80240538 0000382D */ daddu $a3, $zero, $zero +.L8024053C: +/* ED475C 8024053C 2AC20140 */ slti $v0, $s6, 0x140 +/* ED4760 80240540 50400001 */ beql $v0, $zero, .L80240548 +/* ED4764 80240544 2416013F */ addiu $s6, $zero, 0x13f +.L80240548: +/* ED4768 80240548 8FAA0054 */ lw $t2, 0x54($sp) +/* ED476C 8024054C 294200F0 */ slti $v0, $t2, 0xf0 +/* ED4770 80240550 14400003 */ bnez $v0, .L80240560 +/* ED4774 80240554 2A820140 */ slti $v0, $s4, 0x140 +/* ED4778 80240558 240A00EF */ addiu $t2, $zero, 0xef +/* ED477C 8024055C AFAA0054 */ sw $t2, 0x54($sp) +.L80240560: +/* ED4780 80240560 50400001 */ beql $v0, $zero, .L80240568 +/* ED4784 80240564 2414013F */ addiu $s4, $zero, 0x13f +.L80240568: +/* ED4788 80240568 28E200F0 */ slti $v0, $a3, 0xf0 +/* ED478C 8024056C 50400001 */ beql $v0, $zero, .L80240574 +/* ED4790 80240570 240700EF */ addiu $a3, $zero, 0xef +.L80240574: +/* ED4794 80240574 12D4015A */ beq $s6, $s4, .L80240AE0 +/* ED4798 80240578 00000000 */ nop +/* ED479C 8024057C 8FAA0054 */ lw $t2, 0x54($sp) +/* ED47A0 80240580 11470157 */ beq $t2, $a3, .L80240AE0 +/* ED47A4 80240584 00000000 */ nop +/* ED47A8 80240588 06C10002 */ bgez $s6, .L80240594 +/* ED47AC 8024058C 02C0102D */ daddu $v0, $s6, $zero +/* ED47B0 80240590 26C20003 */ addiu $v0, $s6, 3 +.L80240594: +/* ED47B4 80240594 00021083 */ sra $v0, $v0, 2 +/* ED47B8 80240598 0002B080 */ sll $s6, $v0, 2 +/* ED47BC 8024059C 06810002 */ bgez $s4, .L802405A8 +/* ED47C0 802405A0 0280102D */ daddu $v0, $s4, $zero +/* ED47C4 802405A4 26820003 */ addiu $v0, $s4, 3 +.L802405A8: +/* ED47C8 802405A8 3C042AAA */ lui $a0, 0x2aaa +/* ED47CC 802405AC 3484AAAB */ ori $a0, $a0, 0xaaab +/* ED47D0 802405B0 8FAA0054 */ lw $t2, 0x54($sp) +/* ED47D4 802405B4 00021083 */ sra $v0, $v0, 2 +/* ED47D8 802405B8 00EA1823 */ subu $v1, $a3, $t2 +/* ED47DC 802405BC 00640018 */ mult $v1, $a0 +/* ED47E0 802405C0 00021080 */ sll $v0, $v0, 2 +/* ED47E4 802405C4 24540004 */ addiu $s4, $v0, 4 +/* ED47E8 802405C8 0000F02D */ daddu $fp, $zero, $zero +/* ED47EC 802405CC 000317C3 */ sra $v0, $v1, 0x1f +/* ED47F0 802405D0 00005010 */ mfhi $t2 +/* ED47F4 802405D4 01425023 */ subu $t2, $t2, $v0 +/* ED47F8 802405D8 000A1040 */ sll $v0, $t2, 1 +/* ED47FC 802405DC 004A1021 */ addu $v0, $v0, $t2 +/* ED4800 802405E0 AFAA0014 */ sw $t2, 0x14($sp) +/* ED4804 802405E4 AFAA0010 */ sw $t2, 0x10($sp) +/* ED4808 802405E8 3C0A800A */ lui $t2, %hi(D_800A15A4) +/* ED480C 802405EC 8D4A15A4 */ lw $t2, %lo(D_800A15A4)($t2) +/* ED4810 802405F0 00021040 */ sll $v0, $v0, 1 +/* ED4814 802405F4 AFAA0018 */ sw $t2, 0x18($sp) +/* ED4818 802405F8 8FAA0010 */ lw $t2, 0x10($sp) +/* ED481C 802405FC 00621823 */ subu $v1, $v1, $v0 +/* ED4820 80240600 194000A6 */ blez $t2, .L8024089C +/* ED4824 80240604 AFA30014 */ sw $v1, 0x14($sp) +/* ED4828 80240608 3C13800A */ lui $s3, %hi(D_800A15C4) +/* ED482C 8024060C 267315C4 */ addiu $s3, $s3, %lo(D_800A15C4) +/* ED4830 80240610 02961023 */ subu $v0, $s4, $s6 +/* ED4834 80240614 00021040 */ sll $v0, $v0, 1 +/* ED4838 80240618 24420007 */ addiu $v0, $v0, 7 +/* ED483C 8024061C 000210C3 */ sra $v0, $v0, 3 +/* ED4840 80240620 304201FF */ andi $v0, $v0, 0x1ff +/* ED4844 80240624 00021240 */ sll $v0, $v0, 9 +/* ED4848 80240628 3C03F510 */ lui $v1, 0xf510 +/* ED484C 8024062C 8FB70054 */ lw $s7, 0x54($sp) +/* ED4850 80240630 00431025 */ or $v0, $v0, $v1 +/* ED4854 80240634 AFA2001C */ sw $v0, 0x1c($sp) +/* ED4858 80240638 AFA00020 */ sw $zero, 0x20($sp) +/* ED485C 8024063C 02E0A82D */ daddu $s5, $s7, $zero +.L80240640: +/* ED4860 80240640 26B2FFFA */ addiu $s2, $s5, -6 +/* ED4864 80240644 0640008C */ bltz $s2, .L80240878 +/* ED4868 80240648 00122840 */ sll $a1, $s2, 1 +/* ED486C 8024064C 28A20100 */ slti $v0, $a1, 0x100 +/* ED4870 80240650 50400001 */ beql $v0, $zero, .L80240658 +/* ED4874 80240654 240500FF */ addiu $a1, $zero, 0xff +.L80240658: +/* ED4878 80240658 3C02FA00 */ lui $v0, 0xfa00 +/* ED487C 8024065C 8E710000 */ lw $s1, ($s3) +/* ED4880 80240660 8FA40018 */ lw $a0, 0x18($sp) +/* ED4884 80240664 0220182D */ daddu $v1, $s1, $zero +/* ED4888 80240668 26310008 */ addiu $s1, $s1, 8 +/* ED488C 8024066C AE710000 */ sw $s1, ($s3) +/* ED4890 80240670 AC620000 */ sw $v0, ($v1) +/* ED4894 80240674 2402FF00 */ addiu $v0, $zero, -0x100 +/* ED4898 80240678 00A21025 */ or $v0, $a1, $v0 +/* ED489C 8024067C AC620004 */ sw $v0, 4($v1) +/* ED48A0 80240680 26220008 */ addiu $v0, $s1, 8 +/* ED48A4 80240684 0C019BF8 */ jal func_80066FE0 +/* ED48A8 80240688 AE620000 */ sw $v0, ($s3) +/* ED48AC 8024068C 30420007 */ andi $v0, $v0, 7 +/* ED48B0 80240690 1040000C */ beqz $v0, .L802406C4 +/* ED48B4 80240694 3C02FD10 */ lui $v0, 0xfd10 +/* ED48B8 80240698 8FA40018 */ lw $a0, 0x18($sp) +/* ED48BC 8024069C 0C019BF8 */ jal func_80066FE0 +/* ED48C0 802406A0 00000000 */ nop +/* ED48C4 802406A4 3C048024 */ lui $a0, %hi(D_80244BB8) +/* ED48C8 802406A8 24844BB8 */ addiu $a0, $a0, %lo(D_80244BB8) +/* ED48CC 802406AC 3C058024 */ lui $a1, %hi(D_80244BEC) +/* ED48D0 802406B0 24A54BEC */ addiu $a1, $a1, %lo(D_80244BEC) +/* ED48D4 802406B4 24060053 */ addiu $a2, $zero, 0x53 +/* ED48D8 802406B8 0C00973F */ jal func_80025CFC +/* ED48DC 802406BC 0040382D */ daddu $a3, $v0, $zero +/* ED48E0 802406C0 3C02FD10 */ lui $v0, 0xfd10 +.L802406C4: +/* ED48E4 802406C4 8FA40018 */ lw $a0, 0x18($sp) +/* ED48E8 802406C8 3442013F */ ori $v0, $v0, 0x13f +/* ED48EC 802406CC 0C019BF8 */ jal func_80066FE0 +/* ED48F0 802406D0 AE220000 */ sw $v0, ($s1) +/* ED48F4 802406D4 3C030700 */ lui $v1, 0x700 +/* ED48F8 802406D8 34630090 */ ori $v1, $v1, 0x90 +/* ED48FC 802406DC 00163080 */ sll $a2, $s6, 2 +/* ED4900 802406E0 30C60FFF */ andi $a2, $a2, 0xfff +/* ED4904 802406E4 00063300 */ sll $a2, $a2, 0xc +/* ED4908 802406E8 00122080 */ sll $a0, $s2, 2 +/* ED490C 802406EC 30840FFF */ andi $a0, $a0, 0xfff +/* ED4910 802406F0 26A5FFFF */ addiu $a1, $s5, -1 +/* ED4914 802406F4 8E700000 */ lw $s0, ($s3) +/* ED4918 802406F8 00052880 */ sll $a1, $a1, 2 +/* ED491C 802406FC AE220004 */ sw $v0, 4($s1) +/* ED4920 80240700 0200102D */ daddu $v0, $s0, $zero +/* ED4924 80240704 26100008 */ addiu $s0, $s0, 8 +/* ED4928 80240708 AE700000 */ sw $s0, ($s3) +/* ED492C 8024070C 8FAA001C */ lw $t2, 0x1c($sp) +/* ED4930 80240710 30A50FFF */ andi $a1, $a1, 0xfff +/* ED4934 80240714 AC430004 */ sw $v1, 4($v0) +/* ED4938 80240718 2683FFFF */ addiu $v1, $s4, -1 +/* ED493C 8024071C 00031880 */ sll $v1, $v1, 2 +/* ED4940 80240720 30630FFF */ andi $v1, $v1, 0xfff +/* ED4944 80240724 00031B00 */ sll $v1, $v1, 0xc +/* ED4948 80240728 AC4A0000 */ sw $t2, ($v0) +/* ED494C 8024072C 26020008 */ addiu $v0, $s0, 8 +/* ED4950 80240730 AE620000 */ sw $v0, ($s3) +/* ED4954 80240734 3C02E600 */ lui $v0, 0xe600 +/* ED4958 80240738 AE020000 */ sw $v0, ($s0) +/* ED495C 8024073C 26020010 */ addiu $v0, $s0, 0x10 +/* ED4960 80240740 AE000004 */ sw $zero, 4($s0) +/* ED4964 80240744 AE620000 */ sw $v0, ($s3) +/* ED4968 80240748 3C02F400 */ lui $v0, 0xf400 +/* ED496C 8024074C 00821025 */ or $v0, $a0, $v0 +/* ED4970 80240750 00C21025 */ or $v0, $a2, $v0 +/* ED4974 80240754 AE020008 */ sw $v0, 8($s0) +/* ED4978 80240758 3C020700 */ lui $v0, 0x700 +/* ED497C 8024075C 00A21025 */ or $v0, $a1, $v0 +/* ED4980 80240760 00621025 */ or $v0, $v1, $v0 +/* ED4984 80240764 AE02000C */ sw $v0, 0xc($s0) +/* ED4988 80240768 26020018 */ addiu $v0, $s0, 0x18 +/* ED498C 8024076C AE620000 */ sw $v0, ($s3) +/* ED4990 80240770 3C02E700 */ lui $v0, 0xe700 +/* ED4994 80240774 AE020010 */ sw $v0, 0x10($s0) +/* ED4998 80240778 26020020 */ addiu $v0, $s0, 0x20 +/* ED499C 8024077C AE000014 */ sw $zero, 0x14($s0) +/* ED49A0 80240780 AE620000 */ sw $v0, ($s3) +/* ED49A4 80240784 24020090 */ addiu $v0, $zero, 0x90 +/* ED49A8 80240788 AE02001C */ sw $v0, 0x1c($s0) +/* ED49AC 8024078C 26020028 */ addiu $v0, $s0, 0x28 +/* ED49B0 80240790 AE0A0018 */ sw $t2, 0x18($s0) +/* ED49B4 80240794 AE620000 */ sw $v0, ($s3) +/* ED49B8 80240798 3C02F200 */ lui $v0, 0xf200 +/* ED49BC 8024079C 00822025 */ or $a0, $a0, $v0 +/* ED49C0 802407A0 00C42025 */ or $a0, $a2, $a0 +/* ED49C4 802407A4 00651825 */ or $v1, $v1, $a1 +/* ED49C8 802407A8 26020030 */ addiu $v0, $s0, 0x30 +/* ED49CC 802407AC AE040020 */ sw $a0, 0x20($s0) +/* ED49D0 802407B0 00142080 */ sll $a0, $s4, 2 +/* ED49D4 802407B4 30840FFF */ andi $a0, $a0, 0xfff +/* ED49D8 802407B8 00042300 */ sll $a0, $a0, 0xc +/* ED49DC 802407BC AE030024 */ sw $v1, 0x24($s0) +/* ED49E0 802407C0 AE620000 */ sw $v0, ($s3) +/* ED49E4 802407C4 26E20006 */ addiu $v0, $s7, 6 +/* ED49E8 802407C8 00021080 */ sll $v0, $v0, 2 +/* ED49EC 802407CC 30420FFF */ andi $v0, $v0, 0xfff +/* ED49F0 802407D0 3C03E400 */ lui $v1, 0xe400 +/* ED49F4 802407D4 00431025 */ or $v0, $v0, $v1 +/* ED49F8 802407D8 00822025 */ or $a0, $a0, $v0 +/* ED49FC 802407DC 00171080 */ sll $v0, $s7, 2 +/* ED4A00 802407E0 30420FFF */ andi $v0, $v0, 0xfff +/* ED4A04 802407E4 00C23025 */ or $a2, $a2, $v0 +/* ED4A08 802407E8 26020038 */ addiu $v0, $s0, 0x38 +/* ED4A0C 802407EC AE040028 */ sw $a0, 0x28($s0) +/* ED4A10 802407F0 AE06002C */ sw $a2, 0x2c($s0) +/* ED4A14 802407F4 AE620000 */ sw $v0, ($s3) +/* ED4A18 802407F8 3C02E100 */ lui $v0, 0xe100 +/* ED4A1C 802407FC 00161D40 */ sll $v1, $s6, 0x15 +/* ED4A20 80240800 AE020030 */ sw $v0, 0x30($s0) +/* ED4A24 80240804 00151140 */ sll $v0, $s5, 5 +/* ED4A28 80240808 3042FFFF */ andi $v0, $v0, 0xffff +/* ED4A2C 8024080C 00621825 */ or $v1, $v1, $v0 +/* ED4A30 80240810 26020040 */ addiu $v0, $s0, 0x40 +/* ED4A34 80240814 AE030034 */ sw $v1, 0x34($s0) +/* ED4A38 80240818 AE620000 */ sw $v0, ($s3) +/* ED4A3C 8024081C 3C038024 */ lui $v1, %hi(D_80244160) +/* ED4A40 80240820 8C634160 */ lw $v1, %lo(D_80244160)($v1) +/* ED4A44 80240824 3C02F100 */ lui $v0, 0xf100 +/* ED4A48 80240828 AE020038 */ sw $v0, 0x38($s0) +/* ED4A4C 8024082C 8FAA0020 */ lw $t2, 0x20($sp) +/* ED4A50 80240830 006A1821 */ addu $v1, $v1, $t2 +/* ED4A54 80240834 44836000 */ mtc1 $v1, $f12 +/* ED4A58 80240838 00000000 */ nop +/* ED4A5C 8024083C 0C00AD77 */ jal func_8002B5DC +/* ED4A60 80240840 46806320 */ cvt.s.w $f12, $f12 +/* ED4A64 80240844 3C0143FA */ lui $at, 0x43fa +/* ED4A68 80240848 44811000 */ mtc1 $at, $f2 +/* ED4A6C 8024084C 00000000 */ nop +/* ED4A70 80240850 46020002 */ mul.s $f0, $f0, $f2 +/* ED4A74 80240854 00000000 */ nop +/* ED4A78 80240858 3C030400 */ lui $v1, 0x400 +/* ED4A7C 8024085C 4600010D */ trunc.w.s $f4, $f0 +/* ED4A80 80240860 44022000 */ mfc1 $v0, $f4 +/* ED4A84 80240864 00000000 */ nop +/* ED4A88 80240868 2442FE0C */ addiu $v0, $v0, -0x1f4 +/* ED4A8C 8024086C 3042FFFF */ andi $v0, $v0, 0xffff +/* ED4A90 80240870 00431025 */ or $v0, $v0, $v1 +/* ED4A94 80240874 AE02003C */ sw $v0, 0x3c($s0) +.L80240878: +/* ED4A98 80240878 26F70006 */ addiu $s7, $s7, 6 +/* ED4A9C 8024087C 8FAA0020 */ lw $t2, 0x20($sp) +/* ED4AA0 80240880 254A001E */ addiu $t2, $t2, 0x1e +/* ED4AA4 80240884 AFAA0020 */ sw $t2, 0x20($sp) +/* ED4AA8 80240888 8FAA0010 */ lw $t2, 0x10($sp) +/* ED4AAC 8024088C 27DE0001 */ addiu $fp, $fp, 1 +/* ED4AB0 80240890 03CA102A */ slt $v0, $fp, $t2 +/* ED4AB4 80240894 1440FF6A */ bnez $v0, .L80240640 +/* ED4AB8 80240898 26B5FFFA */ addiu $s5, $s5, -6 +.L8024089C: +/* ED4ABC 8024089C 8FAA0014 */ lw $t2, 0x14($sp) +/* ED4AC0 802408A0 1140008F */ beqz $t2, .L80240AE0 +/* ED4AC4 802408A4 001E1040 */ sll $v0, $fp, 1 +/* ED4AC8 802408A8 005E1021 */ addu $v0, $v0, $fp +/* ED4ACC 802408AC 8FAA0054 */ lw $t2, 0x54($sp) +/* ED4AD0 802408B0 00029840 */ sll $s3, $v0, 1 +/* ED4AD4 802408B4 01539023 */ subu $s2, $t2, $s3 +/* ED4AD8 802408B8 2642FFFA */ addiu $v0, $s2, -6 +/* ED4ADC 802408BC 04400088 */ bltz $v0, .L80240AE0 +/* ED4AE0 802408C0 00022840 */ sll $a1, $v0, 1 +/* ED4AE4 802408C4 28A20100 */ slti $v0, $a1, 0x100 +/* ED4AE8 802408C8 50400001 */ beql $v0, $zero, .L802408D0 +/* ED4AEC 802408CC 240500FF */ addiu $a1, $zero, 0xff +.L802408D0: +/* ED4AF0 802408D0 3C11800A */ lui $s1, %hi(D_800A15C4) +/* ED4AF4 802408D4 263115C4 */ addiu $s1, $s1, %lo(D_800A15C4) +/* ED4AF8 802408D8 3C02FA00 */ lui $v0, 0xfa00 +/* ED4AFC 802408DC 8E300000 */ lw $s0, ($s1) +/* ED4B00 802408E0 8FA40018 */ lw $a0, 0x18($sp) +/* ED4B04 802408E4 0200182D */ daddu $v1, $s0, $zero +/* ED4B08 802408E8 26100008 */ addiu $s0, $s0, 8 +/* ED4B0C 802408EC AE300000 */ sw $s0, ($s1) +/* ED4B10 802408F0 AC620000 */ sw $v0, ($v1) +/* ED4B14 802408F4 2402FF00 */ addiu $v0, $zero, -0x100 +/* ED4B18 802408F8 00A21025 */ or $v0, $a1, $v0 +/* ED4B1C 802408FC AC620004 */ sw $v0, 4($v1) +/* ED4B20 80240900 26020008 */ addiu $v0, $s0, 8 +/* ED4B24 80240904 0C019BF8 */ jal func_80066FE0 +/* ED4B28 80240908 AE220000 */ sw $v0, ($s1) +/* ED4B2C 8024090C 30420007 */ andi $v0, $v0, 7 +/* ED4B30 80240910 1040000C */ beqz $v0, .L80240944 +/* ED4B34 80240914 3C02FD10 */ lui $v0, 0xfd10 +/* ED4B38 80240918 8FA40018 */ lw $a0, 0x18($sp) +/* ED4B3C 8024091C 0C019BF8 */ jal func_80066FE0 +/* ED4B40 80240920 00000000 */ nop +/* ED4B44 80240924 3C048024 */ lui $a0, %hi(D_80244BB8) +/* ED4B48 80240928 24844BB8 */ addiu $a0, $a0, %lo(D_80244BB8) +/* ED4B4C 8024092C 3C058024 */ lui $a1, %hi(D_80244BEC) +/* ED4B50 80240930 24A54BEC */ addiu $a1, $a1, %lo(D_80244BEC) +/* ED4B54 80240934 2406006B */ addiu $a2, $zero, 0x6b +/* ED4B58 80240938 0C00973F */ jal func_80025CFC +/* ED4B5C 8024093C 0040382D */ daddu $a3, $v0, $zero +/* ED4B60 80240940 3C02FD10 */ lui $v0, 0xfd10 +.L80240944: +/* ED4B64 80240944 8FA40018 */ lw $a0, 0x18($sp) +/* ED4B68 80240948 3442013F */ ori $v0, $v0, 0x13f +/* ED4B6C 8024094C 0C019BF8 */ jal func_80066FE0 +/* ED4B70 80240950 AE020000 */ sw $v0, ($s0) +/* ED4B74 80240954 3C050700 */ lui $a1, 0x700 +/* ED4B78 80240958 34A50090 */ ori $a1, $a1, 0x90 +/* ED4B7C 8024095C 3C090400 */ lui $t1, 0x400 +/* ED4B80 80240960 3529FC00 */ ori $t1, $t1, 0xfc00 +/* ED4B84 80240964 02962023 */ subu $a0, $s4, $s6 +/* ED4B88 80240968 00042040 */ sll $a0, $a0, 1 +/* ED4B8C 8024096C 24840007 */ addiu $a0, $a0, 7 +/* ED4B90 80240970 000420C3 */ sra $a0, $a0, 3 +/* ED4B94 80240974 308401FF */ andi $a0, $a0, 0x1ff +/* ED4B98 80240978 8E260000 */ lw $a2, ($s1) +/* ED4B9C 8024097C 00042240 */ sll $a0, $a0, 9 +/* ED4BA0 80240980 AE020004 */ sw $v0, 4($s0) +/* ED4BA4 80240984 3C02F510 */ lui $v0, 0xf510 +/* ED4BA8 80240988 00822025 */ or $a0, $a0, $v0 +/* ED4BAC 8024098C 00164080 */ sll $t0, $s6, 2 +/* ED4BB0 80240990 31080FFF */ andi $t0, $t0, 0xfff +/* ED4BB4 80240994 00084300 */ sll $t0, $t0, 0xc +/* ED4BB8 80240998 2647FFFF */ addiu $a3, $s2, -1 +/* ED4BBC 8024099C 00073880 */ sll $a3, $a3, 2 +/* ED4BC0 802409A0 30E70FFF */ andi $a3, $a3, 0xfff +/* ED4BC4 802409A4 00C0182D */ daddu $v1, $a2, $zero +/* ED4BC8 802409A8 24C60008 */ addiu $a2, $a2, 8 +/* ED4BCC 802409AC 24C20008 */ addiu $v0, $a2, 8 +/* ED4BD0 802409B0 AE260000 */ sw $a2, ($s1) +/* ED4BD4 802409B4 AC640000 */ sw $a0, ($v1) +/* ED4BD8 802409B8 AC650004 */ sw $a1, 4($v1) +/* ED4BDC 802409BC AE220000 */ sw $v0, ($s1) +/* ED4BE0 802409C0 3C02E600 */ lui $v0, 0xe600 +/* ED4BE4 802409C4 ACC20000 */ sw $v0, ($a2) +/* ED4BE8 802409C8 24C20010 */ addiu $v0, $a2, 0x10 +/* ED4BEC 802409CC ACC00004 */ sw $zero, 4($a2) +/* ED4BF0 802409D0 AE220000 */ sw $v0, ($s1) +/* ED4BF4 802409D4 3C02F400 */ lui $v0, 0xf400 +/* ED4BF8 802409D8 2683FFFF */ addiu $v1, $s4, -1 +/* ED4BFC 802409DC 00031880 */ sll $v1, $v1, 2 +/* ED4C00 802409E0 30630FFF */ andi $v1, $v1, 0xfff +/* ED4C04 802409E4 8FAA0014 */ lw $t2, 0x14($sp) +/* ED4C08 802409E8 00031B00 */ sll $v1, $v1, 0xc +/* ED4C0C 802409EC 024A2823 */ subu $a1, $s2, $t2 +/* ED4C10 802409F0 00052880 */ sll $a1, $a1, 2 +/* ED4C14 802409F4 30A50FFF */ andi $a1, $a1, 0xfff +/* ED4C18 802409F8 00A21025 */ or $v0, $a1, $v0 +/* ED4C1C 802409FC 01021025 */ or $v0, $t0, $v0 +/* ED4C20 80240A00 ACC20008 */ sw $v0, 8($a2) +/* ED4C24 80240A04 3C020700 */ lui $v0, 0x700 +/* ED4C28 80240A08 00E21025 */ or $v0, $a3, $v0 +/* ED4C2C 80240A0C 00621025 */ or $v0, $v1, $v0 +/* ED4C30 80240A10 ACC2000C */ sw $v0, 0xc($a2) +/* ED4C34 80240A14 24C20018 */ addiu $v0, $a2, 0x18 +/* ED4C38 80240A18 AE220000 */ sw $v0, ($s1) +/* ED4C3C 80240A1C 3C02E700 */ lui $v0, 0xe700 +/* ED4C40 80240A20 ACC20010 */ sw $v0, 0x10($a2) +/* ED4C44 80240A24 24C20020 */ addiu $v0, $a2, 0x20 +/* ED4C48 80240A28 ACC00014 */ sw $zero, 0x14($a2) +/* ED4C4C 80240A2C AE220000 */ sw $v0, ($s1) +/* ED4C50 80240A30 24020090 */ addiu $v0, $zero, 0x90 +/* ED4C54 80240A34 ACC2001C */ sw $v0, 0x1c($a2) +/* ED4C58 80240A38 24C20028 */ addiu $v0, $a2, 0x28 +/* ED4C5C 80240A3C ACC40018 */ sw $a0, 0x18($a2) +/* ED4C60 80240A40 AE220000 */ sw $v0, ($s1) +/* ED4C64 80240A44 3C02F200 */ lui $v0, 0xf200 +/* ED4C68 80240A48 00A22825 */ or $a1, $a1, $v0 +/* ED4C6C 80240A4C 01052825 */ or $a1, $t0, $a1 +/* ED4C70 80240A50 00671825 */ or $v1, $v1, $a3 +/* ED4C74 80240A54 24C20030 */ addiu $v0, $a2, 0x30 +/* ED4C78 80240A58 ACC30024 */ sw $v1, 0x24($a2) +/* ED4C7C 80240A5C 00141880 */ sll $v1, $s4, 2 +/* ED4C80 80240A60 30630FFF */ andi $v1, $v1, 0xfff +/* ED4C84 80240A64 ACC50020 */ sw $a1, 0x20($a2) +/* ED4C88 80240A68 AE220000 */ sw $v0, ($s1) +/* ED4C8C 80240A6C 8FAA0054 */ lw $t2, 0x54($sp) +/* ED4C90 80240A70 00031B00 */ sll $v1, $v1, 0xc +/* ED4C94 80240A74 01532821 */ addu $a1, $t2, $s3 +/* ED4C98 80240A78 8FAA0014 */ lw $t2, 0x14($sp) +/* ED4C9C 80240A7C 3C04E400 */ lui $a0, 0xe400 +/* ED4CA0 80240A80 00AA1021 */ addu $v0, $a1, $t2 +/* ED4CA4 80240A84 00021080 */ sll $v0, $v0, 2 +/* ED4CA8 80240A88 30420FFF */ andi $v0, $v0, 0xfff +/* ED4CAC 80240A8C 00441025 */ or $v0, $v0, $a0 +/* ED4CB0 80240A90 00621825 */ or $v1, $v1, $v0 +/* ED4CB4 80240A94 00052880 */ sll $a1, $a1, 2 +/* ED4CB8 80240A98 30A50FFF */ andi $a1, $a1, 0xfff +/* ED4CBC 80240A9C 01054025 */ or $t0, $t0, $a1 +/* ED4CC0 80240AA0 24C20038 */ addiu $v0, $a2, 0x38 +/* ED4CC4 80240AA4 ACC30028 */ sw $v1, 0x28($a2) +/* ED4CC8 80240AA8 ACC8002C */ sw $t0, 0x2c($a2) +/* ED4CCC 80240AAC AE220000 */ sw $v0, ($s1) +/* ED4CD0 80240AB0 3C02E100 */ lui $v0, 0xe100 +/* ED4CD4 80240AB4 00161D40 */ sll $v1, $s6, 0x15 +/* ED4CD8 80240AB8 ACC20030 */ sw $v0, 0x30($a2) +/* ED4CDC 80240ABC 00121140 */ sll $v0, $s2, 5 +/* ED4CE0 80240AC0 3042FFFF */ andi $v0, $v0, 0xffff +/* ED4CE4 80240AC4 00621825 */ or $v1, $v1, $v0 +/* ED4CE8 80240AC8 24C20040 */ addiu $v0, $a2, 0x40 +/* ED4CEC 80240ACC ACC30034 */ sw $v1, 0x34($a2) +/* ED4CF0 80240AD0 AE220000 */ sw $v0, ($s1) +/* ED4CF4 80240AD4 3C02F100 */ lui $v0, 0xf100 +/* ED4CF8 80240AD8 ACC20038 */ sw $v0, 0x38($a2) +/* ED4CFC 80240ADC ACC9003C */ sw $t1, 0x3c($a2) +.L80240AE0: +/* ED4D00 80240AE0 8FBF004C */ lw $ra, 0x4c($sp) +/* ED4D04 80240AE4 8FBE0048 */ lw $fp, 0x48($sp) +/* ED4D08 80240AE8 8FB70044 */ lw $s7, 0x44($sp) +/* ED4D0C 80240AEC 8FB60040 */ lw $s6, 0x40($sp) +/* ED4D10 80240AF0 8FB5003C */ lw $s5, 0x3c($sp) +/* ED4D14 80240AF4 8FB40038 */ lw $s4, 0x38($sp) +/* ED4D18 80240AF8 8FB30034 */ lw $s3, 0x34($sp) +/* ED4D1C 80240AFC 8FB20030 */ lw $s2, 0x30($sp) +/* ED4D20 80240B00 8FB1002C */ lw $s1, 0x2c($sp) +/* ED4D24 80240B04 8FB00028 */ lw $s0, 0x28($sp) +/* ED4D28 80240B08 03E00008 */ jr $ra +/* ED4D2C 80240B0C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_ED46D0/func_80240B10_ED4D30.s b/asm/nonmatchings/code_ED46D0/func_80240B10_ED4D30.s new file mode 100644 index 0000000000..a870a0ed55 --- /dev/null +++ b/asm/nonmatchings/code_ED46D0/func_80240B10_ED4D30.s @@ -0,0 +1,540 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B10_ED4D30 +/* ED4D30 80240B10 27BDFF68 */ addiu $sp, $sp, -0x98 +/* ED4D34 80240B14 24040030 */ addiu $a0, $zero, 0x30 +/* ED4D38 80240B18 3C038008 */ lui $v1, %hi(D_8007C760) +/* ED4D3C 80240B1C 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* ED4D40 80240B20 3C05800C */ lui $a1, %hi(D_800B8D80) +/* ED4D44 80240B24 24A58D80 */ addiu $a1, $a1, %lo(D_800B8D80) +/* ED4D48 80240B28 AFBF0064 */ sw $ra, 0x64($sp) +/* ED4D4C 80240B2C AFBE0060 */ sw $fp, 0x60($sp) +/* ED4D50 80240B30 AFB7005C */ sw $s7, 0x5c($sp) +/* ED4D54 80240B34 AFB60058 */ sw $s6, 0x58($sp) +/* ED4D58 80240B38 AFB50054 */ sw $s5, 0x54($sp) +/* ED4D5C 80240B3C AFB40050 */ sw $s4, 0x50($sp) +/* ED4D60 80240B40 AFB3004C */ sw $s3, 0x4c($sp) +/* ED4D64 80240B44 AFB20048 */ sw $s2, 0x48($sp) +/* ED4D68 80240B48 AFB10044 */ sw $s1, 0x44($sp) +/* ED4D6C 80240B4C AFB00040 */ sw $s0, 0x40($sp) +/* ED4D70 80240B50 F7BE0090 */ sdc1 $f30, 0x90($sp) +/* ED4D74 80240B54 F7BC0088 */ sdc1 $f28, 0x88($sp) +/* ED4D78 80240B58 F7BA0080 */ sdc1 $f26, 0x80($sp) +/* ED4D7C 80240B5C F7B80078 */ sdc1 $f24, 0x78($sp) +/* ED4D80 80240B60 F7B60070 */ sdc1 $f22, 0x70($sp) +/* ED4D84 80240B64 F7B40068 */ sdc1 $f20, 0x68($sp) +/* ED4D88 80240B68 00031080 */ sll $v0, $v1, 2 +/* ED4D8C 80240B6C 00431021 */ addu $v0, $v0, $v1 +/* ED4D90 80240B70 00021080 */ sll $v0, $v0, 2 +/* ED4D94 80240B74 00431023 */ subu $v0, $v0, $v1 +/* ED4D98 80240B78 000218C0 */ sll $v1, $v0, 3 +/* ED4D9C 80240B7C 00431021 */ addu $v0, $v0, $v1 +/* ED4DA0 80240B80 000210C0 */ sll $v0, $v0, 3 +/* ED4DA4 80240B84 0C04949C */ jal func_80125270 +/* ED4DA8 80240B88 0045B021 */ addu $s6, $v0, $a1 +/* ED4DAC 80240B8C 0C0493D1 */ jal func_80124F44 +/* ED4DB0 80240B90 0040202D */ daddu $a0, $v0, $zero +/* ED4DB4 80240B94 0040882D */ daddu $s1, $v0, $zero +/* ED4DB8 80240B98 27B50028 */ addiu $s5, $sp, 0x28 +/* ED4DBC 80240B9C 27B3002C */ addiu $s3, $sp, 0x2c +/* ED4DC0 80240BA0 27B40030 */ addiu $s4, $sp, 0x30 +/* ED4DC4 80240BA4 27B20034 */ addiu $s2, $sp, 0x34 +/* ED4DC8 80240BA8 8E220008 */ lw $v0, 8($s1) +/* ED4DCC 80240BAC C6200098 */ lwc1 $f0, 0x98($s1) +/* ED4DD0 80240BB0 8C42000C */ lw $v0, 0xc($v0) +/* ED4DD4 80240BB4 3C013F80 */ lui $at, 0x3f80 +/* ED4DD8 80240BB8 4481C000 */ mtc1 $at, $f24 +/* ED4DDC 80240BBC C45E0004 */ lwc1 $f30, 4($v0) +/* ED4DE0 80240BC0 4680F7A0 */ cvt.s.w $f30, $f30 +/* ED4DE4 80240BC4 461E0001 */ sub.s $f0, $f0, $f30 +/* ED4DE8 80240BC8 C448001C */ lwc1 $f8, 0x1c($v0) +/* ED4DEC 80240BCC 46804220 */ cvt.s.w $f8, $f8 +/* ED4DF0 80240BD0 E7A80038 */ swc1 $f8, 0x38($sp) +/* ED4DF4 80240BD4 44050000 */ mfc1 $a1, $f0 +/* ED4DF8 80240BD8 C62000A0 */ lwc1 $f0, 0xa0($s1) +/* ED4DFC 80240BDC 26D000D4 */ addiu $s0, $s6, 0xd4 +/* ED4E00 80240BE0 E7B80010 */ swc1 $f24, 0x10($sp) +/* ED4E04 80240BE4 AFB50014 */ sw $s5, 0x14($sp) +/* ED4E08 80240BE8 AFB30018 */ sw $s3, 0x18($sp) +/* ED4E0C 80240BEC AFB4001C */ sw $s4, 0x1c($sp) +/* ED4E10 80240BF0 46080201 */ sub.s $f8, $f0, $f8 +/* ED4E14 80240BF4 AFB20020 */ sw $s2, 0x20($sp) +/* ED4E18 80240BF8 8E26009C */ lw $a2, 0x9c($s1) +/* ED4E1C 80240BFC 44074000 */ mfc1 $a3, $f8 +/* ED4E20 80240C00 0C00AA44 */ jal func_8002A910 +/* ED4E24 80240C04 0200202D */ daddu $a0, $s0, $zero +/* ED4E28 80240C08 C7A00034 */ lwc1 $f0, 0x34($sp) +/* ED4E2C 80240C0C C7A60028 */ lwc1 $f6, 0x28($sp) +/* ED4E30 80240C10 4600C003 */ div.s $f0, $f24, $f0 +/* ED4E34 80240C14 46003182 */ mul.s $f6, $f6, $f0 +/* ED4E38 80240C18 00000000 */ nop +/* ED4E3C 80240C1C C7A4002C */ lwc1 $f4, 0x2c($sp) +/* ED4E40 80240C20 46000087 */ neg.s $f2, $f0 +/* ED4E44 80240C24 46022102 */ mul.s $f4, $f4, $f2 +/* ED4E48 80240C28 00000000 */ nop +/* ED4E4C 80240C2C C7A20030 */ lwc1 $f2, 0x30($sp) +/* ED4E50 80240C30 46001082 */ mul.s $f2, $f2, $f0 +/* ED4E54 80240C34 00000000 */ nop +/* ED4E58 80240C38 44804000 */ mtc1 $zero, $f8 +/* ED4E5C 80240C3C 00000000 */ nop +/* ED4E60 80240C40 4608003C */ c.lt.s $f0, $f8 +/* ED4E64 80240C44 E7A00034 */ swc1 $f0, 0x34($sp) +/* ED4E68 80240C48 E7A60028 */ swc1 $f6, 0x28($sp) +/* ED4E6C 80240C4C E7A4002C */ swc1 $f4, 0x2c($sp) +/* ED4E70 80240C50 45000003 */ bc1f .L80240C60 +/* ED4E74 80240C54 E7A20030 */ swc1 $f2, 0x30($sp) +/* ED4E78 80240C58 E7A80028 */ swc1 $f8, 0x28($sp) +/* ED4E7C 80240C5C E7B8002C */ swc1 $f24, 0x2c($sp) +.L80240C60: +/* ED4E80 80240C60 C7B60028 */ lwc1 $f22, 0x28($sp) +/* ED4E84 80240C64 C7B4002C */ lwc1 $f20, 0x2c($sp) +/* ED4E88 80240C68 C6200098 */ lwc1 $f0, 0x98($s1) +/* ED4E8C 80240C6C C62200A0 */ lwc1 $f2, 0xa0($s1) +/* ED4E90 80240C70 C7A80038 */ lwc1 $f8, 0x38($sp) +/* ED4E94 80240C74 E7B80010 */ swc1 $f24, 0x10($sp) +/* ED4E98 80240C78 AFB50014 */ sw $s5, 0x14($sp) +/* ED4E9C 80240C7C AFB30018 */ sw $s3, 0x18($sp) +/* ED4EA0 80240C80 461E0001 */ sub.s $f0, $f0, $f30 +/* ED4EA4 80240C84 AFB4001C */ sw $s4, 0x1c($sp) +/* ED4EA8 80240C88 AFB20020 */ sw $s2, 0x20($sp) +/* ED4EAC 80240C8C 46081200 */ add.s $f8, $f2, $f8 +/* ED4EB0 80240C90 8E26009C */ lw $a2, 0x9c($s1) +/* ED4EB4 80240C94 44050000 */ mfc1 $a1, $f0 +/* ED4EB8 80240C98 44074000 */ mfc1 $a3, $f8 +/* ED4EBC 80240C9C 0C00AA44 */ jal func_8002A910 +/* ED4EC0 80240CA0 0200202D */ daddu $a0, $s0, $zero +/* ED4EC4 80240CA4 C7A00034 */ lwc1 $f0, 0x34($sp) +/* ED4EC8 80240CA8 C7A60028 */ lwc1 $f6, 0x28($sp) +/* ED4ECC 80240CAC 4600C003 */ div.s $f0, $f24, $f0 +/* ED4ED0 80240CB0 46003182 */ mul.s $f6, $f6, $f0 +/* ED4ED4 80240CB4 00000000 */ nop +/* ED4ED8 80240CB8 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* ED4EDC 80240CBC 46000087 */ neg.s $f2, $f0 +/* ED4EE0 80240CC0 46022102 */ mul.s $f4, $f4, $f2 +/* ED4EE4 80240CC4 00000000 */ nop +/* ED4EE8 80240CC8 C7A20030 */ lwc1 $f2, 0x30($sp) +/* ED4EEC 80240CCC 46001082 */ mul.s $f2, $f2, $f0 +/* ED4EF0 80240CD0 00000000 */ nop +/* ED4EF4 80240CD4 4600B686 */ mov.s $f26, $f22 +/* ED4EF8 80240CD8 44804000 */ mtc1 $zero, $f8 +/* ED4EFC 80240CDC 4600A706 */ mov.s $f28, $f20 +/* ED4F00 80240CE0 4608003C */ c.lt.s $f0, $f8 +/* ED4F04 80240CE4 E7A00034 */ swc1 $f0, 0x34($sp) +/* ED4F08 80240CE8 E7A60028 */ swc1 $f6, 0x28($sp) +/* ED4F0C 80240CEC E7A4002C */ swc1 $f4, 0x2c($sp) +/* ED4F10 80240CF0 45000003 */ bc1f .L80240D00 +/* ED4F14 80240CF4 E7A20030 */ swc1 $f2, 0x30($sp) +/* ED4F18 80240CF8 E7A80028 */ swc1 $f8, 0x28($sp) +/* ED4F1C 80240CFC E7B8002C */ swc1 $f24, 0x2c($sp) +.L80240D00: +/* ED4F20 80240D00 C7A20028 */ lwc1 $f2, 0x28($sp) +/* ED4F24 80240D04 4616103C */ c.lt.s $f2, $f22 +/* ED4F28 80240D08 00000000 */ nop +/* ED4F2C 80240D0C 45030001 */ bc1tl .L80240D14 +/* ED4F30 80240D10 46001686 */ mov.s $f26, $f2 +.L80240D14: +/* ED4F34 80240D14 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* ED4F38 80240D18 4614003C */ c.lt.s $f0, $f20 +/* ED4F3C 80240D1C 00000000 */ nop +/* ED4F40 80240D20 45030001 */ bc1tl .L80240D28 +/* ED4F44 80240D24 46000706 */ mov.s $f28, $f0 +.L80240D28: +/* ED4F48 80240D28 4602B03C */ c.lt.s $f22, $f2 +/* ED4F4C 80240D2C 00000000 */ nop +/* ED4F50 80240D30 45030001 */ bc1tl .L80240D38 +/* ED4F54 80240D34 46001586 */ mov.s $f22, $f2 +.L80240D38: +/* ED4F58 80240D38 4600A03C */ c.lt.s $f20, $f0 +/* ED4F5C 80240D3C 00000000 */ nop +/* ED4F60 80240D40 45030001 */ bc1tl .L80240D48 +/* ED4F64 80240D44 46000506 */ mov.s $f20, $f0 +.L80240D48: +/* ED4F68 80240D48 C6200098 */ lwc1 $f0, 0x98($s1) +/* ED4F6C 80240D4C C62200A0 */ lwc1 $f2, 0xa0($s1) +/* ED4F70 80240D50 C7A80038 */ lwc1 $f8, 0x38($sp) +/* ED4F74 80240D54 E7B80010 */ swc1 $f24, 0x10($sp) +/* ED4F78 80240D58 AFB50014 */ sw $s5, 0x14($sp) +/* ED4F7C 80240D5C AFB30018 */ sw $s3, 0x18($sp) +/* ED4F80 80240D60 461E0000 */ add.s $f0, $f0, $f30 +/* ED4F84 80240D64 AFB4001C */ sw $s4, 0x1c($sp) +/* ED4F88 80240D68 AFB20020 */ sw $s2, 0x20($sp) +/* ED4F8C 80240D6C 46081200 */ add.s $f8, $f2, $f8 +/* ED4F90 80240D70 8E26009C */ lw $a2, 0x9c($s1) +/* ED4F94 80240D74 44050000 */ mfc1 $a1, $f0 +/* ED4F98 80240D78 44074000 */ mfc1 $a3, $f8 +/* ED4F9C 80240D7C 0C00AA44 */ jal func_8002A910 +/* ED4FA0 80240D80 0200202D */ daddu $a0, $s0, $zero +/* ED4FA4 80240D84 C7A00034 */ lwc1 $f0, 0x34($sp) +/* ED4FA8 80240D88 C7A60028 */ lwc1 $f6, 0x28($sp) +/* ED4FAC 80240D8C 4600C003 */ div.s $f0, $f24, $f0 +/* ED4FB0 80240D90 46003182 */ mul.s $f6, $f6, $f0 +/* ED4FB4 80240D94 00000000 */ nop +/* ED4FB8 80240D98 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* ED4FBC 80240D9C 46000087 */ neg.s $f2, $f0 +/* ED4FC0 80240DA0 46022102 */ mul.s $f4, $f4, $f2 +/* ED4FC4 80240DA4 00000000 */ nop +/* ED4FC8 80240DA8 C7A20030 */ lwc1 $f2, 0x30($sp) +/* ED4FCC 80240DAC 46001082 */ mul.s $f2, $f2, $f0 +/* ED4FD0 80240DB0 00000000 */ nop +/* ED4FD4 80240DB4 44804000 */ mtc1 $zero, $f8 +/* ED4FD8 80240DB8 00000000 */ nop +/* ED4FDC 80240DBC 4608003C */ c.lt.s $f0, $f8 +/* ED4FE0 80240DC0 E7A00034 */ swc1 $f0, 0x34($sp) +/* ED4FE4 80240DC4 E7A60028 */ swc1 $f6, 0x28($sp) +/* ED4FE8 80240DC8 E7A4002C */ swc1 $f4, 0x2c($sp) +/* ED4FEC 80240DCC 45000003 */ bc1f .L80240DDC +/* ED4FF0 80240DD0 E7A20030 */ swc1 $f2, 0x30($sp) +/* ED4FF4 80240DD4 E7B80028 */ swc1 $f24, 0x28($sp) +/* ED4FF8 80240DD8 E7B8002C */ swc1 $f24, 0x2c($sp) +.L80240DDC: +/* ED4FFC 80240DDC C7A20028 */ lwc1 $f2, 0x28($sp) +/* ED5000 80240DE0 461A103C */ c.lt.s $f2, $f26 +/* ED5004 80240DE4 00000000 */ nop +/* ED5008 80240DE8 45030001 */ bc1tl .L80240DF0 +/* ED500C 80240DEC 46001686 */ mov.s $f26, $f2 +.L80240DF0: +/* ED5010 80240DF0 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* ED5014 80240DF4 461C003C */ c.lt.s $f0, $f28 +/* ED5018 80240DF8 00000000 */ nop +/* ED501C 80240DFC 45030001 */ bc1tl .L80240E04 +/* ED5020 80240E00 46000706 */ mov.s $f28, $f0 +.L80240E04: +/* ED5024 80240E04 4602B03C */ c.lt.s $f22, $f2 +/* ED5028 80240E08 00000000 */ nop +/* ED502C 80240E0C 45030001 */ bc1tl .L80240E14 +/* ED5030 80240E10 46001586 */ mov.s $f22, $f2 +.L80240E14: +/* ED5034 80240E14 4600A03C */ c.lt.s $f20, $f0 +/* ED5038 80240E18 00000000 */ nop +/* ED503C 80240E1C 45030001 */ bc1tl .L80240E24 +/* ED5040 80240E20 46000506 */ mov.s $f20, $f0 +.L80240E24: +/* ED5044 80240E24 C6200098 */ lwc1 $f0, 0x98($s1) +/* ED5048 80240E28 C62200A0 */ lwc1 $f2, 0xa0($s1) +/* ED504C 80240E2C C7A80038 */ lwc1 $f8, 0x38($sp) +/* ED5050 80240E30 E7B80010 */ swc1 $f24, 0x10($sp) +/* ED5054 80240E34 AFB50014 */ sw $s5, 0x14($sp) +/* ED5058 80240E38 AFB30018 */ sw $s3, 0x18($sp) +/* ED505C 80240E3C 461E0000 */ add.s $f0, $f0, $f30 +/* ED5060 80240E40 AFB4001C */ sw $s4, 0x1c($sp) +/* ED5064 80240E44 AFB20020 */ sw $s2, 0x20($sp) +/* ED5068 80240E48 46081201 */ sub.s $f8, $f2, $f8 +/* ED506C 80240E4C 8E26009C */ lw $a2, 0x9c($s1) +/* ED5070 80240E50 44050000 */ mfc1 $a1, $f0 +/* ED5074 80240E54 44074000 */ mfc1 $a3, $f8 +/* ED5078 80240E58 0C00AA44 */ jal func_8002A910 +/* ED507C 80240E5C 26C400D4 */ addiu $a0, $s6, 0xd4 +/* ED5080 80240E60 C7A00034 */ lwc1 $f0, 0x34($sp) +/* ED5084 80240E64 C7A60028 */ lwc1 $f6, 0x28($sp) +/* ED5088 80240E68 4600C003 */ div.s $f0, $f24, $f0 +/* ED508C 80240E6C 46003182 */ mul.s $f6, $f6, $f0 +/* ED5090 80240E70 00000000 */ nop +/* ED5094 80240E74 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* ED5098 80240E78 46000087 */ neg.s $f2, $f0 +/* ED509C 80240E7C 46022102 */ mul.s $f4, $f4, $f2 +/* ED50A0 80240E80 00000000 */ nop +/* ED50A4 80240E84 C7A20030 */ lwc1 $f2, 0x30($sp) +/* ED50A8 80240E88 46001082 */ mul.s $f2, $f2, $f0 +/* ED50AC 80240E8C 00000000 */ nop +/* ED50B0 80240E90 44804000 */ mtc1 $zero, $f8 +/* ED50B4 80240E94 00000000 */ nop +/* ED50B8 80240E98 4608003C */ c.lt.s $f0, $f8 +/* ED50BC 80240E9C E7A00034 */ swc1 $f0, 0x34($sp) +/* ED50C0 80240EA0 E7A60028 */ swc1 $f6, 0x28($sp) +/* ED50C4 80240EA4 E7A4002C */ swc1 $f4, 0x2c($sp) +/* ED50C8 80240EA8 45000003 */ bc1f .L80240EB8 +/* ED50CC 80240EAC E7A20030 */ swc1 $f2, 0x30($sp) +/* ED50D0 80240EB0 E7B80028 */ swc1 $f24, 0x28($sp) +/* ED50D4 80240EB4 E7B8002C */ swc1 $f24, 0x2c($sp) +.L80240EB8: +/* ED50D8 80240EB8 C7A20028 */ lwc1 $f2, 0x28($sp) +/* ED50DC 80240EBC 461A103C */ c.lt.s $f2, $f26 +/* ED50E0 80240EC0 00000000 */ nop +/* ED50E4 80240EC4 45030001 */ bc1tl .L80240ECC +/* ED50E8 80240EC8 46001686 */ mov.s $f26, $f2 +.L80240ECC: +/* ED50EC 80240ECC C7A0002C */ lwc1 $f0, 0x2c($sp) +/* ED50F0 80240ED0 461C003C */ c.lt.s $f0, $f28 +/* ED50F4 80240ED4 00000000 */ nop +/* ED50F8 80240ED8 45030001 */ bc1tl .L80240EE0 +/* ED50FC 80240EDC 46000706 */ mov.s $f28, $f0 +.L80240EE0: +/* ED5100 80240EE0 4602B03C */ c.lt.s $f22, $f2 +/* ED5104 80240EE4 00000000 */ nop +/* ED5108 80240EE8 45030001 */ bc1tl .L80240EF0 +/* ED510C 80240EEC 46001586 */ mov.s $f22, $f2 +.L80240EF0: +/* ED5110 80240EF0 4600A03C */ c.lt.s $f20, $f0 +/* ED5114 80240EF4 00000000 */ nop +/* ED5118 80240EF8 45030001 */ bc1tl .L80240F00 +/* ED511C 80240EFC 46000506 */ mov.s $f20, $f0 +.L80240F00: +/* ED5120 80240F00 4616D032 */ c.eq.s $f26, $f22 +/* ED5124 80240F04 00000000 */ nop +/* ED5128 80240F08 45000005 */ bc1f .L80240F20 +/* ED512C 80240F0C 00000000 */ nop +/* ED5130 80240F10 4614E032 */ c.eq.s $f28, $f20 +/* ED5134 80240F14 00000000 */ nop +/* ED5138 80240F18 450100EC */ bc1t .L802412CC +/* ED513C 80240F1C 00000000 */ nop +.L80240F20: +/* ED5140 80240F20 86C2000A */ lh $v0, 0xa($s6) +/* ED5144 80240F24 44821000 */ mtc1 $v0, $f2 +/* ED5148 80240F28 00000000 */ nop +/* ED514C 80240F2C 468010A0 */ cvt.s.w $f2, $f2 +/* ED5150 80240F30 4602D002 */ mul.s $f0, $f26, $f2 +/* ED5154 80240F34 00000000 */ nop +/* ED5158 80240F38 46020000 */ add.s $f0, $f0, $f2 +/* ED515C 80240F3C 3C013F00 */ lui $at, 0x3f00 +/* ED5160 80240F40 44813000 */ mtc1 $at, $f6 +/* ED5164 80240F44 00000000 */ nop +/* ED5168 80240F48 46060682 */ mul.s $f26, $f0, $f6 +/* ED516C 80240F4C 00000000 */ nop +/* ED5170 80240F50 86C2000C */ lh $v0, 0xc($s6) +/* ED5174 80240F54 44822000 */ mtc1 $v0, $f4 +/* ED5178 80240F58 00000000 */ nop +/* ED517C 80240F5C 46802120 */ cvt.s.w $f4, $f4 +/* ED5180 80240F60 4604E002 */ mul.s $f0, $f28, $f4 +/* ED5184 80240F64 00000000 */ nop +/* ED5188 80240F68 46040000 */ add.s $f0, $f0, $f4 +/* ED518C 80240F6C 46060702 */ mul.s $f28, $f0, $f6 +/* ED5190 80240F70 00000000 */ nop +/* ED5194 80240F74 4602B002 */ mul.s $f0, $f22, $f2 +/* ED5198 80240F78 00000000 */ nop +/* ED519C 80240F7C 3C18E300 */ lui $t8, 0xe300 +/* ED51A0 80240F80 37180A01 */ ori $t8, $t8, 0xa01 +/* ED51A4 80240F84 3C1EE200 */ lui $fp, 0xe200 +/* ED51A8 80240F88 37DE001C */ ori $fp, $fp, 0x1c +/* ED51AC 80240F8C 46020000 */ add.s $f0, $f0, $f2 +/* ED51B0 80240F90 3C060F0A */ lui $a2, 0xf0a +/* ED51B4 80240F94 34C64010 */ ori $a2, $a2, 0x4010 +/* ED51B8 80240F98 46060582 */ mul.s $f22, $f0, $f6 +/* ED51BC 80240F9C 00000000 */ nop +/* ED51C0 80240FA0 3C13800A */ lui $s3, %hi(D_800A15C4) +/* ED51C4 80240FA4 267315C4 */ addiu $s3, $s3, %lo(D_800A15C4) +/* ED51C8 80240FA8 3C12800A */ lui $s2, %hi(D_800A1530) +/* ED51CC 80240FAC 26521530 */ addiu $s2, $s2, %lo(D_800A1530) +/* ED51D0 80240FB0 AFB8003C */ sw $t8, 0x3c($sp) +/* ED51D4 80240FB4 8E700000 */ lw $s0, ($s3) +/* ED51D8 80240FB8 4604A002 */ mul.s $f0, $f20, $f4 +/* ED51DC 80240FBC 00000000 */ nop +/* ED51E0 80240FC0 8E440000 */ lw $a0, ($s2) +/* ED51E4 80240FC4 86C3000E */ lh $v1, 0xe($s6) +/* ED51E8 80240FC8 86C50010 */ lh $a1, 0x10($s6) +/* ED51EC 80240FCC 0200102D */ daddu $v0, $s0, $zero +/* ED51F0 80240FD0 46040000 */ add.s $f0, $f0, $f4 +/* ED51F4 80240FD4 26100008 */ addiu $s0, $s0, 8 +/* ED51F8 80240FD8 AE700000 */ sw $s0, ($s3) +/* ED51FC 80240FDC 46060502 */ mul.s $f20, $f0, $f6 +/* ED5200 80240FE0 00000000 */ nop +/* ED5204 80240FE4 AC580000 */ sw $t8, ($v0) +/* ED5208 80240FE8 AC400004 */ sw $zero, 4($v0) +/* ED520C 80240FEC 26020008 */ addiu $v0, $s0, 8 +/* ED5210 80240FF0 44831000 */ mtc1 $v1, $f2 +/* ED5214 80240FF4 00000000 */ nop +/* ED5218 80240FF8 468010A0 */ cvt.s.w $f2, $f2 +/* ED521C 80240FFC 4602D680 */ add.s $f26, $f26, $f2 +/* ED5220 80241000 AE620000 */ sw $v0, ($s3) +/* ED5224 80241004 26020010 */ addiu $v0, $s0, 0x10 +/* ED5228 80241008 4602B580 */ add.s $f22, $f22, $f2 +/* ED522C 8024100C AE1E0000 */ sw $fp, ($s0) +/* ED5230 80241010 44850000 */ mtc1 $a1, $f0 +/* ED5234 80241014 00000000 */ nop +/* ED5238 80241018 46800020 */ cvt.s.w $f0, $f0 +/* ED523C 8024101C 4600E700 */ add.s $f28, $f28, $f0 +/* ED5240 80241020 AE060004 */ sw $a2, 4($s0) +/* ED5244 80241024 AE620000 */ sw $v0, ($s3) +/* ED5248 80241028 0C019BF8 */ jal func_80066FE0 +/* ED524C 8024102C 4600A500 */ add.s $f20, $f20, $f0 +/* ED5250 80241030 30420007 */ andi $v0, $v0, 7 +/* ED5254 80241034 1040000B */ beqz $v0, .L80241064 +/* ED5258 80241038 3C15FF10 */ lui $s5, 0xff10 +/* ED525C 8024103C 8E440000 */ lw $a0, ($s2) +/* ED5260 80241040 0C019BF8 */ jal func_80066FE0 +/* ED5264 80241044 00000000 */ nop +/* ED5268 80241048 3C048024 */ lui $a0, %hi(D_80244BB8) +/* ED526C 8024104C 24844BB8 */ addiu $a0, $a0, %lo(D_80244BB8) +/* ED5270 80241050 3C058024 */ lui $a1, %hi(D_80244BEC) +/* ED5274 80241054 24A54BEC */ addiu $a1, $a1, %lo(D_80244BEC) +/* ED5278 80241058 240600AF */ addiu $a2, $zero, 0xaf +/* ED527C 8024105C 0C00973F */ jal func_80025CFC +/* ED5280 80241060 0040382D */ daddu $a3, $v0, $zero +.L80241064: +/* ED5284 80241064 36B5013F */ ori $s5, $s5, 0x13f +/* ED5288 80241068 3C17FCFF */ lui $s7, 0xfcff +/* ED528C 8024106C 8E440000 */ lw $a0, ($s2) +/* ED5290 80241070 36F7FFFF */ ori $s7, $s7, 0xffff +/* ED5294 80241074 0C019BF8 */ jal func_80066FE0 +/* ED5298 80241078 AE150008 */ sw $s5, 8($s0) +/* ED529C 8024107C 3C03FFFD */ lui $v1, 0xfffd +/* ED52A0 80241080 3463FEFF */ ori $v1, $v1, 0xfeff +/* ED52A4 80241084 3C05F8F0 */ lui $a1, 0xf8f0 +/* ED52A8 80241088 3C14800A */ lui $s4, %hi(D_800A15A4) +/* ED52AC 8024108C 269415A4 */ addiu $s4, $s4, %lo(D_800A15A4) +/* ED52B0 80241090 34A5F000 */ ori $a1, $a1, 0xf000 +/* ED52B4 80241094 8E720000 */ lw $s2, ($s3) +/* ED52B8 80241098 8E840000 */ lw $a0, ($s4) +/* ED52BC 8024109C 3C16E700 */ lui $s6, 0xe700 +/* ED52C0 802410A0 AE02000C */ sw $v0, 0xc($s0) +/* ED52C4 802410A4 0240102D */ daddu $v0, $s2, $zero +/* ED52C8 802410A8 26520008 */ addiu $s2, $s2, 8 +/* ED52CC 802410AC AE720000 */ sw $s2, ($s3) +/* ED52D0 802410B0 AC570000 */ sw $s7, ($v0) +/* ED52D4 802410B4 AC430004 */ sw $v1, 4($v0) +/* ED52D8 802410B8 26420008 */ addiu $v0, $s2, 8 +/* ED52DC 802410BC AE620000 */ sw $v0, ($s3) +/* ED52E0 802410C0 3C02FA00 */ lui $v0, 0xfa00 +/* ED52E4 802410C4 AE420000 */ sw $v0, ($s2) +/* ED52E8 802410C8 26420010 */ addiu $v0, $s2, 0x10 +/* ED52EC 802410CC AE450004 */ sw $a1, 4($s2) +/* ED52F0 802410D0 AE620000 */ sw $v0, ($s3) +/* ED52F4 802410D4 3C02DE00 */ lui $v0, 0xde00 +/* ED52F8 802410D8 AE560008 */ sw $s6, 8($s2) +/* ED52FC 802410DC AE40000C */ sw $zero, 0xc($s2) +/* ED5300 802410E0 AE420010 */ sw $v0, 0x10($s2) +/* ED5304 802410E4 8E230008 */ lw $v1, 8($s1) +/* ED5308 802410E8 26420018 */ addiu $v0, $s2, 0x18 +/* ED530C 802410EC AE620000 */ sw $v0, ($s3) +/* ED5310 802410F0 8C630004 */ lw $v1, 4($v1) +/* ED5314 802410F4 26420020 */ addiu $v0, $s2, 0x20 +/* ED5318 802410F8 AE620000 */ sw $v0, ($s3) +/* ED531C 802410FC 8C630000 */ lw $v1, ($v1) +/* ED5320 80241100 26420028 */ addiu $v0, $s2, 0x28 +/* ED5324 80241104 AE620000 */ sw $v0, ($s3) +/* ED5328 80241108 AE560018 */ sw $s6, 0x18($s2) +/* ED532C 8024110C AE40001C */ sw $zero, 0x1c($s2) +/* ED5330 80241110 0C019BF8 */ jal func_80066FE0 +/* ED5334 80241114 AE430014 */ sw $v1, 0x14($s2) +/* ED5338 80241118 30420007 */ andi $v0, $v0, 7 +/* ED533C 8024111C 1040000B */ beqz $v0, .L8024114C +/* ED5340 80241120 3C11E200 */ lui $s1, 0xe200 +/* ED5344 80241124 8E840000 */ lw $a0, ($s4) +/* ED5348 80241128 0C019BF8 */ jal func_80066FE0 +/* ED534C 8024112C 00000000 */ nop +/* ED5350 80241130 3C048024 */ lui $a0, %hi(D_80244BB8) +/* ED5354 80241134 24844BB8 */ addiu $a0, $a0, %lo(D_80244BB8) +/* ED5358 80241138 3C058024 */ lui $a1, %hi(D_80244BEC) +/* ED535C 8024113C 24A54BEC */ addiu $a1, $a1, %lo(D_80244BEC) +/* ED5360 80241140 240600BA */ addiu $a2, $zero, 0xba +/* ED5364 80241144 0C00973F */ jal func_80025CFC +/* ED5368 80241148 0040382D */ daddu $a3, $v0, $zero +.L8024114C: +/* ED536C 8024114C 8E840000 */ lw $a0, ($s4) +/* ED5370 80241150 36311D00 */ ori $s1, $s1, 0x1d00 +/* ED5374 80241154 0C019BF8 */ jal func_80066FE0 +/* ED5378 80241158 AE550020 */ sw $s5, 0x20($s2) +/* ED537C 8024115C 3C090050 */ lui $t1, 0x50 +/* ED5380 80241160 35294E50 */ ori $t1, $t1, 0x4e50 +/* ED5384 80241164 3C0AE300 */ lui $t2, 0xe300 +/* ED5388 80241168 354A1201 */ ori $t2, $t2, 0x1201 +/* ED538C 8024116C 3C0BE300 */ lui $t3, 0xe300 +/* ED5390 80241170 356B0C00 */ ori $t3, $t3, 0xc00 +/* ED5394 80241174 3C0CD700 */ lui $t4, 0xd700 +/* ED5398 80241178 358C0002 */ ori $t4, $t4, 2 +/* ED539C 8024117C 3C0DE300 */ lui $t5, 0xe300 +/* ED53A0 80241180 35AD1001 */ ori $t5, $t5, 0x1001 +/* ED53A4 80241184 3C0EE300 */ lui $t6, 0xe300 +/* ED53A8 80241188 35CE0D01 */ ori $t6, $t6, 0xd01 +/* ED53AC 8024118C 3C0FE300 */ lui $t7, 0xe300 +/* ED53B0 80241190 35EF0F00 */ ori $t7, $t7, 0xf00 +/* ED53B4 80241194 3C10FFFC */ lui $s0, 0xfffc +/* ED53B8 80241198 3610F67B */ ori $s0, $s0, 0xf67b +/* ED53BC 8024119C 4600D20D */ trunc.w.s $f8, $f26 +/* ED53C0 802411A0 44044000 */ mfc1 $a0, $f8 +/* ED53C4 802411A4 4600E20D */ trunc.w.s $f8, $f28 +/* ED53C8 802411A8 44054000 */ mfc1 $a1, $f8 +/* ED53CC 802411AC 4600B20D */ trunc.w.s $f8, $f22 +/* ED53D0 802411B0 44064000 */ mfc1 $a2, $f8 +/* ED53D4 802411B4 8E630000 */ lw $v1, ($s3) +/* ED53D8 802411B8 4600A20D */ trunc.w.s $f8, $f20 +/* ED53DC 802411BC 44074000 */ mfc1 $a3, $f8 +/* ED53E0 802411C0 AE420024 */ sw $v0, 0x24($s2) +/* ED53E4 802411C4 24020004 */ addiu $v0, $zero, 4 +/* ED53E8 802411C8 0060402D */ daddu $t0, $v1, $zero +/* ED53EC 802411CC 24630008 */ addiu $v1, $v1, 8 +/* ED53F0 802411D0 AE630000 */ sw $v1, ($s3) +/* ED53F4 802411D4 AD020004 */ sw $v0, 4($t0) +/* ED53F8 802411D8 24620008 */ addiu $v0, $v1, 8 +/* ED53FC 802411DC AD110000 */ sw $s1, ($t0) +/* ED5400 802411E0 AE620000 */ sw $v0, ($s3) +/* ED5404 802411E4 3C02EE00 */ lui $v0, 0xee00 +/* ED5408 802411E8 AC620000 */ sw $v0, ($v1) +/* ED540C 802411EC 3C027FDE */ lui $v0, 0x7fde +/* ED5410 802411F0 AC620004 */ sw $v0, 4($v1) +/* ED5414 802411F4 24620010 */ addiu $v0, $v1, 0x10 +/* ED5418 802411F8 AE620000 */ sw $v0, ($s3) +/* ED541C 802411FC 24620018 */ addiu $v0, $v1, 0x18 +/* ED5420 80241200 AC7E0008 */ sw $fp, 8($v1) +/* ED5424 80241204 AC69000C */ sw $t1, 0xc($v1) +/* ED5428 80241208 AE620000 */ sw $v0, ($s3) +/* ED542C 8024120C 24620020 */ addiu $v0, $v1, 0x20 +/* ED5430 80241210 AC6A0010 */ sw $t2, 0x10($v1) +/* ED5434 80241214 AC600014 */ sw $zero, 0x14($v1) +/* ED5438 80241218 AE620000 */ sw $v0, ($s3) +/* ED543C 8024121C 24620028 */ addiu $v0, $v1, 0x28 +/* ED5440 80241220 AC6B0018 */ sw $t3, 0x18($v1) +/* ED5444 80241224 AC60001C */ sw $zero, 0x1c($v1) +/* ED5448 80241228 AE620000 */ sw $v0, ($s3) +/* ED544C 8024122C 2402FFFF */ addiu $v0, $zero, -1 +/* ED5450 80241230 AC620024 */ sw $v0, 0x24($v1) +/* ED5454 80241234 24620030 */ addiu $v0, $v1, 0x30 +/* ED5458 80241238 AC6C0020 */ sw $t4, 0x20($v1) +/* ED545C 8024123C AE620000 */ sw $v0, ($s3) +/* ED5460 80241240 24620038 */ addiu $v0, $v1, 0x38 +/* ED5464 80241244 AC6D0028 */ sw $t5, 0x28($v1) +/* ED5468 80241248 AC60002C */ sw $zero, 0x2c($v1) +/* ED546C 8024124C AE620000 */ sw $v0, ($s3) +/* ED5470 80241250 24620040 */ addiu $v0, $v1, 0x40 +/* ED5474 80241254 AC6E0030 */ sw $t6, 0x30($v1) +/* ED5478 80241258 AC600034 */ sw $zero, 0x34($v1) +/* ED547C 8024125C AE620000 */ sw $v0, ($s3) +/* ED5480 80241260 24620048 */ addiu $v0, $v1, 0x48 +/* ED5484 80241264 AC6F0038 */ sw $t7, 0x38($v1) +/* ED5488 80241268 AC60003C */ sw $zero, 0x3c($v1) +/* ED548C 8024126C AE620000 */ sw $v0, ($s3) +/* ED5490 80241270 24620050 */ addiu $v0, $v1, 0x50 +/* ED5494 80241274 AC770040 */ sw $s7, 0x40($v1) +/* ED5498 80241278 AC700044 */ sw $s0, 0x44($v1) +/* ED549C 8024127C AE620000 */ sw $v0, ($s3) +/* ED54A0 80241280 AC760048 */ sw $s6, 0x48($v1) +/* ED54A4 80241284 0C09012C */ jal func_802404B0_ED46D0 +/* ED54A8 80241288 AC60004C */ sw $zero, 0x4c($v1) +/* ED54AC 8024128C 8E620000 */ lw $v0, ($s3) +/* ED54B0 80241290 0040182D */ daddu $v1, $v0, $zero +/* ED54B4 80241294 24420008 */ addiu $v0, $v0, 8 +/* ED54B8 80241298 AE620000 */ sw $v0, ($s3) +/* ED54BC 8024129C AC760000 */ sw $s6, ($v1) +/* ED54C0 802412A0 AC600004 */ sw $zero, 4($v1) +/* ED54C4 802412A4 24430008 */ addiu $v1, $v0, 8 +/* ED54C8 802412A8 AE630000 */ sw $v1, ($s3) +/* ED54CC 802412AC 8FB8003C */ lw $t8, 0x3c($sp) +/* ED54D0 802412B0 3C030010 */ lui $v1, 0x10 +/* ED54D4 802412B4 AC580000 */ sw $t8, ($v0) +/* ED54D8 802412B8 AC430004 */ sw $v1, 4($v0) +/* ED54DC 802412BC 24430010 */ addiu $v1, $v0, 0x10 +/* ED54E0 802412C0 AE630000 */ sw $v1, ($s3) +/* ED54E4 802412C4 AC510008 */ sw $s1, 8($v0) +/* ED54E8 802412C8 AC40000C */ sw $zero, 0xc($v0) +.L802412CC: +/* ED54EC 802412CC 8FBF0064 */ lw $ra, 0x64($sp) +/* ED54F0 802412D0 8FBE0060 */ lw $fp, 0x60($sp) +/* ED54F4 802412D4 8FB7005C */ lw $s7, 0x5c($sp) +/* ED54F8 802412D8 8FB60058 */ lw $s6, 0x58($sp) +/* ED54FC 802412DC 8FB50054 */ lw $s5, 0x54($sp) +/* ED5500 802412E0 8FB40050 */ lw $s4, 0x50($sp) +/* ED5504 802412E4 8FB3004C */ lw $s3, 0x4c($sp) +/* ED5508 802412E8 8FB20048 */ lw $s2, 0x48($sp) +/* ED550C 802412EC 8FB10044 */ lw $s1, 0x44($sp) +/* ED5510 802412F0 8FB00040 */ lw $s0, 0x40($sp) +/* ED5514 802412F4 D7BE0090 */ ldc1 $f30, 0x90($sp) +/* ED5518 802412F8 D7BC0088 */ ldc1 $f28, 0x88($sp) +/* ED551C 802412FC D7BA0080 */ ldc1 $f26, 0x80($sp) +/* ED5520 80241300 D7B80078 */ ldc1 $f24, 0x78($sp) +/* ED5524 80241304 D7B60070 */ ldc1 $f22, 0x70($sp) +/* ED5528 80241308 D7B40068 */ ldc1 $f20, 0x68($sp) +/* ED552C 8024130C 03E00008 */ jr $ra +/* ED5530 80241310 27BD0098 */ addiu $sp, $sp, 0x98 +/* ED5534 80241314 00000000 */ nop +/* ED5538 80241318 00000000 */ nop +/* ED553C 8024131C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED5540/func_80241320_ED5540.s b/asm/nonmatchings/code_ED5540/func_80241320_ED5540.s new file mode 100644 index 0000000000..e55e481f0e --- /dev/null +++ b/asm/nonmatchings/code_ED5540/func_80241320_ED5540.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241320_ED5540 +/* ED5540 80241320 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* ED5544 80241324 F7B40018 */ sdc1 $f20, 0x18($sp) +/* ED5548 80241328 4485A000 */ mtc1 $a1, $f20 +/* ED554C 8024132C F7B60020 */ sdc1 $f22, 0x20($sp) +/* ED5550 80241330 4486B000 */ mtc1 $a2, $f22 +/* ED5554 80241334 AFB00010 */ sw $s0, 0x10($sp) +/* ED5558 80241338 F7B80028 */ sdc1 $f24, 0x28($sp) +/* ED555C 8024133C 4487C000 */ mtc1 $a3, $f24 +/* ED5560 80241340 AFBF0014 */ sw $ra, 0x14($sp) +/* ED5564 80241344 0C01B198 */ jal osGetCause +/* ED5568 80241348 0080802D */ daddu $s0, $a0, $zero +/* ED556C 8024134C 4616A582 */ mul.s $f22, $f20, $f22 +/* ED5570 80241350 00000000 */ nop +/* ED5574 80241354 4618A502 */ mul.s $f20, $f20, $f24 +/* ED5578 80241358 00000000 */ nop +/* ED557C 8024135C 3C013F80 */ lui $at, 0x3f80 +/* ED5580 80241360 44810000 */ mtc1 $at, $f0 +/* ED5584 80241364 00000000 */ nop +/* ED5588 80241368 E6000014 */ swc1 $f0, 0x14($s0) +/* ED558C 8024136C E6160010 */ swc1 $f22, 0x10($s0) +/* ED5590 80241370 E6140018 */ swc1 $f20, 0x18($s0) +/* ED5594 80241374 8FBF0014 */ lw $ra, 0x14($sp) +/* ED5598 80241378 8FB00010 */ lw $s0, 0x10($sp) +/* ED559C 8024137C D7B80028 */ ldc1 $f24, 0x28($sp) +/* ED55A0 80241380 D7B60020 */ ldc1 $f22, 0x20($sp) +/* ED55A4 80241384 D7B40018 */ ldc1 $f20, 0x18($sp) +/* ED55A8 80241388 03E00008 */ jr $ra +/* ED55AC 8024138C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_ED5540/func_80241390_ED55B0.s b/asm/nonmatchings/code_ED5540/func_80241390_ED55B0.s new file mode 100644 index 0000000000..bff184dc21 --- /dev/null +++ b/asm/nonmatchings/code_ED5540/func_80241390_ED55B0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241390_ED55B0 +/* ED55B0 80241390 27BDFF78 */ addiu $sp, $sp, -0x88 +/* ED55B4 80241394 AFB10054 */ sw $s1, 0x54($sp) +/* ED55B8 80241398 0080882D */ daddu $s1, $a0, $zero +/* ED55BC 8024139C AFBF005C */ sw $ra, 0x5c($sp) +/* ED55C0 802413A0 AFB20058 */ sw $s2, 0x58($sp) +/* ED55C4 802413A4 AFB00050 */ sw $s0, 0x50($sp) +/* ED55C8 802413A8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* ED55CC 802413AC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* ED55D0 802413B0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* ED55D4 802413B4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* ED55D8 802413B8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* ED55DC 802413BC 8E30000C */ lw $s0, 0xc($s1) +/* ED55E0 802413C0 8E050000 */ lw $a1, ($s0) +/* ED55E4 802413C4 0C0B53A3 */ jal func_802D4E8C +/* ED55E8 802413C8 26100004 */ addiu $s0, $s0, 4 +/* ED55EC 802413CC 0C04949C */ jal func_80125270 +/* ED55F0 802413D0 0040202D */ daddu $a0, $v0, $zero +/* ED55F4 802413D4 8E050000 */ lw $a1, ($s0) +/* ED55F8 802413D8 26100004 */ addiu $s0, $s0, 4 +/* ED55FC 802413DC 0220202D */ daddu $a0, $s1, $zero +/* ED5600 802413E0 0C0B55FF */ jal func_802D57FC +/* ED5604 802413E4 0040902D */ daddu $s2, $v0, $zero +/* ED5608 802413E8 8E050000 */ lw $a1, ($s0) +/* ED560C 802413EC 26100004 */ addiu $s0, $s0, 4 +/* ED5610 802413F0 0220202D */ daddu $a0, $s1, $zero +/* ED5614 802413F4 0C0B55FF */ jal func_802D57FC +/* ED5618 802413F8 46000706 */ mov.s $f28, $f0 +/* ED561C 802413FC 8E050000 */ lw $a1, ($s0) +/* ED5620 80241400 26100004 */ addiu $s0, $s0, 4 +/* ED5624 80241404 0220202D */ daddu $a0, $s1, $zero +/* ED5628 80241408 0C0B55FF */ jal func_802D57FC +/* ED562C 8024140C 46000686 */ mov.s $f26, $f0 +/* ED5630 80241410 0220202D */ daddu $a0, $s1, $zero +/* ED5634 80241414 8E050000 */ lw $a1, ($s0) +/* ED5638 80241418 0C0B55FF */ jal func_802D57FC +/* ED563C 8024141C 46000586 */ mov.s $f22, $f0 +/* ED5640 80241420 0240202D */ daddu $a0, $s2, $zero +/* ED5644 80241424 0C0493D1 */ jal func_80124F44 +/* ED5648 80241428 46000606 */ mov.s $f24, $f0 +/* ED564C 8024142C 0040882D */ daddu $s1, $v0, $zero +/* ED5650 80241430 96220000 */ lhu $v0, ($s1) +/* ED5654 80241434 30420400 */ andi $v0, $v0, 0x400 +/* ED5658 80241438 1440001E */ bnez $v0, .L802414B4 +/* ED565C 8024143C 26300058 */ addiu $s0, $s1, 0x58 +/* ED5660 80241440 4480A000 */ mtc1 $zero, $f20 +/* ED5664 80241444 4406B000 */ mfc1 $a2, $f22 +/* ED5668 80241448 4405A000 */ mfc1 $a1, $f20 +/* ED566C 8024144C 4407A000 */ mfc1 $a3, $f20 +/* ED5670 80241450 0C01B2B0 */ jal func_8006CAC0 +/* ED5674 80241454 0200202D */ daddu $a0, $s0, $zero +/* ED5678 80241458 4405E000 */ mfc1 $a1, $f28 +/* ED567C 8024145C 4406D000 */ mfc1 $a2, $f26 +/* ED5680 80241460 4407C000 */ mfc1 $a3, $f24 +/* ED5684 80241464 0C0904C8 */ jal func_80241320_ED5540 +/* ED5688 80241468 27A40010 */ addiu $a0, $sp, 0x10 +/* ED568C 8024146C 27A40010 */ addiu $a0, $sp, 0x10 +/* ED5690 80241470 0200282D */ daddu $a1, $s0, $zero +/* ED5694 80241474 0C01B1F0 */ jal osSiRawReadIo +/* ED5698 80241478 0200302D */ daddu $a2, $s0, $zero +/* ED569C 8024147C 27A40010 */ addiu $a0, $sp, 0x10 +/* ED56A0 80241480 4600B587 */ neg.s $f22, $f22 +/* ED56A4 80241484 4405A000 */ mfc1 $a1, $f20 +/* ED56A8 80241488 4406B000 */ mfc1 $a2, $f22 +/* ED56AC 8024148C 0C01B2B0 */ jal func_8006CAC0 +/* ED56B0 80241490 00A0382D */ daddu $a3, $a1, $zero +/* ED56B4 80241494 27A40010 */ addiu $a0, $sp, 0x10 +/* ED56B8 80241498 0200282D */ daddu $a1, $s0, $zero +/* ED56BC 8024149C 0C01B1F0 */ jal osSiRawReadIo +/* ED56C0 802414A0 00A0302D */ daddu $a2, $a1, $zero +/* ED56C4 802414A4 96220000 */ lhu $v0, ($s1) +/* ED56C8 802414A8 34421400 */ ori $v0, $v0, 0x1400 +/* ED56CC 802414AC 0809054B */ j .L8024152C +/* ED56D0 802414B0 A6220000 */ sh $v0, ($s1) +.L802414B4: +/* ED56D4 802414B4 4480A000 */ mtc1 $zero, $f20 +/* ED56D8 802414B8 4406B000 */ mfc1 $a2, $f22 +/* ED56DC 802414BC 4405A000 */ mfc1 $a1, $f20 +/* ED56E0 802414C0 4407A000 */ mfc1 $a3, $f20 +/* ED56E4 802414C4 0C01B2B0 */ jal func_8006CAC0 +/* ED56E8 802414C8 27A40010 */ addiu $a0, $sp, 0x10 +/* ED56EC 802414CC 27A40010 */ addiu $a0, $sp, 0x10 +/* ED56F0 802414D0 26300058 */ addiu $s0, $s1, 0x58 +/* ED56F4 802414D4 0200282D */ daddu $a1, $s0, $zero +/* ED56F8 802414D8 0C01B1F0 */ jal osSiRawReadIo +/* ED56FC 802414DC 0200302D */ daddu $a2, $s0, $zero +/* ED5700 802414E0 4405E000 */ mfc1 $a1, $f28 +/* ED5704 802414E4 4406D000 */ mfc1 $a2, $f26 +/* ED5708 802414E8 4407C000 */ mfc1 $a3, $f24 +/* ED570C 802414EC 0C0904C8 */ jal func_80241320_ED5540 +/* ED5710 802414F0 27A40010 */ addiu $a0, $sp, 0x10 +/* ED5714 802414F4 27A40010 */ addiu $a0, $sp, 0x10 +/* ED5718 802414F8 0200282D */ daddu $a1, $s0, $zero +/* ED571C 802414FC 0C01B1F0 */ jal osSiRawReadIo +/* ED5720 80241500 0200302D */ daddu $a2, $s0, $zero +/* ED5724 80241504 27A40010 */ addiu $a0, $sp, 0x10 +/* ED5728 80241508 4600B587 */ neg.s $f22, $f22 +/* ED572C 8024150C 4405A000 */ mfc1 $a1, $f20 +/* ED5730 80241510 4406B000 */ mfc1 $a2, $f22 +/* ED5734 80241514 0C01B2B0 */ jal func_8006CAC0 +/* ED5738 80241518 00A0382D */ daddu $a3, $a1, $zero +/* ED573C 8024151C 27A40010 */ addiu $a0, $sp, 0x10 +/* ED5740 80241520 0200282D */ daddu $a1, $s0, $zero +/* ED5744 80241524 0C01B1F0 */ jal osSiRawReadIo +/* ED5748 80241528 00A0302D */ daddu $a2, $a1, $zero +.L8024152C: +/* ED574C 8024152C 8FBF005C */ lw $ra, 0x5c($sp) +/* ED5750 80241530 8FB20058 */ lw $s2, 0x58($sp) +/* ED5754 80241534 8FB10054 */ lw $s1, 0x54($sp) +/* ED5758 80241538 8FB00050 */ lw $s0, 0x50($sp) +/* ED575C 8024153C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* ED5760 80241540 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* ED5764 80241544 D7B80070 */ ldc1 $f24, 0x70($sp) +/* ED5768 80241548 D7B60068 */ ldc1 $f22, 0x68($sp) +/* ED576C 8024154C D7B40060 */ ldc1 $f20, 0x60($sp) +/* ED5770 80241550 24020002 */ addiu $v0, $zero, 2 +/* ED5774 80241554 03E00008 */ jr $ra +/* ED5778 80241558 27BD0088 */ addiu $sp, $sp, 0x88 +/* ED577C 8024155C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED8E20/func_80240000_ED8E20.s b/asm/nonmatchings/code_ED8E20/func_80240000_ED8E20.s new file mode 100644 index 0000000000..8486bd02b5 --- /dev/null +++ b/asm/nonmatchings/code_ED8E20/func_80240000_ED8E20.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_ED8E20 +/* ED8E20 80240000 3C028010 */ lui $v0, %hi(D_800FFC90) +/* ED8E24 80240004 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* ED8E28 80240008 8C430004 */ lw $v1, 4($v0) +/* ED8E2C 8024000C 3C040010 */ lui $a0, 0x10 +/* ED8E30 80240010 00641825 */ or $v1, $v1, $a0 +/* ED8E34 80240014 AC430004 */ sw $v1, 4($v0) +/* ED8E38 80240018 03E00008 */ jr $ra +/* ED8E3C 8024001C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_ED8E20/func_80240020_ED8E40.s b/asm/nonmatchings/code_ED8E20/func_80240020_ED8E40.s new file mode 100644 index 0000000000..d595b21485 --- /dev/null +++ b/asm/nonmatchings/code_ED8E20/func_80240020_ED8E40.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240020_ED8E40 +/* ED8E40 80240020 3C028017 */ lui $v0, %hi(D_80169B12) +/* ED8E44 80240024 84429B12 */ lh $v0, %lo(D_80169B12)($v0) +/* ED8E48 80240028 AC820084 */ sw $v0, 0x84($a0) +/* ED8E4C 8024002C 03E00008 */ jr $ra +/* ED8E50 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_ED8E20/func_80240034_ED8E54.s b/asm/nonmatchings/code_ED8E20/func_80240034_ED8E54.s new file mode 100644 index 0000000000..4433b132c5 --- /dev/null +++ b/asm/nonmatchings/code_ED8E20/func_80240034_ED8E54.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240034_ED8E54 +/* ED8E54 80240034 3C038017 */ lui $v1, %hi(D_80169B12) +/* ED8E58 80240038 84639B12 */ lh $v1, %lo(D_80169B12)($v1) +/* ED8E5C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ED8E60 80240040 AFB00010 */ sw $s0, 0x10($sp) +/* ED8E64 80240044 0080802D */ daddu $s0, $a0, $zero +/* ED8E68 80240048 AFBF0014 */ sw $ra, 0x14($sp) +/* ED8E6C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) +/* ED8E70 80240050 10620003 */ beq $v1, $v0, .L80240060 +/* ED8E74 80240054 24020002 */ addiu $v0, $zero, 2 +/* ED8E78 80240058 08090038 */ j .L802400E0 +/* ED8E7C 8024005C AE000084 */ sw $zero, 0x84($s0) +.L80240060: +/* ED8E80 80240060 3C038008 */ lui $v1, %hi(D_80079430) +/* ED8E84 80240064 8C639430 */ lw $v1, %lo(D_80079430)($v1) +/* ED8E88 80240068 80620040 */ lb $v0, 0x40($v1) +/* ED8E8C 8024006C 80670044 */ lb $a3, 0x44($v1) +/* ED8E90 80240070 04420001 */ bltzl $v0, .L80240078 +/* ED8E94 80240074 00021023 */ negu $v0, $v0 +.L80240078: +/* ED8E98 80240078 14400003 */ bnez $v0, .L80240088 +/* ED8E9C 8024007C 00000000 */ nop +/* ED8EA0 80240080 50E00017 */ beql $a3, $zero, .L802400E0 +/* ED8EA4 80240084 0000102D */ daddu $v0, $zero, $zero +.L80240088: +/* ED8EA8 80240088 44822000 */ mtc1 $v0, $f4 +/* ED8EAC 8024008C 00000000 */ nop +/* ED8EB0 80240090 46802120 */ cvt.s.w $f4, $f4 +/* ED8EB4 80240094 44062000 */ mfc1 $a2, $f4 +/* ED8EB8 80240098 44872000 */ mtc1 $a3, $f4 +/* ED8EBC 8024009C 00000000 */ nop +/* ED8EC0 802400A0 46802120 */ cvt.s.w $f4, $f4 +/* ED8EC4 802400A4 44806000 */ mtc1 $zero, $f12 +/* ED8EC8 802400A8 44072000 */ mfc1 $a3, $f4 +/* ED8ECC 802400AC 0C00ABDC */ jal fio_validate_header_checksums +/* ED8ED0 802400B0 46006386 */ mov.s $f14, $f12 +/* ED8ED4 802400B4 3C014270 */ lui $at, 0x4270 +/* ED8ED8 802400B8 44811000 */ mtc1 $at, $f2 +/* ED8EDC 802400BC 00000000 */ nop +/* ED8EE0 802400C0 4602003C */ c.lt.s $f0, $f2 +/* ED8EE4 802400C4 00000000 */ nop +/* ED8EE8 802400C8 45000004 */ bc1f .L802400DC +/* ED8EEC 802400CC 24020001 */ addiu $v0, $zero, 1 +/* ED8EF0 802400D0 AE020084 */ sw $v0, 0x84($s0) +/* ED8EF4 802400D4 08090038 */ j .L802400E0 +/* ED8EF8 802400D8 24020002 */ addiu $v0, $zero, 2 +.L802400DC: +/* ED8EFC 802400DC 0000102D */ daddu $v0, $zero, $zero +.L802400E0: +/* ED8F00 802400E0 8FBF0014 */ lw $ra, 0x14($sp) +/* ED8F04 802400E4 8FB00010 */ lw $s0, 0x10($sp) +/* ED8F08 802400E8 03E00008 */ jr $ra +/* ED8F0C 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ED8E20/func_802400F0_ED8F10.s b/asm/nonmatchings/code_ED8E20/func_802400F0_ED8F10.s new file mode 100644 index 0000000000..2126656f62 --- /dev/null +++ b/asm/nonmatchings/code_ED8E20/func_802400F0_ED8F10.s @@ -0,0 +1,74 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400F0_ED8F10 +/* ED8F10 802400F0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* ED8F14 802400F4 AFB00020 */ sw $s0, 0x20($sp) +/* ED8F18 802400F8 0080802D */ daddu $s0, $a0, $zero +/* ED8F1C 802400FC AFBF002C */ sw $ra, 0x2c($sp) +/* ED8F20 80240100 AFB20028 */ sw $s2, 0x28($sp) +/* ED8F24 80240104 0C017C4A */ jal func_8005F128 +/* ED8F28 80240108 AFB10024 */ sw $s1, 0x24($sp) +/* ED8F2C 8024010C 0200202D */ daddu $a0, $s0, $zero +/* ED8F30 80240110 3C05FE36 */ lui $a1, 0xfe36 +/* ED8F34 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 +/* ED8F38 80240118 0C0B53A3 */ jal func_802D4E8C +/* ED8F3C 8024011C 0040902D */ daddu $s2, $v0, $zero +/* ED8F40 80240120 0200202D */ daddu $a0, $s0, $zero +/* ED8F44 80240124 3C05FE36 */ lui $a1, 0xfe36 +/* ED8F48 80240128 8E430014 */ lw $v1, 0x14($s2) +/* ED8F4C 8024012C 00028900 */ sll $s1, $v0, 4 +/* ED8F50 80240130 02231821 */ addu $v1, $s1, $v1 +/* ED8F54 80240134 C4600000 */ lwc1 $f0, ($v1) +/* ED8F58 80240138 4600008D */ trunc.w.s $f2, $f0 +/* ED8F5C 8024013C 44061000 */ mfc1 $a2, $f2 +/* ED8F60 80240140 0C0B551A */ jal func_802D5468 +/* ED8F64 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 +/* ED8F68 80240148 0200202D */ daddu $a0, $s0, $zero +/* ED8F6C 8024014C 8E420014 */ lw $v0, 0x14($s2) +/* ED8F70 80240150 3C05FE36 */ lui $a1, 0xfe36 +/* ED8F74 80240154 02221021 */ addu $v0, $s1, $v0 +/* ED8F78 80240158 C4400004 */ lwc1 $f0, 4($v0) +/* ED8F7C 8024015C 4600008D */ trunc.w.s $f2, $f0 +/* ED8F80 80240160 44061000 */ mfc1 $a2, $f2 +/* ED8F84 80240164 0C0B551A */ jal func_802D5468 +/* ED8F88 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 +/* ED8F8C 8024016C 0200202D */ daddu $a0, $s0, $zero +/* ED8F90 80240170 8E420014 */ lw $v0, 0x14($s2) +/* ED8F94 80240174 3C05FE36 */ lui $a1, 0xfe36 +/* ED8F98 80240178 02221021 */ addu $v0, $s1, $v0 +/* ED8F9C 8024017C C4400008 */ lwc1 $f0, 8($v0) +/* ED8FA0 80240180 4600008D */ trunc.w.s $f2, $f0 +/* ED8FA4 80240184 44061000 */ mfc1 $a2, $f2 +/* ED8FA8 80240188 0C0B551A */ jal func_802D5468 +/* ED8FAC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 +/* ED8FB0 80240190 0200202D */ daddu $a0, $s0, $zero +/* ED8FB4 80240194 8E420014 */ lw $v0, 0x14($s2) +/* ED8FB8 80240198 3C05FE36 */ lui $a1, 0xfe36 +/* ED8FBC 8024019C 02228821 */ addu $s1, $s1, $v0 +/* ED8FC0 802401A0 C620000C */ lwc1 $f0, 0xc($s1) +/* ED8FC4 802401A4 4600008D */ trunc.w.s $f2, $f0 +/* ED8FC8 802401A8 44061000 */ mfc1 $a2, $f2 +/* ED8FCC 802401AC 0C0B551A */ jal func_802D5468 +/* ED8FD0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 +/* ED8FD4 802401B4 3C028008 */ lui $v0, %hi(D_80079430) +/* ED8FD8 802401B8 8C429430 */ lw $v0, %lo(D_80079430)($v0) +/* ED8FDC 802401BC 8E03008C */ lw $v1, 0x8c($s0) +/* ED8FE0 802401C0 94450134 */ lhu $a1, 0x134($v0) +/* ED8FE4 802401C4 AFA30010 */ sw $v1, 0x10($sp) +/* ED8FE8 802401C8 8E020090 */ lw $v0, 0x90($s0) +/* ED8FEC 802401CC AFA20014 */ sw $v0, 0x14($sp) +/* ED8FF0 802401D0 8E020094 */ lw $v0, 0x94($s0) +/* ED8FF4 802401D4 AFA20018 */ sw $v0, 0x18($sp) +/* ED8FF8 802401D8 8E060084 */ lw $a2, 0x84($s0) +/* ED8FFC 802401DC 8E070088 */ lw $a3, 0x88($s0) +/* ED9000 802401E0 3C048024 */ lui $a0, %hi(D_80243170) +/* ED9004 802401E4 0C00973F */ jal func_80025CFC +/* ED9008 802401E8 24843170 */ addiu $a0, $a0, %lo(D_80243170) +/* ED900C 802401EC 8FBF002C */ lw $ra, 0x2c($sp) +/* ED9010 802401F0 8FB20028 */ lw $s2, 0x28($sp) +/* ED9014 802401F4 8FB10024 */ lw $s1, 0x24($sp) +/* ED9018 802401F8 8FB00020 */ lw $s0, 0x20($sp) +/* ED901C 802401FC 24020002 */ addiu $v0, $zero, 2 +/* ED9020 80240200 03E00008 */ jr $ra +/* ED9024 80240204 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_ED8E20/func_80240208_ED9028.s b/asm/nonmatchings/code_ED8E20/func_80240208_ED9028.s new file mode 100644 index 0000000000..04fa2a57ba --- /dev/null +++ b/asm/nonmatchings/code_ED8E20/func_80240208_ED9028.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240208_ED9028 +/* ED9028 80240208 3C038008 */ lui $v1, %hi(D_8007C760) +/* ED902C 8024020C 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* ED9030 80240210 3C014334 */ lui $at, 0x4334 +/* ED9034 80240214 44816000 */ mtc1 $at, $f12 +/* ED9038 80240218 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ED903C 8024021C AFBF0014 */ sw $ra, 0x14($sp) +/* ED9040 80240220 AFB00010 */ sw $s0, 0x10($sp) +/* ED9044 80240224 00031080 */ sll $v0, $v1, 2 +/* ED9048 80240228 00431021 */ addu $v0, $v0, $v1 +/* ED904C 8024022C 00021080 */ sll $v0, $v0, 2 +/* ED9050 80240230 00431023 */ subu $v0, $v0, $v1 +/* ED9054 80240234 000218C0 */ sll $v1, $v0, 3 +/* ED9058 80240238 00431021 */ addu $v0, $v0, $v1 +/* ED905C 8024023C 000210C0 */ sll $v0, $v0, 3 +/* ED9060 80240240 3C01800C */ lui $at, %hi(D_800B8DEC) +/* ED9064 80240244 00220821 */ addu $at, $at, $v0 +/* ED9068 80240248 C4208DEC */ lwc1 $f0, %lo(D_800B8DEC)($at) +/* ED906C 8024024C 460C0300 */ add.s $f12, $f0, $f12 +/* ED9070 80240250 0C00AB85 */ jal func_8002AE14 +/* ED9074 80240254 0080802D */ daddu $s0, $a0, $zero +/* ED9078 80240258 4600008D */ trunc.w.s $f2, $f0 +/* ED907C 8024025C E6020084 */ swc1 $f2, 0x84($s0) +/* ED9080 80240260 8FBF0014 */ lw $ra, 0x14($sp) +/* ED9084 80240264 8FB00010 */ lw $s0, 0x10($sp) +/* ED9088 80240268 24020002 */ addiu $v0, $zero, 2 +/* ED908C 8024026C 03E00008 */ jr $ra +/* ED9090 80240270 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ED8E20/func_80240274_ED9094.s b/asm/nonmatchings/code_ED8E20/func_80240274_ED9094.s new file mode 100644 index 0000000000..535e9cf73e --- /dev/null +++ b/asm/nonmatchings/code_ED8E20/func_80240274_ED9094.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240274_ED9094 +/* ED9094 80240274 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* ED9098 80240278 AFB00018 */ sw $s0, 0x18($sp) +/* ED909C 8024027C 0080802D */ daddu $s0, $a0, $zero +/* ED90A0 80240280 AFBF001C */ sw $ra, 0x1c($sp) +/* ED90A4 80240284 F7B40020 */ sdc1 $f20, 0x20($sp) +/* ED90A8 80240288 8E02000C */ lw $v0, 0xc($s0) +/* ED90AC 8024028C 0C0B55FF */ jal func_802D57FC +/* ED90B0 80240290 8C450000 */ lw $a1, ($v0) +/* ED90B4 80240294 27A40010 */ addiu $a0, $sp, 0x10 +/* ED90B8 80240298 3C028011 */ lui $v0, %hi(D_80117578) +/* ED90BC 8024029C 24427578 */ addiu $v0, $v0, %lo(D_80117578) +/* ED90C0 802402A0 44060000 */ mfc1 $a2, $f0 +/* ED90C4 802402A4 C4400028 */ lwc1 $f0, 0x28($v0) +/* ED90C8 802402A8 C4420030 */ lwc1 $f2, 0x30($v0) +/* ED90CC 802402AC E7A00010 */ swc1 $f0, 0x10($sp) +/* ED90D0 802402B0 E7A20014 */ swc1 $f2, 0x14($sp) +/* ED90D4 802402B4 8C470080 */ lw $a3, 0x80($v0) +/* ED90D8 802402B8 C454002C */ lwc1 $f20, 0x2c($v0) +/* ED90DC 802402BC 0C00ACA3 */ jal func_8002B28C +/* ED90E0 802402C0 27A50014 */ addiu $a1, $sp, 0x14 +/* ED90E4 802402C4 0200202D */ daddu $a0, $s0, $zero +/* ED90E8 802402C8 3C05FE36 */ lui $a1, 0xfe36 +/* ED90EC 802402CC 8FA60010 */ lw $a2, 0x10($sp) +/* ED90F0 802402D0 0C0B5684 */ jal func_802D5A10 +/* ED90F4 802402D4 34A53C80 */ ori $a1, $a1, 0x3c80 +/* ED90F8 802402D8 0200202D */ daddu $a0, $s0, $zero +/* ED90FC 802402DC 3C05FE36 */ lui $a1, 0xfe36 +/* ED9100 802402E0 4406A000 */ mfc1 $a2, $f20 +/* ED9104 802402E4 0C0B5684 */ jal func_802D5A10 +/* ED9108 802402E8 34A53C81 */ ori $a1, $a1, 0x3c81 +/* ED910C 802402EC 0200202D */ daddu $a0, $s0, $zero +/* ED9110 802402F0 3C05FE36 */ lui $a1, 0xfe36 +/* ED9114 802402F4 8FA60014 */ lw $a2, 0x14($sp) +/* ED9118 802402F8 0C0B5684 */ jal func_802D5A10 +/* ED911C 802402FC 34A53C82 */ ori $a1, $a1, 0x3c82 +/* ED9120 80240300 8FBF001C */ lw $ra, 0x1c($sp) +/* ED9124 80240304 8FB00018 */ lw $s0, 0x18($sp) +/* ED9128 80240308 D7B40020 */ ldc1 $f20, 0x20($sp) +/* ED912C 8024030C 24020002 */ addiu $v0, $zero, 2 +/* ED9130 80240310 03E00008 */ jr $ra +/* ED9134 80240314 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_ED8E20/func_80240318_ED9138.s b/asm/nonmatchings/code_ED8E20/func_80240318_ED9138.s new file mode 100644 index 0000000000..9d02faba75 --- /dev/null +++ b/asm/nonmatchings/code_ED8E20/func_80240318_ED9138.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240318_ED9138 +/* ED9138 80240318 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ED913C 8024031C 0000202D */ daddu $a0, $zero, $zero +/* ED9140 80240320 0080282D */ daddu $a1, $a0, $zero +/* ED9144 80240324 0080302D */ daddu $a2, $a0, $zero +/* ED9148 80240328 0080382D */ daddu $a3, $a0, $zero +/* ED914C 8024032C AFBF0018 */ sw $ra, 0x18($sp) +/* ED9150 80240330 AFA00010 */ sw $zero, 0x10($sp) +/* ED9154 80240334 0C01DEF4 */ jal func_80077BD0 +/* ED9158 80240338 AFA00014 */ sw $zero, 0x14($sp) +/* ED915C 8024033C 8FBF0018 */ lw $ra, 0x18($sp) +/* ED9160 80240340 24020002 */ addiu $v0, $zero, 2 +/* ED9164 80240344 03E00008 */ jr $ra +/* ED9168 80240348 27BD0020 */ addiu $sp, $sp, 0x20 +/* ED916C 8024034C 00000000 */ nop diff --git a/asm/nonmatchings/code_EDBFE0/func_80240000_EDBFE0.s b/asm/nonmatchings/code_EDBFE0/func_80240000_EDBFE0.s new file mode 100644 index 0000000000..ea020a0215 --- /dev/null +++ b/asm/nonmatchings/code_EDBFE0/func_80240000_EDBFE0.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EDBFE0 +/* EDBFE0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EDBFE4 80240004 0000202D */ daddu $a0, $zero, $zero +/* EDBFE8 80240008 0080282D */ daddu $a1, $a0, $zero +/* EDBFEC 8024000C 0080302D */ daddu $a2, $a0, $zero +/* EDBFF0 80240010 0080382D */ daddu $a3, $a0, $zero +/* EDBFF4 80240014 AFBF0018 */ sw $ra, 0x18($sp) +/* EDBFF8 80240018 AFA00010 */ sw $zero, 0x10($sp) +/* EDBFFC 8024001C 0C01DEF4 */ jal func_80077BD0 +/* EDC000 80240020 AFA00014 */ sw $zero, 0x14($sp) +/* EDC004 80240024 8FBF0018 */ lw $ra, 0x18($sp) +/* EDC008 80240028 24020002 */ addiu $v0, $zero, 2 +/* EDC00C 8024002C 03E00008 */ jr $ra +/* EDC010 80240030 27BD0020 */ addiu $sp, $sp, 0x20 +/* EDC014 80240034 00000000 */ nop +/* EDC018 80240038 00000000 */ nop +/* EDC01C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EDC020/func_80240040_EDC020.s b/asm/nonmatchings/code_EDC020/func_80240040_EDC020.s new file mode 100644 index 0000000000..35bb782299 --- /dev/null +++ b/asm/nonmatchings/code_EDC020/func_80240040_EDC020.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240040_EDC020 +/* EDC020 80240040 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EDC024 80240044 F7B40018 */ sdc1 $f20, 0x18($sp) +/* EDC028 80240048 4485A000 */ mtc1 $a1, $f20 +/* EDC02C 8024004C F7B60020 */ sdc1 $f22, 0x20($sp) +/* EDC030 80240050 4486B000 */ mtc1 $a2, $f22 +/* EDC034 80240054 AFB00010 */ sw $s0, 0x10($sp) +/* EDC038 80240058 F7B80028 */ sdc1 $f24, 0x28($sp) +/* EDC03C 8024005C 4487C000 */ mtc1 $a3, $f24 +/* EDC040 80240060 AFBF0014 */ sw $ra, 0x14($sp) +/* EDC044 80240064 0C01B198 */ jal osGetCause +/* EDC048 80240068 0080802D */ daddu $s0, $a0, $zero +/* EDC04C 8024006C 4616A582 */ mul.s $f22, $f20, $f22 +/* EDC050 80240070 00000000 */ nop +/* EDC054 80240074 4618A502 */ mul.s $f20, $f20, $f24 +/* EDC058 80240078 00000000 */ nop +/* EDC05C 8024007C 3C013F80 */ lui $at, 0x3f80 +/* EDC060 80240080 44810000 */ mtc1 $at, $f0 +/* EDC064 80240084 00000000 */ nop +/* EDC068 80240088 E6000014 */ swc1 $f0, 0x14($s0) +/* EDC06C 8024008C E6160010 */ swc1 $f22, 0x10($s0) +/* EDC070 80240090 E6140018 */ swc1 $f20, 0x18($s0) +/* EDC074 80240094 8FBF0014 */ lw $ra, 0x14($sp) +/* EDC078 80240098 8FB00010 */ lw $s0, 0x10($sp) +/* EDC07C 8024009C D7B80028 */ ldc1 $f24, 0x28($sp) +/* EDC080 802400A0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* EDC084 802400A4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* EDC088 802400A8 03E00008 */ jr $ra +/* EDC08C 802400AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EDC020/func_802400B0_EDC090.s b/asm/nonmatchings/code_EDC020/func_802400B0_EDC090.s new file mode 100644 index 0000000000..2696ac7b55 --- /dev/null +++ b/asm/nonmatchings/code_EDC020/func_802400B0_EDC090.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400B0_EDC090 +/* EDC090 802400B0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* EDC094 802400B4 AFB10054 */ sw $s1, 0x54($sp) +/* EDC098 802400B8 0080882D */ daddu $s1, $a0, $zero +/* EDC09C 802400BC AFBF005C */ sw $ra, 0x5c($sp) +/* EDC0A0 802400C0 AFB20058 */ sw $s2, 0x58($sp) +/* EDC0A4 802400C4 AFB00050 */ sw $s0, 0x50($sp) +/* EDC0A8 802400C8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* EDC0AC 802400CC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* EDC0B0 802400D0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* EDC0B4 802400D4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* EDC0B8 802400D8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* EDC0BC 802400DC 8E30000C */ lw $s0, 0xc($s1) +/* EDC0C0 802400E0 8E050000 */ lw $a1, ($s0) +/* EDC0C4 802400E4 0C0B53A3 */ jal func_802D4E8C +/* EDC0C8 802400E8 26100004 */ addiu $s0, $s0, 4 +/* EDC0CC 802400EC 0C04949C */ jal func_80125270 +/* EDC0D0 802400F0 0040202D */ daddu $a0, $v0, $zero +/* EDC0D4 802400F4 8E050000 */ lw $a1, ($s0) +/* EDC0D8 802400F8 26100004 */ addiu $s0, $s0, 4 +/* EDC0DC 802400FC 0220202D */ daddu $a0, $s1, $zero +/* EDC0E0 80240100 0C0B55FF */ jal func_802D57FC +/* EDC0E4 80240104 0040902D */ daddu $s2, $v0, $zero +/* EDC0E8 80240108 8E050000 */ lw $a1, ($s0) +/* EDC0EC 8024010C 26100004 */ addiu $s0, $s0, 4 +/* EDC0F0 80240110 0220202D */ daddu $a0, $s1, $zero +/* EDC0F4 80240114 0C0B55FF */ jal func_802D57FC +/* EDC0F8 80240118 46000706 */ mov.s $f28, $f0 +/* EDC0FC 8024011C 8E050000 */ lw $a1, ($s0) +/* EDC100 80240120 26100004 */ addiu $s0, $s0, 4 +/* EDC104 80240124 0220202D */ daddu $a0, $s1, $zero +/* EDC108 80240128 0C0B55FF */ jal func_802D57FC +/* EDC10C 8024012C 46000686 */ mov.s $f26, $f0 +/* EDC110 80240130 0220202D */ daddu $a0, $s1, $zero +/* EDC114 80240134 8E050000 */ lw $a1, ($s0) +/* EDC118 80240138 0C0B55FF */ jal func_802D57FC +/* EDC11C 8024013C 46000586 */ mov.s $f22, $f0 +/* EDC120 80240140 0240202D */ daddu $a0, $s2, $zero +/* EDC124 80240144 0C0493D1 */ jal func_80124F44 +/* EDC128 80240148 46000606 */ mov.s $f24, $f0 +/* EDC12C 8024014C 0040882D */ daddu $s1, $v0, $zero +/* EDC130 80240150 96220000 */ lhu $v0, ($s1) +/* EDC134 80240154 30420400 */ andi $v0, $v0, 0x400 +/* EDC138 80240158 1440001E */ bnez $v0, .L802401D4 +/* EDC13C 8024015C 26300058 */ addiu $s0, $s1, 0x58 +/* EDC140 80240160 4480A000 */ mtc1 $zero, $f20 +/* EDC144 80240164 4406B000 */ mfc1 $a2, $f22 +/* EDC148 80240168 4405A000 */ mfc1 $a1, $f20 +/* EDC14C 8024016C 4407A000 */ mfc1 $a3, $f20 +/* EDC150 80240170 0C01B2B0 */ jal func_8006CAC0 +/* EDC154 80240174 0200202D */ daddu $a0, $s0, $zero +/* EDC158 80240178 4405E000 */ mfc1 $a1, $f28 +/* EDC15C 8024017C 4406D000 */ mfc1 $a2, $f26 +/* EDC160 80240180 4407C000 */ mfc1 $a3, $f24 +/* EDC164 80240184 0C090010 */ jal func_80240040_EDC020 +/* EDC168 80240188 27A40010 */ addiu $a0, $sp, 0x10 +/* EDC16C 8024018C 27A40010 */ addiu $a0, $sp, 0x10 +/* EDC170 80240190 0200282D */ daddu $a1, $s0, $zero +/* EDC174 80240194 0C01B1F0 */ jal osSiRawReadIo +/* EDC178 80240198 0200302D */ daddu $a2, $s0, $zero +/* EDC17C 8024019C 27A40010 */ addiu $a0, $sp, 0x10 +/* EDC180 802401A0 4600B587 */ neg.s $f22, $f22 +/* EDC184 802401A4 4405A000 */ mfc1 $a1, $f20 +/* EDC188 802401A8 4406B000 */ mfc1 $a2, $f22 +/* EDC18C 802401AC 0C01B2B0 */ jal func_8006CAC0 +/* EDC190 802401B0 00A0382D */ daddu $a3, $a1, $zero +/* EDC194 802401B4 27A40010 */ addiu $a0, $sp, 0x10 +/* EDC198 802401B8 0200282D */ daddu $a1, $s0, $zero +/* EDC19C 802401BC 0C01B1F0 */ jal osSiRawReadIo +/* EDC1A0 802401C0 00A0302D */ daddu $a2, $a1, $zero +/* EDC1A4 802401C4 96220000 */ lhu $v0, ($s1) +/* EDC1A8 802401C8 34421400 */ ori $v0, $v0, 0x1400 +/* EDC1AC 802401CC 08090093 */ j .L8024024C +/* EDC1B0 802401D0 A6220000 */ sh $v0, ($s1) +.L802401D4: +/* EDC1B4 802401D4 4480A000 */ mtc1 $zero, $f20 +/* EDC1B8 802401D8 4406B000 */ mfc1 $a2, $f22 +/* EDC1BC 802401DC 4405A000 */ mfc1 $a1, $f20 +/* EDC1C0 802401E0 4407A000 */ mfc1 $a3, $f20 +/* EDC1C4 802401E4 0C01B2B0 */ jal func_8006CAC0 +/* EDC1C8 802401E8 27A40010 */ addiu $a0, $sp, 0x10 +/* EDC1CC 802401EC 27A40010 */ addiu $a0, $sp, 0x10 +/* EDC1D0 802401F0 26300058 */ addiu $s0, $s1, 0x58 +/* EDC1D4 802401F4 0200282D */ daddu $a1, $s0, $zero +/* EDC1D8 802401F8 0C01B1F0 */ jal osSiRawReadIo +/* EDC1DC 802401FC 0200302D */ daddu $a2, $s0, $zero +/* EDC1E0 80240200 4405E000 */ mfc1 $a1, $f28 +/* EDC1E4 80240204 4406D000 */ mfc1 $a2, $f26 +/* EDC1E8 80240208 4407C000 */ mfc1 $a3, $f24 +/* EDC1EC 8024020C 0C090010 */ jal func_80240040_EDC020 +/* EDC1F0 80240210 27A40010 */ addiu $a0, $sp, 0x10 +/* EDC1F4 80240214 27A40010 */ addiu $a0, $sp, 0x10 +/* EDC1F8 80240218 0200282D */ daddu $a1, $s0, $zero +/* EDC1FC 8024021C 0C01B1F0 */ jal osSiRawReadIo +/* EDC200 80240220 0200302D */ daddu $a2, $s0, $zero +/* EDC204 80240224 27A40010 */ addiu $a0, $sp, 0x10 +/* EDC208 80240228 4600B587 */ neg.s $f22, $f22 +/* EDC20C 8024022C 4405A000 */ mfc1 $a1, $f20 +/* EDC210 80240230 4406B000 */ mfc1 $a2, $f22 +/* EDC214 80240234 0C01B2B0 */ jal func_8006CAC0 +/* EDC218 80240238 00A0382D */ daddu $a3, $a1, $zero +/* EDC21C 8024023C 27A40010 */ addiu $a0, $sp, 0x10 +/* EDC220 80240240 0200282D */ daddu $a1, $s0, $zero +/* EDC224 80240244 0C01B1F0 */ jal osSiRawReadIo +/* EDC228 80240248 00A0302D */ daddu $a2, $a1, $zero +.L8024024C: +/* EDC22C 8024024C 8FBF005C */ lw $ra, 0x5c($sp) +/* EDC230 80240250 8FB20058 */ lw $s2, 0x58($sp) +/* EDC234 80240254 8FB10054 */ lw $s1, 0x54($sp) +/* EDC238 80240258 8FB00050 */ lw $s0, 0x50($sp) +/* EDC23C 8024025C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* EDC240 80240260 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* EDC244 80240264 D7B80070 */ ldc1 $f24, 0x70($sp) +/* EDC248 80240268 D7B60068 */ ldc1 $f22, 0x68($sp) +/* EDC24C 8024026C D7B40060 */ ldc1 $f20, 0x60($sp) +/* EDC250 80240270 24020002 */ addiu $v0, $zero, 2 +/* EDC254 80240274 03E00008 */ jr $ra +/* EDC258 80240278 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/code_EDC020/func_8024027C_EDC25C.s b/asm/nonmatchings/code_EDC020/func_8024027C_EDC25C.s new file mode 100644 index 0000000000..25115d9f9f --- /dev/null +++ b/asm/nonmatchings/code_EDC020/func_8024027C_EDC25C.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024027C_EDC25C +/* EDC25C 8024027C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EDC260 80240280 AFB00010 */ sw $s0, 0x10($sp) +/* EDC264 80240284 3C108024 */ lui $s0, %hi(func_802417EC_C5BF2C) +/* EDC268 80240288 261017EC */ addiu $s0, $s0, %lo(func_802417EC_C5BF2C) +/* EDC26C 8024028C AFBF0018 */ sw $ra, 0x18($sp) +/* EDC270 80240290 AFB10014 */ sw $s1, 0x14($sp) +/* EDC274 80240294 8E020000 */ lw $v0, ($s0) +/* EDC278 80240298 14400010 */ bnez $v0, .L802402DC +/* EDC27C 8024029C 0080882D */ daddu $s1, $a0, $zero +/* EDC280 802402A0 0C00AFF5 */ jal func_8002BFD4 +/* EDC284 802402A4 24040040 */ addiu $a0, $zero, 0x40 +/* EDC288 802402A8 AE020000 */ sw $v0, ($s0) +/* EDC28C 802402AC 0000182D */ daddu $v1, $zero, $zero +/* EDC290 802402B0 0040282D */ daddu $a1, $v0, $zero +/* EDC294 802402B4 0220202D */ daddu $a0, $s1, $zero +.L802402B8: +/* EDC298 802402B8 8C820084 */ lw $v0, 0x84($a0) +/* EDC29C 802402BC 24840004 */ addiu $a0, $a0, 4 +/* EDC2A0 802402C0 24630001 */ addiu $v1, $v1, 1 +/* EDC2A4 802402C4 ACA20000 */ sw $v0, ($a1) +/* EDC2A8 802402C8 28620010 */ slti $v0, $v1, 0x10 +/* EDC2AC 802402CC 1440FFFA */ bnez $v0, .L802402B8 +/* EDC2B0 802402D0 24A50004 */ addiu $a1, $a1, 4 +/* EDC2B4 802402D4 080900C6 */ j .L80240318 +/* EDC2B8 802402D8 00000000 */ nop +.L802402DC: +/* EDC2BC 802402DC 0000182D */ daddu $v1, $zero, $zero +/* EDC2C0 802402E0 0040282D */ daddu $a1, $v0, $zero +/* EDC2C4 802402E4 0220202D */ daddu $a0, $s1, $zero +.L802402E8: +/* EDC2C8 802402E8 8CA20000 */ lw $v0, ($a1) +/* EDC2CC 802402EC 24A50004 */ addiu $a1, $a1, 4 +/* EDC2D0 802402F0 24630001 */ addiu $v1, $v1, 1 +/* EDC2D4 802402F4 AC820084 */ sw $v0, 0x84($a0) +/* EDC2D8 802402F8 28620010 */ slti $v0, $v1, 0x10 +/* EDC2DC 802402FC 1440FFFA */ bnez $v0, .L802402E8 +/* EDC2E0 80240300 24840004 */ addiu $a0, $a0, 4 +/* EDC2E4 80240304 3C108024 */ lui $s0, %hi(func_802417EC_C5BF2C) +/* EDC2E8 80240308 261017EC */ addiu $s0, $s0, %lo(func_802417EC_C5BF2C) +/* EDC2EC 8024030C 0C00B007 */ jal func_8002C01C +/* EDC2F0 80240310 8E040000 */ lw $a0, ($s0) +/* EDC2F4 80240314 AE000000 */ sw $zero, ($s0) +.L80240318: +/* EDC2F8 80240318 8FBF0018 */ lw $ra, 0x18($sp) +/* EDC2FC 8024031C 8FB10014 */ lw $s1, 0x14($sp) +/* EDC300 80240320 8FB00010 */ lw $s0, 0x10($sp) +/* EDC304 80240324 24020002 */ addiu $v0, $zero, 2 +/* EDC308 80240328 03E00008 */ jr $ra +/* EDC30C 8024032C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EDC020/func_80240330_EDC310.s b/asm/nonmatchings/code_EDC020/func_80240330_EDC310.s new file mode 100644 index 0000000000..581f02cd6c --- /dev/null +++ b/asm/nonmatchings/code_EDC020/func_80240330_EDC310.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240330_EDC310 +/* EDC310 80240330 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EDC314 80240334 AFB00010 */ sw $s0, 0x10($sp) +/* EDC318 80240338 0080802D */ daddu $s0, $a0, $zero +/* EDC31C 8024033C AFBF0018 */ sw $ra, 0x18($sp) +/* EDC320 80240340 AFB10014 */ sw $s1, 0x14($sp) +/* EDC324 80240344 8E02000C */ lw $v0, 0xc($s0) +/* EDC328 80240348 8C510000 */ lw $s1, ($v0) +/* EDC32C 8024034C 0C0B53A3 */ jal func_802D4E8C +/* EDC330 80240350 0220282D */ daddu $a1, $s1, $zero +/* EDC334 80240354 3C03FFF0 */ lui $v1, 0xfff0 +/* EDC338 80240358 3463FFFF */ ori $v1, $v1, 0xffff +/* EDC33C 8024035C 0200202D */ daddu $a0, $s0, $zero +/* EDC340 80240360 00431024 */ and $v0, $v0, $v1 +/* EDC344 80240364 00021140 */ sll $v0, $v0, 5 +/* EDC348 80240368 3C068009 */ lui $a2, %hi(D_8008D2C0) +/* EDC34C 8024036C 00C23021 */ addu $a2, $a2, $v0 +/* EDC350 80240370 8CC6D2C0 */ lw $a2, %lo(D_8008D2C0)($a2) +/* EDC354 80240374 0C0B551A */ jal func_802D5468 +/* EDC358 80240378 0220282D */ daddu $a1, $s1, $zero +/* EDC35C 8024037C 8FBF0018 */ lw $ra, 0x18($sp) +/* EDC360 80240380 8FB10014 */ lw $s1, 0x14($sp) +/* EDC364 80240384 8FB00010 */ lw $s0, 0x10($sp) +/* EDC368 80240388 24020002 */ addiu $v0, $zero, 2 +/* EDC36C 8024038C 03E00008 */ jr $ra +/* EDC370 80240390 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EDC020/func_80240394_EDC374.s b/asm/nonmatchings/code_EDC020/func_80240394_EDC374.s new file mode 100644 index 0000000000..a285297a9a --- /dev/null +++ b/asm/nonmatchings/code_EDC020/func_80240394_EDC374.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240394_EDC374 +/* EDC374 80240394 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EDC378 80240398 AFB10014 */ sw $s1, 0x14($sp) +/* EDC37C 8024039C 0080882D */ daddu $s1, $a0, $zero +/* EDC380 802403A0 AFBF0018 */ sw $ra, 0x18($sp) +/* EDC384 802403A4 AFB00010 */ sw $s0, 0x10($sp) +/* EDC388 802403A8 8E30000C */ lw $s0, 0xc($s1) +/* EDC38C 802403AC 8E050000 */ lw $a1, ($s0) +/* EDC390 802403B0 0C0B53A3 */ jal func_802D4E8C +/* EDC394 802403B4 26100004 */ addiu $s0, $s0, 4 +/* EDC398 802403B8 0C00F94D */ jal func_8003E534 +/* EDC39C 802403BC 0040202D */ daddu $a0, $v0, $zero +/* EDC3A0 802403C0 10400005 */ beqz $v0, .L802403D8 +/* EDC3A4 802403C4 00000000 */ nop +/* EDC3A8 802403C8 8E050000 */ lw $a1, ($s0) +/* EDC3AC 802403CC 844600A8 */ lh $a2, 0xa8($v0) +/* EDC3B0 802403D0 0C0B551A */ jal func_802D5468 +/* EDC3B4 802403D4 0220202D */ daddu $a0, $s1, $zero +.L802403D8: +/* EDC3B8 802403D8 8FBF0018 */ lw $ra, 0x18($sp) +/* EDC3BC 802403DC 8FB10014 */ lw $s1, 0x14($sp) +/* EDC3C0 802403E0 8FB00010 */ lw $s0, 0x10($sp) +/* EDC3C4 802403E4 24020002 */ addiu $v0, $zero, 2 +/* EDC3C8 802403E8 03E00008 */ jr $ra +/* EDC3CC 802403EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EDC020/func_802403F0_EDC3D0.s b/asm/nonmatchings/code_EDC020/func_802403F0_EDC3D0.s new file mode 100644 index 0000000000..fc5079fdac --- /dev/null +++ b/asm/nonmatchings/code_EDC020/func_802403F0_EDC3D0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403F0_EDC3D0 +/* EDC3D0 802403F0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EDC3D4 802403F4 AFB10014 */ sw $s1, 0x14($sp) +/* EDC3D8 802403F8 0080882D */ daddu $s1, $a0, $zero +/* EDC3DC 802403FC AFBF0024 */ sw $ra, 0x24($sp) +/* EDC3E0 80240400 AFB40020 */ sw $s4, 0x20($sp) +/* EDC3E4 80240404 AFB3001C */ sw $s3, 0x1c($sp) +/* EDC3E8 80240408 AFB20018 */ sw $s2, 0x18($sp) +/* EDC3EC 8024040C AFB00010 */ sw $s0, 0x10($sp) +/* EDC3F0 80240410 F7BC0048 */ sdc1 $f28, 0x48($sp) +/* EDC3F4 80240414 F7BA0040 */ sdc1 $f26, 0x40($sp) +/* EDC3F8 80240418 F7B80038 */ sdc1 $f24, 0x38($sp) +/* EDC3FC 8024041C F7B60030 */ sdc1 $f22, 0x30($sp) +/* EDC400 80240420 F7B40028 */ sdc1 $f20, 0x28($sp) +/* EDC404 80240424 8E30000C */ lw $s0, 0xc($s1) +/* EDC408 80240428 8E130000 */ lw $s3, ($s0) +/* EDC40C 8024042C 26100004 */ addiu $s0, $s0, 4 +/* EDC410 80240430 0C0B53A3 */ jal func_802D4E8C +/* EDC414 80240434 0260282D */ daddu $a1, $s3, $zero +/* EDC418 80240438 4482E000 */ mtc1 $v0, $f28 +/* EDC41C 8024043C 00000000 */ nop +/* EDC420 80240440 4680E720 */ cvt.s.w $f28, $f28 +/* EDC424 80240444 8E140000 */ lw $s4, ($s0) +/* EDC428 80240448 26100004 */ addiu $s0, $s0, 4 +/* EDC42C 8024044C 0220202D */ daddu $a0, $s1, $zero +/* EDC430 80240450 0C0B53A3 */ jal func_802D4E8C +/* EDC434 80240454 0280282D */ daddu $a1, $s4, $zero +/* EDC438 80240458 4482D000 */ mtc1 $v0, $f26 +/* EDC43C 8024045C 00000000 */ nop +/* EDC440 80240460 4680D6A0 */ cvt.s.w $f26, $f26 +/* EDC444 80240464 8E100000 */ lw $s0, ($s0) +/* EDC448 80240468 0220202D */ daddu $a0, $s1, $zero +/* EDC44C 8024046C 0C0B53A3 */ jal func_802D4E8C +/* EDC450 80240470 0200282D */ daddu $a1, $s0, $zero +/* EDC454 80240474 4482C000 */ mtc1 $v0, $f24 +/* EDC458 80240478 00000000 */ nop +/* EDC45C 8024047C 4680C620 */ cvt.s.w $f24, $f24 +/* EDC460 80240480 3C128011 */ lui $s2, %hi(D_80117578) +/* EDC464 80240484 26527578 */ addiu $s2, $s2, %lo(D_80117578) +/* EDC468 80240488 3C038008 */ lui $v1, %hi(D_8007C760) +/* EDC46C 8024048C 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EDC470 80240490 C64200A8 */ lwc1 $f2, 0xa8($s2) +/* EDC474 80240494 44800000 */ mtc1 $zero, $f0 +/* EDC478 80240498 00031080 */ sll $v0, $v1, 2 +/* EDC47C 8024049C 00431021 */ addu $v0, $v0, $v1 +/* EDC480 802404A0 00021080 */ sll $v0, $v0, 2 +/* EDC484 802404A4 00431023 */ subu $v0, $v0, $v1 +/* EDC488 802404A8 000218C0 */ sll $v1, $v0, 3 +/* EDC48C 802404AC 00431021 */ addu $v0, $v0, $v1 +/* EDC490 802404B0 000210C0 */ sll $v0, $v0, 3 +/* EDC494 802404B4 46001032 */ c.eq.s $f2, $f0 +/* EDC498 802404B8 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EDC49C 802404BC 00220821 */ addu $at, $at, $v0 +/* EDC4A0 802404C0 C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) +/* EDC4A4 802404C4 45000005 */ bc1f .L802404DC +/* EDC4A8 802404C8 00000000 */ nop +/* EDC4AC 802404CC 3C0142C8 */ lui $at, 0x42c8 +/* EDC4B0 802404D0 44810000 */ mtc1 $at, $f0 +/* EDC4B4 802404D4 0809013B */ j .L802404EC +/* EDC4B8 802404D8 4600B581 */ sub.s $f22, $f22, $f0 +.L802404DC: +/* EDC4BC 802404DC 3C0142C8 */ lui $at, 0x42c8 +/* EDC4C0 802404E0 44810000 */ mtc1 $at, $f0 +/* EDC4C4 802404E4 00000000 */ nop +/* EDC4C8 802404E8 4600B580 */ add.s $f22, $f22, $f0 +.L802404EC: +/* EDC4CC 802404EC 0C00AB85 */ jal func_8002AE14 +/* EDC4D0 802404F0 4600B306 */ mov.s $f12, $f22 +/* EDC4D4 802404F4 46000586 */ mov.s $f22, $f0 +/* EDC4D8 802404F8 3C014170 */ lui $at, 0x4170 +/* EDC4DC 802404FC 4481A000 */ mtc1 $at, $f20 +/* EDC4E0 80240500 0C00AD77 */ jal func_8002B5DC +/* EDC4E4 80240504 4600B306 */ mov.s $f12, $f22 +/* EDC4E8 80240508 46140002 */ mul.s $f0, $f0, $f20 +/* EDC4EC 8024050C 00000000 */ nop +/* EDC4F0 80240510 864200B0 */ lh $v0, 0xb0($s2) +/* EDC4F4 80240514 3C013F00 */ lui $at, 0x3f00 +/* EDC4F8 80240518 44812000 */ mtc1 $at, $f4 +/* EDC4FC 8024051C 44821000 */ mtc1 $v0, $f2 +/* EDC500 80240520 00000000 */ nop +/* EDC504 80240524 468010A0 */ cvt.s.w $f2, $f2 +/* EDC508 80240528 46041082 */ mul.s $f2, $f2, $f4 +/* EDC50C 8024052C 00000000 */ nop +/* EDC510 80240530 4600E700 */ add.s $f28, $f28, $f0 +/* EDC514 80240534 4602D680 */ add.s $f26, $f26, $f2 +/* EDC518 80240538 0C00AD90 */ jal func_8002B640 +/* EDC51C 8024053C 4600B306 */ mov.s $f12, $f22 +/* EDC520 80240540 46140002 */ mul.s $f0, $f0, $f20 +/* EDC524 80240544 00000000 */ nop +/* EDC528 80240548 0220202D */ daddu $a0, $s1, $zero +/* EDC52C 8024054C 0260282D */ daddu $a1, $s3, $zero +/* EDC530 80240550 4600E18D */ trunc.w.s $f6, $f28 +/* EDC534 80240554 44063000 */ mfc1 $a2, $f6 +/* EDC538 80240558 0C0B551A */ jal func_802D5468 +/* EDC53C 8024055C 4600C601 */ sub.s $f24, $f24, $f0 +/* EDC540 80240560 0220202D */ daddu $a0, $s1, $zero +/* EDC544 80240564 4600D18D */ trunc.w.s $f6, $f26 +/* EDC548 80240568 44063000 */ mfc1 $a2, $f6 +/* EDC54C 8024056C 0C0B551A */ jal func_802D5468 +/* EDC550 80240570 0280282D */ daddu $a1, $s4, $zero +/* EDC554 80240574 0220202D */ daddu $a0, $s1, $zero +/* EDC558 80240578 4600C18D */ trunc.w.s $f6, $f24 +/* EDC55C 8024057C 44063000 */ mfc1 $a2, $f6 +/* EDC560 80240580 0C0B551A */ jal func_802D5468 +/* EDC564 80240584 0200282D */ daddu $a1, $s0, $zero +/* EDC568 80240588 8FBF0024 */ lw $ra, 0x24($sp) +/* EDC56C 8024058C 8FB40020 */ lw $s4, 0x20($sp) +/* EDC570 80240590 8FB3001C */ lw $s3, 0x1c($sp) +/* EDC574 80240594 8FB20018 */ lw $s2, 0x18($sp) +/* EDC578 80240598 8FB10014 */ lw $s1, 0x14($sp) +/* EDC57C 8024059C 8FB00010 */ lw $s0, 0x10($sp) +/* EDC580 802405A0 D7BC0048 */ ldc1 $f28, 0x48($sp) +/* EDC584 802405A4 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* EDC588 802405A8 D7B80038 */ ldc1 $f24, 0x38($sp) +/* EDC58C 802405AC D7B60030 */ ldc1 $f22, 0x30($sp) +/* EDC590 802405B0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* EDC594 802405B4 24020002 */ addiu $v0, $zero, 2 +/* EDC598 802405B8 03E00008 */ jr $ra +/* EDC59C 802405BC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EDC020/func_802405C0_EDC5A0.s b/asm/nonmatchings/code_EDC020/func_802405C0_EDC5A0.s new file mode 100644 index 0000000000..cd3a12b841 --- /dev/null +++ b/asm/nonmatchings/code_EDC020/func_802405C0_EDC5A0.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405C0_EDC5A0 +/* EDC5A0 802405C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EDC5A4 802405C4 AFBF0010 */ sw $ra, 0x10($sp) +/* EDC5A8 802405C8 10A00003 */ beqz $a1, .L802405D8 +/* EDC5AC 802405CC 8C86000C */ lw $a2, 0xc($a0) +/* EDC5B0 802405D0 3C018024 */ lui $at, %hi(func_80241850_A2BA90) +/* EDC5B4 802405D4 AC201850 */ sw $zero, %lo(func_80241850_A2BA90)($at) +.L802405D8: +/* EDC5B8 802405D8 3C038024 */ lui $v1, %hi(func_80241850_A2BA90) +/* EDC5BC 802405DC 24631850 */ addiu $v1, $v1, %lo(func_80241850_A2BA90) +/* EDC5C0 802405E0 8C620000 */ lw $v0, ($v1) +/* EDC5C4 802405E4 54400003 */ bnel $v0, $zero, .L802405F4 +/* EDC5C8 802405E8 AC600000 */ sw $zero, ($v1) +/* EDC5CC 802405EC 08090182 */ j .L80240608 +/* EDC5D0 802405F0 0000102D */ daddu $v0, $zero, $zero +.L802405F4: +/* EDC5D4 802405F4 8CC50000 */ lw $a1, ($a2) +/* EDC5D8 802405F8 3C068024 */ lui $a2, %hi(D_80241854) +/* EDC5DC 802405FC 0C0B551A */ jal func_802D5468 +/* EDC5E0 80240600 8CC61854 */ lw $a2, %lo(D_80241854)($a2) +/* EDC5E4 80240604 24020002 */ addiu $v0, $zero, 2 +.L80240608: +/* EDC5E8 80240608 8FBF0010 */ lw $ra, 0x10($sp) +/* EDC5EC 8024060C 03E00008 */ jr $ra +/* EDC5F0 80240610 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EDC020/func_80240614_EDC5F4.s b/asm/nonmatchings/code_EDC020/func_80240614_EDC5F4.s new file mode 100644 index 0000000000..a078ef6812 --- /dev/null +++ b/asm/nonmatchings/code_EDC020/func_80240614_EDC5F4.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240614_EDC5F4 +/* EDC5F4 80240614 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EDC5F8 80240618 AFBF0010 */ sw $ra, 0x10($sp) +/* EDC5FC 8024061C 8C82000C */ lw $v0, 0xc($a0) +/* EDC600 80240620 0C0B53A3 */ jal func_802D4E8C +/* EDC604 80240624 8C450000 */ lw $a1, ($v0) +/* EDC608 80240628 3C018024 */ lui $at, %hi(D_80241854) +/* EDC60C 8024062C AC221854 */ sw $v0, %lo(D_80241854)($at) +/* EDC610 80240630 24020002 */ addiu $v0, $zero, 2 +/* EDC614 80240634 8FBF0010 */ lw $ra, 0x10($sp) +/* EDC618 80240638 24030001 */ addiu $v1, $zero, 1 +/* EDC61C 8024063C 3C018024 */ lui $at, %hi(func_80241850_A2BA90) +/* EDC620 80240640 AC231850 */ sw $v1, %lo(func_80241850_A2BA90)($at) +/* EDC624 80240644 03E00008 */ jr $ra +/* EDC628 80240648 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EDC020/func_8024064C_EDC62C.s b/asm/nonmatchings/code_EDC020/func_8024064C_EDC62C.s new file mode 100644 index 0000000000..e810d22fc9 --- /dev/null +++ b/asm/nonmatchings/code_EDC020/func_8024064C_EDC62C.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024064C_EDC62C +/* EDC62C 8024064C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EDC630 80240650 AFBF0010 */ sw $ra, 0x10($sp) +/* EDC634 80240654 8C82000C */ lw $v0, 0xc($a0) +/* EDC638 80240658 0C0B53A3 */ jal func_802D4E8C +/* EDC63C 8024065C 8C450000 */ lw $a1, ($v0) +/* EDC640 80240660 0040182D */ daddu $v1, $v0, $zero +/* EDC644 80240664 10600012 */ beqz $v1, .L802406B0 +/* EDC648 80240668 0000202D */ daddu $a0, $zero, $zero +/* EDC64C 8024066C 8C620000 */ lw $v0, ($v1) +/* EDC650 80240670 5040000A */ beql $v0, $zero, .L8024069C +/* EDC654 80240674 00041080 */ sll $v0, $a0, 2 +/* EDC658 80240678 3C058024 */ lui $a1, %hi(D_802429E0) +/* EDC65C 8024067C 24A529E0 */ addiu $a1, $a1, %lo(D_802429E0) +.L80240680: +/* EDC660 80240680 24630004 */ addiu $v1, $v1, 4 +/* EDC664 80240684 24840001 */ addiu $a0, $a0, 1 +/* EDC668 80240688 ACA20000 */ sw $v0, ($a1) +/* EDC66C 8024068C 8C620000 */ lw $v0, ($v1) +/* EDC670 80240690 1440FFFB */ bnez $v0, .L80240680 +/* EDC674 80240694 24A50004 */ addiu $a1, $a1, 4 +/* EDC678 80240698 00041080 */ sll $v0, $a0, 2 +.L8024069C: +/* EDC67C 8024069C 3C018024 */ lui $at, %hi(D_802429E0) +/* EDC680 802406A0 00220821 */ addu $at, $at, $v0 +/* EDC684 802406A4 AC2029E0 */ sw $zero, %lo(D_802429E0)($at) +/* EDC688 802406A8 080901B6 */ j .L802406D8 +/* EDC68C 802406AC 00000000 */ nop +.L802406B0: +/* EDC690 802406B0 3C038024 */ lui $v1, %hi(D_802429E0) +/* EDC694 802406B4 246329E0 */ addiu $v1, $v1, %lo(D_802429E0) +/* EDC698 802406B8 0060282D */ daddu $a1, $v1, $zero +.L802406BC: +/* EDC69C 802406BC 24820010 */ addiu $v0, $a0, 0x10 +/* EDC6A0 802406C0 AC620000 */ sw $v0, ($v1) +/* EDC6A4 802406C4 24630004 */ addiu $v1, $v1, 4 +/* EDC6A8 802406C8 24840001 */ addiu $a0, $a0, 1 +/* EDC6AC 802406CC 28820070 */ slti $v0, $a0, 0x70 +/* EDC6B0 802406D0 1440FFFA */ bnez $v0, .L802406BC +/* EDC6B4 802406D4 ACA001C0 */ sw $zero, 0x1c0($a1) +.L802406D8: +/* EDC6B8 802406D8 8FBF0010 */ lw $ra, 0x10($sp) +/* EDC6BC 802406DC 24020002 */ addiu $v0, $zero, 2 +/* EDC6C0 802406E0 03E00008 */ jr $ra +/* EDC6C4 802406E4 27BD0018 */ addiu $sp, $sp, 0x18 +/* EDC6C8 802406E8 00000000 */ nop +/* EDC6CC 802406EC 00000000 */ nop diff --git a/asm/nonmatchings/code_EDE9C0/func_80240000_EDE9C0.s b/asm/nonmatchings/code_EDE9C0/func_80240000_EDE9C0.s new file mode 100644 index 0000000000..0f38f5677e --- /dev/null +++ b/asm/nonmatchings/code_EDE9C0/func_80240000_EDE9C0.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EDE9C0 +/* EDE9C0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EDE9C4 80240004 0000202D */ daddu $a0, $zero, $zero +/* EDE9C8 80240008 0080282D */ daddu $a1, $a0, $zero +/* EDE9CC 8024000C 0080302D */ daddu $a2, $a0, $zero +/* EDE9D0 80240010 0080382D */ daddu $a3, $a0, $zero +/* EDE9D4 80240014 AFBF0018 */ sw $ra, 0x18($sp) +/* EDE9D8 80240018 AFA00010 */ sw $zero, 0x10($sp) +/* EDE9DC 8024001C 0C01DEF4 */ jal func_80077BD0 +/* EDE9E0 80240020 AFA00014 */ sw $zero, 0x14($sp) +/* EDE9E4 80240024 8FBF0018 */ lw $ra, 0x18($sp) +/* EDE9E8 80240028 24020002 */ addiu $v0, $zero, 2 +/* EDE9EC 8024002C 03E00008 */ jr $ra +/* EDE9F0 80240030 27BD0020 */ addiu $sp, $sp, 0x20 +/* EDE9F4 80240034 00000000 */ nop +/* EDE9F8 80240038 00000000 */ nop +/* EDE9FC 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EDEA00/func_80240040_EDEA00.s b/asm/nonmatchings/code_EDEA00/func_80240040_EDEA00.s new file mode 100644 index 0000000000..e3697ee368 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80240040_EDEA00.s @@ -0,0 +1,109 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240040_EDEA00 +/* EDEA00 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EDEA04 80240044 AFB20018 */ sw $s2, 0x18($sp) +/* EDEA08 80240048 0080902D */ daddu $s2, $a0, $zero +/* EDEA0C 8024004C AFB10014 */ sw $s1, 0x14($sp) +/* EDEA10 80240050 00A0882D */ daddu $s1, $a1, $zero +/* EDEA14 80240054 AFBF0024 */ sw $ra, 0x24($sp) +/* EDEA18 80240058 AFB40020 */ sw $s4, 0x20($sp) +/* EDEA1C 8024005C AFB3001C */ sw $s3, 0x1c($sp) +/* EDEA20 80240060 AFB00010 */ sw $s0, 0x10($sp) +/* EDEA24 80240064 8E50000C */ lw $s0, 0xc($s2) +/* EDEA28 80240068 8E050000 */ lw $a1, ($s0) +/* EDEA2C 8024006C 0C0B53A3 */ jal func_802D4E8C +/* EDEA30 80240070 26100004 */ addiu $s0, $s0, 4 +/* EDEA34 80240074 0240202D */ daddu $a0, $s2, $zero +/* EDEA38 80240078 8E050000 */ lw $a1, ($s0) +/* EDEA3C 8024007C 0C0B53A3 */ jal func_802D4E8C +/* EDEA40 80240080 0040802D */ daddu $s0, $v0, $zero +/* EDEA44 80240084 0200202D */ daddu $a0, $s0, $zero +/* EDEA48 80240088 0C00F94D */ jal func_8003E534 +/* EDEA4C 8024008C 0040A02D */ daddu $s4, $v0, $zero +/* EDEA50 80240090 3C138011 */ lui $s3, %hi(D_80117840) +/* EDEA54 80240094 26737840 */ addiu $s3, $s3, %lo(D_80117840) +/* EDEA58 80240098 12200006 */ beqz $s1, .L802400B4 +/* EDEA5C 8024009C 0040802D */ daddu $s0, $v0, $zero +/* EDEA60 802400A0 82620012 */ lb $v0, 0x12($s3) +/* EDEA64 802400A4 54400003 */ bnel $v0, $zero, .L802400B4 +/* EDEA68 802400A8 AE400070 */ sw $zero, 0x70($s2) +/* EDEA6C 802400AC 24020002 */ addiu $v0, $zero, 2 +/* EDEA70 802400B0 AE420070 */ sw $v0, 0x70($s2) +.L802400B4: +/* EDEA74 802400B4 8E430070 */ lw $v1, 0x70($s2) +/* EDEA78 802400B8 24110001 */ addiu $s1, $zero, 1 +/* EDEA7C 802400BC 10710013 */ beq $v1, $s1, .L8024010C +/* EDEA80 802400C0 28620002 */ slti $v0, $v1, 2 +/* EDEA84 802400C4 10400005 */ beqz $v0, .L802400DC +/* EDEA88 802400C8 24020002 */ addiu $v0, $zero, 2 +/* EDEA8C 802400CC 10600009 */ beqz $v1, .L802400F4 +/* EDEA90 802400D0 0000102D */ daddu $v0, $zero, $zero +/* EDEA94 802400D4 08090069 */ j .L802401A4 +/* EDEA98 802400D8 00000000 */ nop +.L802400DC: +/* EDEA9C 802400DC 10620013 */ beq $v1, $v0, .L8024012C +/* EDEAA0 802400E0 24020003 */ addiu $v0, $zero, 3 +/* EDEAA4 802400E4 1062001E */ beq $v1, $v0, .L80240160 +/* EDEAA8 802400E8 0000102D */ daddu $v0, $zero, $zero +/* EDEAAC 802400EC 08090069 */ j .L802401A4 +/* EDEAB0 802400F0 00000000 */ nop +.L802400F4: +/* EDEAB4 802400F4 0C03CB57 */ jal func_800F2D5C +/* EDEAB8 802400F8 0000202D */ daddu $a0, $zero, $zero +/* EDEABC 802400FC 2402001E */ addiu $v0, $zero, 0x1e +/* EDEAC0 80240100 AE420074 */ sw $v0, 0x74($s2) +/* EDEAC4 80240104 08090068 */ j .L802401A0 +/* EDEAC8 80240108 AE510070 */ sw $s1, 0x70($s2) +.L8024010C: +/* EDEACC 8024010C 8E420074 */ lw $v0, 0x74($s2) +/* EDEAD0 80240110 2403FFFF */ addiu $v1, $zero, -1 +/* EDEAD4 80240114 2442FFFF */ addiu $v0, $v0, -1 +/* EDEAD8 80240118 14430021 */ bne $v0, $v1, .L802401A0 +/* EDEADC 8024011C AE420074 */ sw $v0, 0x74($s2) +/* EDEAE0 80240120 24020002 */ addiu $v0, $zero, 2 +/* EDEAE4 80240124 08090068 */ j .L802401A0 +/* EDEAE8 80240128 AE420070 */ sw $v0, 0x70($s2) +.L8024012C: +/* EDEAEC 8024012C 0200202D */ daddu $a0, $s0, $zero +/* EDEAF0 80240130 00141600 */ sll $v0, $s4, 0x18 +/* EDEAF4 80240134 00021543 */ sra $v0, $v0, 0x15 +/* EDEAF8 80240138 02621021 */ addu $v0, $s3, $v0 +/* EDEAFC 8024013C A2740012 */ sb $s4, 0x12($s3) +/* EDEB00 80240140 0C03DC9E */ jal func_800F7278 +/* EDEB04 80240144 A0510014 */ sb $s1, 0x14($v0) +/* EDEB08 80240148 82640012 */ lb $a0, 0x12($s3) +/* EDEB0C 8024014C 0C03CBA6 */ jal func_800F2E98 +/* EDEB10 80240150 00000000 */ nop +/* EDEB14 80240154 24020003 */ addiu $v0, $zero, 3 +/* EDEB18 80240158 08090068 */ j .L802401A0 +/* EDEB1C 8024015C AE420070 */ sw $v0, 0x70($s2) +.L80240160: +/* EDEB20 80240160 0C00F94D */ jal func_8003E534 +/* EDEB24 80240164 2404FFFC */ addiu $a0, $zero, -4 +/* EDEB28 80240168 8E05000C */ lw $a1, 0xc($s0) +/* EDEB2C 8024016C 0C00FB54 */ jal func_8003ED50 +/* EDEB30 80240170 0040202D */ daddu $a0, $v0, $zero +/* EDEB34 80240174 0200202D */ daddu $a0, $s0, $zero +/* EDEB38 80240178 8E020000 */ lw $v0, ($s0) +/* EDEB3C 8024017C 2403FFFB */ addiu $v1, $zero, -5 +/* EDEB40 80240180 00431024 */ and $v0, $v0, $v1 +/* EDEB44 80240184 0C00F97A */ jal func_8003E5E8 +/* EDEB48 80240188 AE020000 */ sw $v0, ($s0) +/* EDEB4C 8024018C 3C01C47A */ lui $at, 0xc47a +/* EDEB50 80240190 44810000 */ mtc1 $at, $f0 +/* EDEB54 80240194 24020002 */ addiu $v0, $zero, 2 +/* EDEB58 80240198 08090069 */ j .L802401A4 +/* EDEB5C 8024019C E600003C */ swc1 $f0, 0x3c($s0) +.L802401A0: +/* EDEB60 802401A0 0000102D */ daddu $v0, $zero, $zero +.L802401A4: +/* EDEB64 802401A4 8FBF0024 */ lw $ra, 0x24($sp) +/* EDEB68 802401A8 8FB40020 */ lw $s4, 0x20($sp) +/* EDEB6C 802401AC 8FB3001C */ lw $s3, 0x1c($sp) +/* EDEB70 802401B0 8FB20018 */ lw $s2, 0x18($sp) +/* EDEB74 802401B4 8FB10014 */ lw $s1, 0x14($sp) +/* EDEB78 802401B8 8FB00010 */ lw $s0, 0x10($sp) +/* EDEB7C 802401BC 03E00008 */ jr $ra +/* EDEB80 802401C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EDEA00/func_802401C4_EDEB84.s b/asm/nonmatchings/code_EDEA00/func_802401C4_EDEB84.s new file mode 100644 index 0000000000..efca0ce600 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_802401C4_EDEB84.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401C4_EDEB84 +/* EDEB84 802401C4 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EDEB88 802401C8 AFB3002C */ sw $s3, 0x2c($sp) +/* EDEB8C 802401CC 0080982D */ daddu $s3, $a0, $zero +/* EDEB90 802401D0 AFBF0030 */ sw $ra, 0x30($sp) +/* EDEB94 802401D4 AFB20028 */ sw $s2, 0x28($sp) +/* EDEB98 802401D8 AFB10024 */ sw $s1, 0x24($sp) +/* EDEB9C 802401DC AFB00020 */ sw $s0, 0x20($sp) +/* EDEBA0 802401E0 8E710148 */ lw $s1, 0x148($s3) +/* EDEBA4 802401E4 86240008 */ lh $a0, 8($s1) +/* EDEBA8 802401E8 0C00F92F */ jal func_8003E4BC +/* EDEBAC 802401EC 00A0902D */ daddu $s2, $a1, $zero +/* EDEBB0 802401F0 8E440004 */ lw $a0, 4($s2) +/* EDEBB4 802401F4 0040802D */ daddu $s0, $v0, $zero +/* EDEBB8 802401F8 00041FC2 */ srl $v1, $a0, 0x1f +/* EDEBBC 802401FC 00832021 */ addu $a0, $a0, $v1 +/* EDEBC0 80240200 00042043 */ sra $a0, $a0, 1 +/* EDEBC4 80240204 0C00AB3B */ jal func_8002ACEC +/* EDEBC8 80240208 24840001 */ addiu $a0, $a0, 1 +/* EDEBCC 8024020C 8E430004 */ lw $v1, 4($s2) +/* EDEBD0 80240210 000327C2 */ srl $a0, $v1, 0x1f +/* EDEBD4 80240214 00641821 */ addu $v1, $v1, $a0 +/* EDEBD8 80240218 00031843 */ sra $v1, $v1, 1 +/* EDEBDC 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EDEBE0 80240220 A603008E */ sh $v1, 0x8e($s0) +/* EDEBE4 80240224 8E2300D0 */ lw $v1, 0xd0($s1) +/* EDEBE8 80240228 C6000040 */ lwc1 $f0, 0x40($s0) +/* EDEBEC 8024022C C4640000 */ lwc1 $f4, ($v1) +/* EDEBF0 80240230 46802120 */ cvt.s.w $f4, $f4 +/* EDEBF4 80240234 C4620008 */ lwc1 $f2, 8($v1) +/* EDEBF8 80240238 468010A0 */ cvt.s.w $f2, $f2 +/* EDEBFC 8024023C E7A00010 */ swc1 $f0, 0x10($sp) +/* EDEC00 80240240 8E2200D0 */ lw $v0, 0xd0($s1) +/* EDEC04 80240244 44061000 */ mfc1 $a2, $f2 +/* EDEC08 80240248 C440000C */ lwc1 $f0, 0xc($v0) +/* EDEC0C 8024024C 46800020 */ cvt.s.w $f0, $f0 +/* EDEC10 80240250 E7A00014 */ swc1 $f0, 0x14($sp) +/* EDEC14 80240254 8E2200D0 */ lw $v0, 0xd0($s1) +/* EDEC18 80240258 44052000 */ mfc1 $a1, $f4 +/* EDEC1C 8024025C C4400010 */ lwc1 $f0, 0x10($v0) +/* EDEC20 80240260 46800020 */ cvt.s.w $f0, $f0 +/* EDEC24 80240264 E7A00018 */ swc1 $f0, 0x18($sp) +/* EDEC28 80240268 8C640018 */ lw $a0, 0x18($v1) +/* EDEC2C 8024026C 0C013431 */ jal func_8004D0C4 +/* EDEC30 80240270 8E070038 */ lw $a3, 0x38($s0) +/* EDEC34 80240274 1040000E */ beqz $v0, .L802402B0 +/* EDEC38 80240278 00000000 */ nop +/* EDEC3C 8024027C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EDEC40 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EDEC44 80240284 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EDEC48 80240288 C4460000 */ lwc1 $f6, ($v0) +/* EDEC4C 8024028C 468031A0 */ cvt.s.w $f6, $f6 +/* EDEC50 80240290 44063000 */ mfc1 $a2, $f6 +/* EDEC54 80240294 C4460008 */ lwc1 $f6, 8($v0) +/* EDEC58 80240298 468031A0 */ cvt.s.w $f6, $f6 +/* EDEC5C 8024029C 44073000 */ mfc1 $a3, $f6 +/* EDEC60 802402A0 0C00ABDC */ jal fio_validate_header_checksums +/* EDEC64 802402A4 00000000 */ nop +/* EDEC68 802402A8 080900B8 */ j .L802402E0 +/* EDEC6C 802402AC E600000C */ swc1 $f0, 0xc($s0) +.L802402B0: +/* EDEC70 802402B0 0C00AB3B */ jal func_8002ACEC +/* EDEC74 802402B4 2404003C */ addiu $a0, $zero, 0x3c +/* EDEC78 802402B8 C60C000C */ lwc1 $f12, 0xc($s0) +/* EDEC7C 802402BC 44820000 */ mtc1 $v0, $f0 +/* EDEC80 802402C0 00000000 */ nop +/* EDEC84 802402C4 46800020 */ cvt.s.w $f0, $f0 +/* EDEC88 802402C8 46006300 */ add.s $f12, $f12, $f0 +/* EDEC8C 802402CC 3C0141F0 */ lui $at, 0x41f0 +/* EDEC90 802402D0 44810000 */ mtc1 $at, $f0 +/* EDEC94 802402D4 0C00AB85 */ jal func_8002AE14 +/* EDEC98 802402D8 46006301 */ sub.s $f12, $f12, $f0 +/* EDEC9C 802402DC E600000C */ swc1 $f0, 0xc($s0) +.L802402E0: +/* EDECA0 802402E0 8E2200CC */ lw $v0, 0xcc($s1) +/* EDECA4 802402E4 8C420004 */ lw $v0, 4($v0) +/* EDECA8 802402E8 AE020028 */ sw $v0, 0x28($s0) +/* EDECAC 802402EC AE600074 */ sw $zero, 0x74($s3) +/* EDECB0 802402F0 8E2200D0 */ lw $v0, 0xd0($s1) +/* EDECB4 802402F4 8C420014 */ lw $v0, 0x14($v0) +/* EDECB8 802402F8 04410004 */ bgez $v0, .L8024030C +/* EDECBC 802402FC 00000000 */ nop +/* EDECC0 80240300 C6400000 */ lwc1 $f0, ($s2) +/* EDECC4 80240304 080900CB */ j .L8024032C +/* EDECC8 80240308 E6000018 */ swc1 $f0, 0x18($s0) +.L8024030C: +/* EDECCC 8024030C 3C018024 */ lui $at, %hi(D_80247AF0) +/* EDECD0 80240310 D4227AF0 */ ldc1 $f2, %lo(D_80247AF0)($at) +/* EDECD4 80240314 44820000 */ mtc1 $v0, $f0 +/* EDECD8 80240318 00000000 */ nop +/* EDECDC 8024031C 46800021 */ cvt.d.w $f0, $f0 +/* EDECE0 80240320 46220003 */ div.d $f0, $f0, $f2 +/* EDECE4 80240324 46200020 */ cvt.s.d $f0, $f0 +/* EDECE8 80240328 E6000018 */ swc1 $f0, 0x18($s0) +.L8024032C: +/* EDECEC 8024032C C600003C */ lwc1 $f0, 0x3c($s0) +/* EDECF0 80240330 3C014059 */ lui $at, 0x4059 +/* EDECF4 80240334 44811800 */ mtc1 $at, $f3 +/* EDECF8 80240338 44801000 */ mtc1 $zero, $f2 +/* EDECFC 8024033C 46000021 */ cvt.d.s $f0, $f0 +/* EDED00 80240340 46220002 */ mul.d $f0, $f0, $f2 +/* EDED04 80240344 00000000 */ nop +/* EDED08 80240348 24020001 */ addiu $v0, $zero, 1 +/* EDED0C 8024034C 4620018D */ trunc.w.d $f6, $f0 +/* EDED10 80240350 E626007C */ swc1 $f6, 0x7c($s1) +/* EDED14 80240354 AE620070 */ sw $v0, 0x70($s3) +/* EDED18 80240358 8FBF0030 */ lw $ra, 0x30($sp) +/* EDED1C 8024035C 8FB3002C */ lw $s3, 0x2c($sp) +/* EDED20 80240360 8FB20028 */ lw $s2, 0x28($sp) +/* EDED24 80240364 8FB10024 */ lw $s1, 0x24($sp) +/* EDED28 80240368 8FB00020 */ lw $s0, 0x20($sp) +/* EDED2C 8024036C 03E00008 */ jr $ra +/* EDED30 80240370 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EDEA00/func_80240374_EDED34.s b/asm/nonmatchings/code_EDEA00/func_80240374_EDED34.s new file mode 100644 index 0000000000..6871697f4e --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80240374_EDED34.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240374_EDED34 +/* EDED34 80240374 27BDFF80 */ addiu $sp, $sp, -0x80 +/* EDED38 80240378 AFB3004C */ sw $s3, 0x4c($sp) +/* EDED3C 8024037C 0080982D */ daddu $s3, $a0, $zero +/* EDED40 80240380 AFBF0058 */ sw $ra, 0x58($sp) +/* EDED44 80240384 AFB50054 */ sw $s5, 0x54($sp) +/* EDED48 80240388 AFB40050 */ sw $s4, 0x50($sp) +/* EDED4C 8024038C AFB20048 */ sw $s2, 0x48($sp) +/* EDED50 80240390 AFB10044 */ sw $s1, 0x44($sp) +/* EDED54 80240394 AFB00040 */ sw $s0, 0x40($sp) +/* EDED58 80240398 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* EDED5C 8024039C F7B80070 */ sdc1 $f24, 0x70($sp) +/* EDED60 802403A0 F7B60068 */ sdc1 $f22, 0x68($sp) +/* EDED64 802403A4 F7B40060 */ sdc1 $f20, 0x60($sp) +/* EDED68 802403A8 8E710148 */ lw $s1, 0x148($s3) +/* EDED6C 802403AC 00A0902D */ daddu $s2, $a1, $zero +/* EDED70 802403B0 86240008 */ lh $a0, 8($s1) +/* EDED74 802403B4 0C00F92F */ jal func_8003E4BC +/* EDED78 802403B8 00C0A82D */ daddu $s5, $a2, $zero +/* EDED7C 802403BC 0040802D */ daddu $s0, $v0, $zero +/* EDED80 802403C0 0000A02D */ daddu $s4, $zero, $zero +/* EDED84 802403C4 C624007C */ lwc1 $f4, 0x7c($s1) +/* EDED88 802403C8 46802120 */ cvt.s.w $f4, $f4 +/* EDED8C 802403CC C6220088 */ lwc1 $f2, 0x88($s1) +/* EDED90 802403D0 468010A0 */ cvt.s.w $f2, $f2 +/* EDED94 802403D4 460010A1 */ cvt.d.s $f2, $f2 +/* EDED98 802403D8 46002121 */ cvt.d.s $f4, $f4 +/* EDED9C 802403DC C600003C */ lwc1 $f0, 0x3c($s0) +/* EDEDA0 802403E0 3C014059 */ lui $at, 0x4059 +/* EDEDA4 802403E4 44813800 */ mtc1 $at, $f7 +/* EDEDA8 802403E8 44803000 */ mtc1 $zero, $f6 +/* EDEDAC 802403EC 46000021 */ cvt.d.s $f0, $f0 +/* EDEDB0 802403F0 46260002 */ mul.d $f0, $f0, $f6 +/* EDEDB4 802403F4 00000000 */ nop +/* EDEDB8 802403F8 24020001 */ addiu $v0, $zero, 1 +/* EDEDBC 802403FC 8E24006C */ lw $a0, 0x6c($s1) +/* EDEDC0 80240400 46261083 */ div.d $f2, $f2, $f6 +/* EDEDC4 80240404 462010A0 */ cvt.s.d $f2, $f2 +/* EDEDC8 80240408 46262103 */ div.d $f4, $f4, $f6 +/* EDEDCC 8024040C 46202520 */ cvt.s.d $f20, $f4 +/* EDEDD0 80240410 30830011 */ andi $v1, $a0, 0x11 +/* EDEDD4 80240414 4620020D */ trunc.w.d $f8, $f0 +/* EDEDD8 80240418 E628007C */ swc1 $f8, 0x7c($s1) +/* EDEDDC 8024041C C6200078 */ lwc1 $f0, 0x78($s1) +/* EDEDE0 80240420 46800020 */ cvt.s.w $f0, $f0 +/* EDEDE4 80240424 46000021 */ cvt.d.s $f0, $f0 +/* EDEDE8 80240428 46260003 */ div.d $f0, $f0, $f6 +/* EDEDEC 8024042C 462006A0 */ cvt.s.d $f26, $f0 +/* EDEDF0 80240430 C6200070 */ lwc1 $f0, 0x70($s1) +/* EDEDF4 80240434 46800020 */ cvt.s.w $f0, $f0 +/* EDEDF8 80240438 46000021 */ cvt.d.s $f0, $f0 +/* EDEDFC 8024043C 46260003 */ div.d $f0, $f0, $f6 +/* EDEE00 80240440 462005A0 */ cvt.s.d $f22, $f0 +/* EDEE04 80240444 14620025 */ bne $v1, $v0, .L802404DC +/* EDEE08 80240448 4602D600 */ add.s $f24, $f26, $f2 +/* EDEE0C 8024044C 8E020000 */ lw $v0, ($s0) +/* EDEE10 80240450 30420008 */ andi $v0, $v0, 8 +/* EDEE14 80240454 10400009 */ beqz $v0, .L8024047C +/* EDEE18 80240458 27A50028 */ addiu $a1, $sp, 0x28 +/* EDEE1C 8024045C C600003C */ lwc1 $f0, 0x3c($s0) +/* EDEE20 80240460 4600C001 */ sub.s $f0, $f24, $f0 +/* EDEE24 80240464 4600B03C */ c.lt.s $f22, $f0 +/* EDEE28 80240468 00000000 */ nop +/* EDEE2C 8024046C 4500001B */ bc1f .L802404DC +/* EDEE30 80240470 34820010 */ ori $v0, $a0, 0x10 +/* EDEE34 80240474 08090137 */ j .L802404DC +/* EDEE38 80240478 AE22006C */ sw $v0, 0x6c($s1) +.L8024047C: +/* EDEE3C 8024047C 27A6002C */ addiu $a2, $sp, 0x2c +/* EDEE40 80240480 C6000038 */ lwc1 $f0, 0x38($s0) +/* EDEE44 80240484 C602003C */ lwc1 $f2, 0x3c($s0) +/* EDEE48 80240488 C6040040 */ lwc1 $f4, 0x40($s0) +/* EDEE4C 8024048C 3C01447A */ lui $at, 0x447a +/* EDEE50 80240490 44813000 */ mtc1 $at, $f6 +/* EDEE54 80240494 27A20034 */ addiu $v0, $sp, 0x34 +/* EDEE58 80240498 E7A00028 */ swc1 $f0, 0x28($sp) +/* EDEE5C 8024049C E7A2002C */ swc1 $f2, 0x2c($sp) +/* EDEE60 802404A0 E7A40030 */ swc1 $f4, 0x30($sp) +/* EDEE64 802404A4 E7A60034 */ swc1 $f6, 0x34($sp) +/* EDEE68 802404A8 AFA20010 */ sw $v0, 0x10($sp) +/* EDEE6C 802404AC 8E040080 */ lw $a0, 0x80($s0) +/* EDEE70 802404B0 0C03908F */ jal func_800E423C +/* EDEE74 802404B4 27A70030 */ addiu $a3, $sp, 0x30 +/* EDEE78 802404B8 C7A00034 */ lwc1 $f0, 0x34($sp) +/* EDEE7C 802404BC 4600D001 */ sub.s $f0, $f26, $f0 +/* EDEE80 802404C0 4600B03C */ c.lt.s $f22, $f0 +/* EDEE84 802404C4 00000000 */ nop +/* EDEE88 802404C8 45000004 */ bc1f .L802404DC +/* EDEE8C 802404CC 00000000 */ nop +/* EDEE90 802404D0 8E22006C */ lw $v0, 0x6c($s1) +/* EDEE94 802404D4 34420010 */ ori $v0, $v0, 0x10 +/* EDEE98 802404D8 AE22006C */ sw $v0, 0x6c($s1) +.L802404DC: +/* EDEE9C 802404DC 8E22006C */ lw $v0, 0x6c($s1) +/* EDEEA0 802404E0 24030011 */ addiu $v1, $zero, 0x11 +/* EDEEA4 802404E4 30420011 */ andi $v0, $v0, 0x11 +/* EDEEA8 802404E8 14430039 */ bne $v0, $v1, .L802405D0 +/* EDEEAC 802404EC 00000000 */ nop +/* EDEEB0 802404F0 8E020000 */ lw $v0, ($s0) +/* EDEEB4 802404F4 30420008 */ andi $v0, $v0, 8 +/* EDEEB8 802404F8 1040000A */ beqz $v0, .L80240524 +/* EDEEBC 802404FC 4600C106 */ mov.s $f4, $f24 +/* EDEEC0 80240500 4614C081 */ sub.s $f2, $f24, $f20 +/* EDEEC4 80240504 3C018024 */ lui $at, %hi(D_80247AF8) +/* EDEEC8 80240508 D4207AF8 */ ldc1 $f0, %lo(D_80247AF8)($at) +/* EDEECC 8024050C 460010A1 */ cvt.d.s $f2, $f2 +/* EDEED0 80240510 46201082 */ mul.d $f2, $f2, $f0 +/* EDEED4 80240514 00000000 */ nop +/* EDEED8 80240518 4600A021 */ cvt.d.s $f0, $f20 +/* EDEEDC 8024051C 08090162 */ j .L80240588 +/* EDEEE0 80240520 46220000 */ add.d $f0, $f0, $f2 +.L80240524: +/* EDEEE4 80240524 27A50028 */ addiu $a1, $sp, 0x28 +/* EDEEE8 80240528 27A6002C */ addiu $a2, $sp, 0x2c +/* EDEEEC 8024052C C6000038 */ lwc1 $f0, 0x38($s0) +/* EDEEF0 80240530 C6020040 */ lwc1 $f2, 0x40($s0) +/* EDEEF4 80240534 3C01447A */ lui $at, 0x447a +/* EDEEF8 80240538 44812000 */ mtc1 $at, $f4 +/* EDEEFC 8024053C 27A20034 */ addiu $v0, $sp, 0x34 +/* EDEF00 80240540 E7B4002C */ swc1 $f20, 0x2c($sp) +/* EDEF04 80240544 E7A00028 */ swc1 $f0, 0x28($sp) +/* EDEF08 80240548 E7A20030 */ swc1 $f2, 0x30($sp) +/* EDEF0C 8024054C E7A40034 */ swc1 $f4, 0x34($sp) +/* EDEF10 80240550 AFA20010 */ sw $v0, 0x10($sp) +/* EDEF14 80240554 8E040080 */ lw $a0, 0x80($s0) +/* EDEF18 80240558 0C03908F */ jal func_800E423C +/* EDEF1C 8024055C 27A70030 */ addiu $a3, $sp, 0x30 +/* EDEF20 80240560 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* EDEF24 80240564 461A2100 */ add.s $f4, $f4, $f26 +/* EDEF28 80240568 46142081 */ sub.s $f2, $f4, $f20 +/* EDEF2C 8024056C 3C018024 */ lui $at, %hi(D_80247B00) +/* EDEF30 80240570 D4207B00 */ ldc1 $f0, %lo(D_80247B00)($at) +/* EDEF34 80240574 460010A1 */ cvt.d.s $f2, $f2 +/* EDEF38 80240578 46201082 */ mul.d $f2, $f2, $f0 +/* EDEF3C 8024057C 00000000 */ nop +/* EDEF40 80240580 4600A021 */ cvt.d.s $f0, $f20 +/* EDEF44 80240584 46220000 */ add.d $f0, $f0, $f2 +.L80240588: +/* EDEF48 80240588 46200020 */ cvt.s.d $f0, $f0 +/* EDEF4C 8024058C E600003C */ swc1 $f0, 0x3c($s0) +/* EDEF50 80240590 C600003C */ lwc1 $f0, 0x3c($s0) +/* EDEF54 80240594 46002001 */ sub.s $f0, $f4, $f0 +/* EDEF58 80240598 3C013FF0 */ lui $at, 0x3ff0 +/* EDEF5C 8024059C 44811800 */ mtc1 $at, $f3 +/* EDEF60 802405A0 44801000 */ mtc1 $zero, $f2 +/* EDEF64 802405A4 46000005 */ abs.s $f0, $f0 +/* EDEF68 802405A8 46000021 */ cvt.d.s $f0, $f0 +/* EDEF6C 802405AC 4622003C */ c.lt.d $f0, $f2 +/* EDEF70 802405B0 00000000 */ nop +/* EDEF74 802405B4 45000036 */ bc1f .L80240690 +/* EDEF78 802405B8 2403FFEF */ addiu $v1, $zero, -0x11 +/* EDEF7C 802405BC E604003C */ swc1 $f4, 0x3c($s0) +/* EDEF80 802405C0 8E22006C */ lw $v0, 0x6c($s1) +/* EDEF84 802405C4 00431024 */ and $v0, $v0, $v1 +/* EDEF88 802405C8 080901A4 */ j .L80240690 +/* EDEF8C 802405CC AE22006C */ sw $v0, 0x6c($s1) +.L802405D0: +/* EDEF90 802405D0 8E220070 */ lw $v0, 0x70($s1) +/* EDEF94 802405D4 1840002E */ blez $v0, .L80240690 +/* EDEF98 802405D8 00000000 */ nop +/* EDEF9C 802405DC C62C0074 */ lwc1 $f12, 0x74($s1) +/* EDEFA0 802405E0 0C00AD77 */ jal func_8002B5DC +/* EDEFA4 802405E4 46806320 */ cvt.s.w $f12, $f12 +/* EDEFA8 802405E8 8E020000 */ lw $v0, ($s0) +/* EDEFAC 802405EC 30420008 */ andi $v0, $v0, 8 +/* EDEFB0 802405F0 10400003 */ beqz $v0, .L80240600 +/* EDEFB4 802405F4 46000506 */ mov.s $f20, $f0 +/* EDEFB8 802405F8 08090190 */ j .L80240640 +/* EDEFBC 802405FC 0000102D */ daddu $v0, $zero, $zero +.L80240600: +/* EDEFC0 80240600 27A50028 */ addiu $a1, $sp, 0x28 +/* EDEFC4 80240604 27A6002C */ addiu $a2, $sp, 0x2c +/* EDEFC8 80240608 C6000038 */ lwc1 $f0, 0x38($s0) +/* EDEFCC 8024060C C602003C */ lwc1 $f2, 0x3c($s0) +/* EDEFD0 80240610 C6040040 */ lwc1 $f4, 0x40($s0) +/* EDEFD4 80240614 3C01447A */ lui $at, 0x447a +/* EDEFD8 80240618 44813000 */ mtc1 $at, $f6 +/* EDEFDC 8024061C 27A20034 */ addiu $v0, $sp, 0x34 +/* EDEFE0 80240620 E7A00028 */ swc1 $f0, 0x28($sp) +/* EDEFE4 80240624 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EDEFE8 80240628 E7A40030 */ swc1 $f4, 0x30($sp) +/* EDEFEC 8024062C E7A60034 */ swc1 $f6, 0x34($sp) +/* EDEFF0 80240630 AFA20010 */ sw $v0, 0x10($sp) +/* EDEFF4 80240634 8E040080 */ lw $a0, 0x80($s0) +/* EDEFF8 80240638 0C03908F */ jal func_800E423C +/* EDEFFC 8024063C 27A70030 */ addiu $a3, $sp, 0x30 +.L80240640: +/* EDF000 80240640 10400007 */ beqz $v0, .L80240660 +/* EDF004 80240644 00000000 */ nop +/* EDF008 80240648 4616A082 */ mul.s $f2, $f20, $f22 +/* EDF00C 8024064C 00000000 */ nop +/* EDF010 80240650 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EDF014 80240654 461A0000 */ add.s $f0, $f0, $f26 +/* EDF018 80240658 0809019B */ j .L8024066C +/* EDF01C 8024065C 46020000 */ add.s $f0, $f0, $f2 +.L80240660: +/* EDF020 80240660 4616A002 */ mul.s $f0, $f20, $f22 +/* EDF024 80240664 00000000 */ nop +/* EDF028 80240668 4600C000 */ add.s $f0, $f24, $f0 +.L8024066C: +/* EDF02C 8024066C E600003C */ swc1 $f0, 0x3c($s0) +/* EDF030 80240670 8E220074 */ lw $v0, 0x74($s1) +/* EDF034 80240674 2442000A */ addiu $v0, $v0, 0xa +/* EDF038 80240678 44826000 */ mtc1 $v0, $f12 +/* EDF03C 8024067C 00000000 */ nop +/* EDF040 80240680 0C00AB85 */ jal func_8002AE14 +/* EDF044 80240684 46806320 */ cvt.s.w $f12, $f12 +/* EDF048 80240688 4600020D */ trunc.w.s $f8, $f0 +/* EDF04C 8024068C E6280074 */ swc1 $f8, 0x74($s1) +.L80240690: +/* EDF050 80240690 8E220090 */ lw $v0, 0x90($s1) +/* EDF054 80240694 1C40004A */ bgtz $v0, .L802407C0 +/* EDF058 80240698 2442FFFF */ addiu $v0, $v0, -1 +/* EDF05C 8024069C 8E430014 */ lw $v1, 0x14($s2) +/* EDF060 802406A0 04600048 */ bltz $v1, .L802407C4 +/* EDF064 802406A4 00000000 */ nop +/* EDF068 802406A8 8E620074 */ lw $v0, 0x74($s3) +/* EDF06C 802406AC 1C400042 */ bgtz $v0, .L802407B8 +/* EDF070 802406B0 2442FFFF */ addiu $v0, $v0, -1 +/* EDF074 802406B4 AE630074 */ sw $v1, 0x74($s3) +/* EDF078 802406B8 860200A8 */ lh $v0, 0xa8($s0) +/* EDF07C 802406BC C602003C */ lwc1 $f2, 0x3c($s0) +/* EDF080 802406C0 44820000 */ mtc1 $v0, $f0 +/* EDF084 802406C4 00000000 */ nop +/* EDF088 802406C8 46800020 */ cvt.s.w $f0, $f0 +/* EDF08C 802406CC 46001080 */ add.s $f2, $f2, $f0 +/* EDF090 802406D0 3C014024 */ lui $at, 0x4024 +/* EDF094 802406D4 44810800 */ mtc1 $at, $f1 +/* EDF098 802406D8 44800000 */ mtc1 $zero, $f0 +/* EDF09C 802406DC 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EDF0A0 802406E0 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EDF0A4 802406E4 460010A1 */ cvt.d.s $f2, $f2 +/* EDF0A8 802406E8 46201080 */ add.d $f2, $f2, $f0 +/* EDF0AC 802406EC C440002C */ lwc1 $f0, 0x2c($v0) +/* EDF0B0 802406F0 46000021 */ cvt.d.s $f0, $f0 +/* EDF0B4 802406F4 4622003C */ c.lt.d $f0, $f2 +/* EDF0B8 802406F8 00000000 */ nop +/* EDF0BC 802406FC 4500002C */ bc1f .L802407B0 +/* EDF0C0 80240700 02A0202D */ daddu $a0, $s5, $zero +/* EDF0C4 80240704 AFA00010 */ sw $zero, 0x10($sp) +/* EDF0C8 80240708 8E46000C */ lw $a2, 0xc($s2) +/* EDF0CC 8024070C 8E470010 */ lw $a3, 0x10($s2) +/* EDF0D0 80240710 0C013469 */ jal func_8004D1A4 +/* EDF0D4 80240714 0220282D */ daddu $a1, $s1, $zero +/* EDF0D8 80240718 10400025 */ beqz $v0, .L802407B0 +/* EDF0DC 8024071C 0000202D */ daddu $a0, $zero, $zero +/* EDF0E0 80240720 0200282D */ daddu $a1, $s0, $zero +/* EDF0E4 80240724 0000302D */ daddu $a2, $zero, $zero +/* EDF0E8 80240728 2412000C */ addiu $s2, $zero, 0xc +/* EDF0EC 8024072C 860300A8 */ lh $v1, 0xa8($s0) +/* EDF0F0 80240730 3C013F80 */ lui $at, 0x3f80 +/* EDF0F4 80240734 44810000 */ mtc1 $at, $f0 +/* EDF0F8 80240738 3C014000 */ lui $at, 0x4000 +/* EDF0FC 8024073C 44811000 */ mtc1 $at, $f2 +/* EDF100 80240740 3C01C1A0 */ lui $at, 0xc1a0 +/* EDF104 80240744 44812000 */ mtc1 $at, $f4 +/* EDF108 80240748 44834000 */ mtc1 $v1, $f8 +/* EDF10C 8024074C 00000000 */ nop +/* EDF110 80240750 46804220 */ cvt.s.w $f8, $f8 +/* EDF114 80240754 44074000 */ mfc1 $a3, $f8 +/* EDF118 80240758 27A20038 */ addiu $v0, $sp, 0x38 +/* EDF11C 8024075C AFB2001C */ sw $s2, 0x1c($sp) +/* EDF120 80240760 AFA20020 */ sw $v0, 0x20($sp) +/* EDF124 80240764 E7A00010 */ swc1 $f0, 0x10($sp) +/* EDF128 80240768 E7A20014 */ swc1 $f2, 0x14($sp) +/* EDF12C 8024076C 0C01D444 */ jal func_80075110 +/* EDF130 80240770 E7A40018 */ swc1 $f4, 0x18($sp) +/* EDF134 80240774 0200202D */ daddu $a0, $s0, $zero +/* EDF138 80240778 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EDF13C 8024077C C480003C */ lwc1 $f0, 0x3c($a0) +/* EDF140 80240780 3C060020 */ lui $a2, 0x20 +/* EDF144 80240784 0C013600 */ jal func_8004D800 +/* EDF148 80240788 E4800064 */ swc1 $f0, 0x64($a0) +/* EDF14C 8024078C 8E220018 */ lw $v0, 0x18($s1) +/* EDF150 80240790 9442002A */ lhu $v0, 0x2a($v0) +/* EDF154 80240794 30420001 */ andi $v0, $v0, 1 +/* EDF158 80240798 10400003 */ beqz $v0, .L802407A8 +/* EDF15C 8024079C 2402000A */ addiu $v0, $zero, 0xa +/* EDF160 802407A0 0809025A */ j .L80240968 +/* EDF164 802407A4 AE620070 */ sw $v0, 0x70($s3) +.L802407A8: +/* EDF168 802407A8 0809025A */ j .L80240968 +/* EDF16C 802407AC AE720070 */ sw $s2, 0x70($s3) +.L802407B0: +/* EDF170 802407B0 8E620074 */ lw $v0, 0x74($s3) +/* EDF174 802407B4 2442FFFF */ addiu $v0, $v0, -1 +.L802407B8: +/* EDF178 802407B8 080901F1 */ j .L802407C4 +/* EDF17C 802407BC AE620074 */ sw $v0, 0x74($s3) +.L802407C0: +/* EDF180 802407C0 AE220090 */ sw $v0, 0x90($s1) +.L802407C4: +/* EDF184 802407C4 8E2300D0 */ lw $v1, 0xd0($s1) +/* EDF188 802407C8 C6000040 */ lwc1 $f0, 0x40($s0) +/* EDF18C 802407CC C4620000 */ lwc1 $f2, ($v1) +/* EDF190 802407D0 468010A0 */ cvt.s.w $f2, $f2 +/* EDF194 802407D4 C4640008 */ lwc1 $f4, 8($v1) +/* EDF198 802407D8 46802120 */ cvt.s.w $f4, $f4 +/* EDF19C 802407DC E7A00010 */ swc1 $f0, 0x10($sp) +/* EDF1A0 802407E0 8E2200D0 */ lw $v0, 0xd0($s1) +/* EDF1A4 802407E4 44051000 */ mfc1 $a1, $f2 +/* EDF1A8 802407E8 C440000C */ lwc1 $f0, 0xc($v0) +/* EDF1AC 802407EC 46800020 */ cvt.s.w $f0, $f0 +/* EDF1B0 802407F0 E7A00014 */ swc1 $f0, 0x14($sp) +/* EDF1B4 802407F4 8E2200D0 */ lw $v0, 0xd0($s1) +/* EDF1B8 802407F8 44062000 */ mfc1 $a2, $f4 +/* EDF1BC 802407FC C4400010 */ lwc1 $f0, 0x10($v0) +/* EDF1C0 80240800 46800020 */ cvt.s.w $f0, $f0 +/* EDF1C4 80240804 E7A00018 */ swc1 $f0, 0x18($sp) +/* EDF1C8 80240808 8C640018 */ lw $a0, 0x18($v1) +/* EDF1CC 8024080C 0C013431 */ jal func_8004D0C4 +/* EDF1D0 80240810 8E070038 */ lw $a3, 0x38($s0) +/* EDF1D4 80240814 1040001A */ beqz $v0, .L80240880 +/* EDF1D8 80240818 00000000 */ nop +/* EDF1DC 8024081C 8E060038 */ lw $a2, 0x38($s0) +/* EDF1E0 80240820 8E2200D0 */ lw $v0, 0xd0($s1) +/* EDF1E4 80240824 8E070040 */ lw $a3, 0x40($s0) +/* EDF1E8 80240828 C44C0000 */ lwc1 $f12, ($v0) +/* EDF1EC 8024082C 46806320 */ cvt.s.w $f12, $f12 +/* EDF1F0 80240830 C44E0008 */ lwc1 $f14, 8($v0) +/* EDF1F4 80240834 0C00AC71 */ jal func_8002B1C4 +/* EDF1F8 80240838 468073A0 */ cvt.s.w $f14, $f14 +/* EDF1FC 8024083C C6020018 */ lwc1 $f2, 0x18($s0) +/* EDF200 80240840 4600103C */ c.lt.s $f2, $f0 +/* EDF204 80240844 00000000 */ nop +/* EDF208 80240848 4500000D */ bc1f .L80240880 +/* EDF20C 8024084C E7A00034 */ swc1 $f0, 0x34($sp) +/* EDF210 80240850 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EDF214 80240854 8E2200D0 */ lw $v0, 0xd0($s1) +/* EDF218 80240858 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EDF21C 8024085C C4480000 */ lwc1 $f8, ($v0) +/* EDF220 80240860 46804220 */ cvt.s.w $f8, $f8 +/* EDF224 80240864 44064000 */ mfc1 $a2, $f8 +/* EDF228 80240868 C4480008 */ lwc1 $f8, 8($v0) +/* EDF22C 8024086C 46804220 */ cvt.s.w $f8, $f8 +/* EDF230 80240870 44074000 */ mfc1 $a3, $f8 +/* EDF234 80240874 0C00ABDC */ jal fio_validate_header_checksums +/* EDF238 80240878 24140001 */ addiu $s4, $zero, 1 +/* EDF23C 8024087C E600000C */ swc1 $f0, 0xc($s0) +.L80240880: +/* EDF240 80240880 8E2200D0 */ lw $v0, 0xd0($s1) +/* EDF244 80240884 8C43000C */ lw $v1, 0xc($v0) +/* EDF248 80240888 8C420010 */ lw $v0, 0x10($v0) +/* EDF24C 8024088C 00621825 */ or $v1, $v1, $v0 +/* EDF250 80240890 00741825 */ or $v1, $v1, $s4 +/* EDF254 80240894 10600008 */ beqz $v1, .L802408B8 +/* EDF258 80240898 00000000 */ nop +/* EDF25C 8024089C 8602008C */ lh $v0, 0x8c($s0) +/* EDF260 802408A0 14400031 */ bnez $v0, .L80240968 +/* EDF264 802408A4 00000000 */ nop +/* EDF268 802408A8 8E050018 */ lw $a1, 0x18($s0) +/* EDF26C 802408AC 8E06000C */ lw $a2, 0xc($s0) +/* EDF270 802408B0 0C00F909 */ jal func_8003E424 +/* EDF274 802408B4 0200202D */ daddu $a0, $s0, $zero +.L802408B8: +/* EDF278 802408B8 C600003C */ lwc1 $f0, 0x3c($s0) +/* EDF27C 802408BC 3C014059 */ lui $at, 0x4059 +/* EDF280 802408C0 44811800 */ mtc1 $at, $f3 +/* EDF284 802408C4 44801000 */ mtc1 $zero, $f2 +/* EDF288 802408C8 46000021 */ cvt.d.s $f0, $f0 +/* EDF28C 802408CC 46220002 */ mul.d $f0, $f0, $f2 +/* EDF290 802408D0 00000000 */ nop +/* EDF294 802408D4 4620020D */ trunc.w.d $f8, $f0 +/* EDF298 802408D8 E628007C */ swc1 $f8, 0x7c($s1) +/* EDF29C 802408DC 8E420004 */ lw $v0, 4($s2) +/* EDF2A0 802408E0 18400021 */ blez $v0, .L80240968 +/* EDF2A4 802408E4 00000000 */ nop +/* EDF2A8 802408E8 8602008E */ lh $v0, 0x8e($s0) +/* EDF2AC 802408EC 9603008E */ lhu $v1, 0x8e($s0) +/* EDF2B0 802408F0 18400005 */ blez $v0, .L80240908 +/* EDF2B4 802408F4 2462FFFF */ addiu $v0, $v1, -1 +/* EDF2B8 802408F8 A602008E */ sh $v0, 0x8e($s0) +/* EDF2BC 802408FC 00021400 */ sll $v0, $v0, 0x10 +/* EDF2C0 80240900 1C400019 */ bgtz $v0, .L80240968 +/* EDF2C4 80240904 00000000 */ nop +.L80240908: +/* EDF2C8 80240908 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EDF2CC 8024090C 24020002 */ addiu $v0, $zero, 2 +/* EDF2D0 80240910 0C00AB3B */ jal func_8002ACEC +/* EDF2D4 80240914 AE620070 */ sw $v0, 0x70($s3) +/* EDF2D8 80240918 3C035555 */ lui $v1, 0x5555 +/* EDF2DC 8024091C 34635556 */ ori $v1, $v1, 0x5556 +/* EDF2E0 80240920 00430018 */ mult $v0, $v1 +/* EDF2E4 80240924 000227C3 */ sra $a0, $v0, 0x1f +/* EDF2E8 80240928 00004010 */ mfhi $t0 +/* EDF2EC 8024092C 01042023 */ subu $a0, $t0, $a0 +/* EDF2F0 80240930 00041840 */ sll $v1, $a0, 1 +/* EDF2F4 80240934 00641821 */ addu $v1, $v1, $a0 +/* EDF2F8 80240938 00431023 */ subu $v0, $v0, $v1 +/* EDF2FC 8024093C 24430002 */ addiu $v1, $v0, 2 +/* EDF300 80240940 AE630074 */ sw $v1, 0x74($s3) +/* EDF304 80240944 8E42002C */ lw $v0, 0x2c($s2) +/* EDF308 80240948 58400007 */ blezl $v0, .L80240968 +/* EDF30C 8024094C AE600070 */ sw $zero, 0x70($s3) +/* EDF310 80240950 8E420008 */ lw $v0, 8($s2) +/* EDF314 80240954 18400003 */ blez $v0, .L80240964 +/* EDF318 80240958 28620003 */ slti $v0, $v1, 3 +/* EDF31C 8024095C 10400002 */ beqz $v0, .L80240968 +/* EDF320 80240960 00000000 */ nop +.L80240964: +/* EDF324 80240964 AE600070 */ sw $zero, 0x70($s3) +.L80240968: +/* EDF328 80240968 8FBF0058 */ lw $ra, 0x58($sp) +/* EDF32C 8024096C 8FB50054 */ lw $s5, 0x54($sp) +/* EDF330 80240970 8FB40050 */ lw $s4, 0x50($sp) +/* EDF334 80240974 8FB3004C */ lw $s3, 0x4c($sp) +/* EDF338 80240978 8FB20048 */ lw $s2, 0x48($sp) +/* EDF33C 8024097C 8FB10044 */ lw $s1, 0x44($sp) +/* EDF340 80240980 8FB00040 */ lw $s0, 0x40($sp) +/* EDF344 80240984 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* EDF348 80240988 D7B80070 */ ldc1 $f24, 0x70($sp) +/* EDF34C 8024098C D7B60068 */ ldc1 $f22, 0x68($sp) +/* EDF350 80240990 D7B40060 */ ldc1 $f20, 0x60($sp) +/* EDF354 80240994 03E00008 */ jr $ra +/* EDF358 80240998 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/code_EDEA00/func_8024099C_EDF35C.s b/asm/nonmatchings/code_EDEA00/func_8024099C_EDF35C.s new file mode 100644 index 0000000000..c9aadf4a76 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_8024099C_EDF35C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024099C_EDF35C +/* EDF35C 8024099C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EDF360 802409A0 AFB3001C */ sw $s3, 0x1c($sp) +/* EDF364 802409A4 0080982D */ daddu $s3, $a0, $zero +/* EDF368 802409A8 AFBF0020 */ sw $ra, 0x20($sp) +/* EDF36C 802409AC AFB20018 */ sw $s2, 0x18($sp) +/* EDF370 802409B0 AFB10014 */ sw $s1, 0x14($sp) +/* EDF374 802409B4 AFB00010 */ sw $s0, 0x10($sp) +/* EDF378 802409B8 8E720148 */ lw $s2, 0x148($s3) +/* EDF37C 802409BC 86440008 */ lh $a0, 8($s2) +/* EDF380 802409C0 0C00F92F */ jal func_8003E4BC +/* EDF384 802409C4 00A0882D */ daddu $s1, $a1, $zero +/* EDF388 802409C8 8E240008 */ lw $a0, 8($s1) +/* EDF38C 802409CC 0040802D */ daddu $s0, $v0, $zero +/* EDF390 802409D0 00041FC2 */ srl $v1, $a0, 0x1f +/* EDF394 802409D4 00832021 */ addu $a0, $a0, $v1 +/* EDF398 802409D8 00042043 */ sra $a0, $a0, 1 +/* EDF39C 802409DC 0C00AB3B */ jal func_8002ACEC +/* EDF3A0 802409E0 24840001 */ addiu $a0, $a0, 1 +/* EDF3A4 802409E4 8E230008 */ lw $v1, 8($s1) +/* EDF3A8 802409E8 240400B4 */ addiu $a0, $zero, 0xb4 +/* EDF3AC 802409EC 00032FC2 */ srl $a1, $v1, 0x1f +/* EDF3B0 802409F0 00651821 */ addu $v1, $v1, $a1 +/* EDF3B4 802409F4 00031843 */ sra $v1, $v1, 1 +/* EDF3B8 802409F8 00621821 */ addu $v1, $v1, $v0 +/* EDF3BC 802409FC 0C00AB3B */ jal func_8002ACEC +/* EDF3C0 80240A00 A603008E */ sh $v1, 0x8e($s0) +/* EDF3C4 80240A04 C60C000C */ lwc1 $f12, 0xc($s0) +/* EDF3C8 80240A08 44820000 */ mtc1 $v0, $f0 +/* EDF3CC 80240A0C 00000000 */ nop +/* EDF3D0 80240A10 46800020 */ cvt.s.w $f0, $f0 +/* EDF3D4 80240A14 46006300 */ add.s $f12, $f12, $f0 +/* EDF3D8 80240A18 3C0142B4 */ lui $at, 0x42b4 +/* EDF3DC 80240A1C 44810000 */ mtc1 $at, $f0 +/* EDF3E0 80240A20 0C00AB85 */ jal func_8002AE14 +/* EDF3E4 80240A24 46006301 */ sub.s $f12, $f12, $f0 +/* EDF3E8 80240A28 E600000C */ swc1 $f0, 0xc($s0) +/* EDF3EC 80240A2C 8E4200CC */ lw $v0, 0xcc($s2) +/* EDF3F0 80240A30 8C420000 */ lw $v0, ($v0) +/* EDF3F4 80240A34 AE020028 */ sw $v0, 0x28($s0) +/* EDF3F8 80240A38 24020003 */ addiu $v0, $zero, 3 +/* EDF3FC 80240A3C AE620070 */ sw $v0, 0x70($s3) +/* EDF400 80240A40 8FBF0020 */ lw $ra, 0x20($sp) +/* EDF404 80240A44 8FB3001C */ lw $s3, 0x1c($sp) +/* EDF408 80240A48 8FB20018 */ lw $s2, 0x18($sp) +/* EDF40C 80240A4C 8FB10014 */ lw $s1, 0x14($sp) +/* EDF410 80240A50 8FB00010 */ lw $s0, 0x10($sp) +/* EDF414 80240A54 03E00008 */ jr $ra +/* EDF418 80240A58 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EDEA00/func_80240A5C_EDF41C.s b/asm/nonmatchings/code_EDEA00/func_80240A5C_EDF41C.s new file mode 100644 index 0000000000..ae92f1f86b --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80240A5C_EDF41C.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A5C_EDF41C +/* EDF41C 80240A5C 27BDFF88 */ addiu $sp, $sp, -0x78 +/* EDF420 80240A60 AFB3004C */ sw $s3, 0x4c($sp) +/* EDF424 80240A64 0080982D */ daddu $s3, $a0, $zero +/* EDF428 80240A68 AFBF0054 */ sw $ra, 0x54($sp) +/* EDF42C 80240A6C AFB40050 */ sw $s4, 0x50($sp) +/* EDF430 80240A70 AFB20048 */ sw $s2, 0x48($sp) +/* EDF434 80240A74 AFB10044 */ sw $s1, 0x44($sp) +/* EDF438 80240A78 AFB00040 */ sw $s0, 0x40($sp) +/* EDF43C 80240A7C F7BA0070 */ sdc1 $f26, 0x70($sp) +/* EDF440 80240A80 F7B80068 */ sdc1 $f24, 0x68($sp) +/* EDF444 80240A84 F7B60060 */ sdc1 $f22, 0x60($sp) +/* EDF448 80240A88 F7B40058 */ sdc1 $f20, 0x58($sp) +/* EDF44C 80240A8C 8E710148 */ lw $s1, 0x148($s3) +/* EDF450 80240A90 00A0902D */ daddu $s2, $a1, $zero +/* EDF454 80240A94 86240008 */ lh $a0, 8($s1) +/* EDF458 80240A98 0C00F92F */ jal func_8003E4BC +/* EDF45C 80240A9C 00C0A02D */ daddu $s4, $a2, $zero +/* EDF460 80240AA0 0040802D */ daddu $s0, $v0, $zero +/* EDF464 80240AA4 C6200078 */ lwc1 $f0, 0x78($s1) +/* EDF468 80240AA8 46800020 */ cvt.s.w $f0, $f0 +/* EDF46C 80240AAC 46000021 */ cvt.d.s $f0, $f0 +/* EDF470 80240AB0 3C014059 */ lui $at, 0x4059 +/* EDF474 80240AB4 44811800 */ mtc1 $at, $f3 +/* EDF478 80240AB8 44801000 */ mtc1 $zero, $f2 +/* EDF47C 80240ABC 8602008E */ lh $v0, 0x8e($s0) +/* EDF480 80240AC0 9603008E */ lhu $v1, 0x8e($s0) +/* EDF484 80240AC4 46220003 */ div.d $f0, $f0, $f2 +/* EDF488 80240AC8 46200620 */ cvt.s.d $f24, $f0 +/* EDF48C 80240ACC C6200088 */ lwc1 $f0, 0x88($s1) +/* EDF490 80240AD0 46800020 */ cvt.s.w $f0, $f0 +/* EDF494 80240AD4 46000021 */ cvt.d.s $f0, $f0 +/* EDF498 80240AD8 46220003 */ div.d $f0, $f0, $f2 +/* EDF49C 80240ADC 46200020 */ cvt.s.d $f0, $f0 +/* EDF4A0 80240AE0 18400003 */ blez $v0, .L80240AF0 +/* EDF4A4 80240AE4 4600C680 */ add.s $f26, $f24, $f0 +/* EDF4A8 80240AE8 2462FFFF */ addiu $v0, $v1, -1 +/* EDF4AC 80240AEC A602008E */ sh $v0, 0x8e($s0) +.L80240AF0: +/* EDF4B0 80240AF0 8E220070 */ lw $v0, 0x70($s1) +/* EDF4B4 80240AF4 18400034 */ blez $v0, .L80240BC8 +/* EDF4B8 80240AF8 00000000 */ nop +/* EDF4BC 80240AFC C62C0074 */ lwc1 $f12, 0x74($s1) +/* EDF4C0 80240B00 46806320 */ cvt.s.w $f12, $f12 +/* EDF4C4 80240B04 44820000 */ mtc1 $v0, $f0 +/* EDF4C8 80240B08 00000000 */ nop +/* EDF4CC 80240B0C 46800020 */ cvt.s.w $f0, $f0 +/* EDF4D0 80240B10 46000021 */ cvt.d.s $f0, $f0 +/* EDF4D4 80240B14 46220003 */ div.d $f0, $f0, $f2 +/* EDF4D8 80240B18 0C00AD77 */ jal func_8002B5DC +/* EDF4DC 80240B1C 462005A0 */ cvt.s.d $f22, $f0 +/* EDF4E0 80240B20 8E020000 */ lw $v0, ($s0) +/* EDF4E4 80240B24 30420008 */ andi $v0, $v0, 8 +/* EDF4E8 80240B28 10400003 */ beqz $v0, .L80240B38 +/* EDF4EC 80240B2C 46000506 */ mov.s $f20, $f0 +/* EDF4F0 80240B30 080902DE */ j .L80240B78 +/* EDF4F4 80240B34 0000102D */ daddu $v0, $zero, $zero +.L80240B38: +/* EDF4F8 80240B38 27A50028 */ addiu $a1, $sp, 0x28 +/* EDF4FC 80240B3C 27A6002C */ addiu $a2, $sp, 0x2c +/* EDF500 80240B40 C6000038 */ lwc1 $f0, 0x38($s0) +/* EDF504 80240B44 C602003C */ lwc1 $f2, 0x3c($s0) +/* EDF508 80240B48 C6040040 */ lwc1 $f4, 0x40($s0) +/* EDF50C 80240B4C 3C01447A */ lui $at, 0x447a +/* EDF510 80240B50 44813000 */ mtc1 $at, $f6 +/* EDF514 80240B54 27A20034 */ addiu $v0, $sp, 0x34 +/* EDF518 80240B58 E7A00028 */ swc1 $f0, 0x28($sp) +/* EDF51C 80240B5C E7A2002C */ swc1 $f2, 0x2c($sp) +/* EDF520 80240B60 E7A40030 */ swc1 $f4, 0x30($sp) +/* EDF524 80240B64 E7A60034 */ swc1 $f6, 0x34($sp) +/* EDF528 80240B68 AFA20010 */ sw $v0, 0x10($sp) +/* EDF52C 80240B6C 8E040080 */ lw $a0, 0x80($s0) +/* EDF530 80240B70 0C03908F */ jal func_800E423C +/* EDF534 80240B74 27A70030 */ addiu $a3, $sp, 0x30 +.L80240B78: +/* EDF538 80240B78 10400007 */ beqz $v0, .L80240B98 +/* EDF53C 80240B7C 00000000 */ nop +/* EDF540 80240B80 4616A082 */ mul.s $f2, $f20, $f22 +/* EDF544 80240B84 00000000 */ nop +/* EDF548 80240B88 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EDF54C 80240B8C 46180000 */ add.s $f0, $f0, $f24 +/* EDF550 80240B90 080902E9 */ j .L80240BA4 +/* EDF554 80240B94 46020000 */ add.s $f0, $f0, $f2 +.L80240B98: +/* EDF558 80240B98 4616A002 */ mul.s $f0, $f20, $f22 +/* EDF55C 80240B9C 00000000 */ nop +/* EDF560 80240BA0 4600D000 */ add.s $f0, $f26, $f0 +.L80240BA4: +/* EDF564 80240BA4 E600003C */ swc1 $f0, 0x3c($s0) +/* EDF568 80240BA8 8E220074 */ lw $v0, 0x74($s1) +/* EDF56C 80240BAC 2442000A */ addiu $v0, $v0, 0xa +/* EDF570 80240BB0 44826000 */ mtc1 $v0, $f12 +/* EDF574 80240BB4 00000000 */ nop +/* EDF578 80240BB8 0C00AB85 */ jal func_8002AE14 +/* EDF57C 80240BBC 46806320 */ cvt.s.w $f12, $f12 +/* EDF580 80240BC0 4600020D */ trunc.w.s $f8, $f0 +/* EDF584 80240BC4 E6280074 */ swc1 $f8, 0x74($s1) +.L80240BC8: +/* EDF588 80240BC8 8E220090 */ lw $v0, 0x90($s1) +/* EDF58C 80240BCC 1C400040 */ bgtz $v0, .L80240CD0 +/* EDF590 80240BD0 2442FFFF */ addiu $v0, $v0, -1 +/* EDF594 80240BD4 860200A8 */ lh $v0, 0xa8($s0) +/* EDF598 80240BD8 C600003C */ lwc1 $f0, 0x3c($s0) +/* EDF59C 80240BDC 44821000 */ mtc1 $v0, $f2 +/* EDF5A0 80240BE0 00000000 */ nop +/* EDF5A4 80240BE4 468010A0 */ cvt.s.w $f2, $f2 +/* EDF5A8 80240BE8 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EDF5AC 80240BEC 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EDF5B0 80240BF0 46020000 */ add.s $f0, $f0, $f2 +/* EDF5B4 80240BF4 3C014024 */ lui $at, 0x4024 +/* EDF5B8 80240BF8 44812800 */ mtc1 $at, $f5 +/* EDF5BC 80240BFC 44802000 */ mtc1 $zero, $f4 +/* EDF5C0 80240C00 C442002C */ lwc1 $f2, 0x2c($v0) +/* EDF5C4 80240C04 46000021 */ cvt.d.s $f0, $f0 +/* EDF5C8 80240C08 46240000 */ add.d $f0, $f0, $f4 +/* EDF5CC 80240C0C 460010A1 */ cvt.d.s $f2, $f2 +/* EDF5D0 80240C10 4620103C */ c.lt.d $f2, $f0 +/* EDF5D4 80240C14 00000000 */ nop +/* EDF5D8 80240C18 4500002E */ bc1f .L80240CD4 +/* EDF5DC 80240C1C 0280202D */ daddu $a0, $s4, $zero +/* EDF5E0 80240C20 24020001 */ addiu $v0, $zero, 1 +/* EDF5E4 80240C24 AFA20010 */ sw $v0, 0x10($sp) +/* EDF5E8 80240C28 8E460024 */ lw $a2, 0x24($s2) +/* EDF5EC 80240C2C 8E470028 */ lw $a3, 0x28($s2) +/* EDF5F0 80240C30 0C013469 */ jal func_8004D1A4 +/* EDF5F4 80240C34 0220282D */ daddu $a1, $s1, $zero +/* EDF5F8 80240C38 10400026 */ beqz $v0, .L80240CD4 +/* EDF5FC 80240C3C 0000202D */ daddu $a0, $zero, $zero +/* EDF600 80240C40 0200282D */ daddu $a1, $s0, $zero +/* EDF604 80240C44 0000302D */ daddu $a2, $zero, $zero +/* EDF608 80240C48 2412000C */ addiu $s2, $zero, 0xc +/* EDF60C 80240C4C 860300A8 */ lh $v1, 0xa8($s0) +/* EDF610 80240C50 3C013F80 */ lui $at, 0x3f80 +/* EDF614 80240C54 44810000 */ mtc1 $at, $f0 +/* EDF618 80240C58 3C014000 */ lui $at, 0x4000 +/* EDF61C 80240C5C 44811000 */ mtc1 $at, $f2 +/* EDF620 80240C60 3C01C1A0 */ lui $at, 0xc1a0 +/* EDF624 80240C64 44812000 */ mtc1 $at, $f4 +/* EDF628 80240C68 44834000 */ mtc1 $v1, $f8 +/* EDF62C 80240C6C 00000000 */ nop +/* EDF630 80240C70 46804220 */ cvt.s.w $f8, $f8 +/* EDF634 80240C74 44074000 */ mfc1 $a3, $f8 +/* EDF638 80240C78 27A20038 */ addiu $v0, $sp, 0x38 +/* EDF63C 80240C7C AFB2001C */ sw $s2, 0x1c($sp) +/* EDF640 80240C80 AFA20020 */ sw $v0, 0x20($sp) +/* EDF644 80240C84 E7A00010 */ swc1 $f0, 0x10($sp) +/* EDF648 80240C88 E7A20014 */ swc1 $f2, 0x14($sp) +/* EDF64C 80240C8C 0C01D444 */ jal func_80075110 +/* EDF650 80240C90 E7A40018 */ swc1 $f4, 0x18($sp) +/* EDF654 80240C94 0200202D */ daddu $a0, $s0, $zero +/* EDF658 80240C98 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EDF65C 80240C9C C480003C */ lwc1 $f0, 0x3c($a0) +/* EDF660 80240CA0 3C060020 */ lui $a2, 0x20 +/* EDF664 80240CA4 0C013600 */ jal func_8004D800 +/* EDF668 80240CA8 E4800064 */ swc1 $f0, 0x64($a0) +/* EDF66C 80240CAC 8E220018 */ lw $v0, 0x18($s1) +/* EDF670 80240CB0 9442002A */ lhu $v0, 0x2a($v0) +/* EDF674 80240CB4 30420001 */ andi $v0, $v0, 1 +/* EDF678 80240CB8 10400003 */ beqz $v0, .L80240CC8 +/* EDF67C 80240CBC 2402000A */ addiu $v0, $zero, 0xa +/* EDF680 80240CC0 0809035C */ j .L80240D70 +/* EDF684 80240CC4 AE620070 */ sw $v0, 0x70($s3) +.L80240CC8: +/* EDF688 80240CC8 0809035C */ j .L80240D70 +/* EDF68C 80240CCC AE720070 */ sw $s2, 0x70($s3) +.L80240CD0: +/* EDF690 80240CD0 AE220090 */ sw $v0, 0x90($s1) +.L80240CD4: +/* EDF694 80240CD4 8602008C */ lh $v0, 0x8c($s0) +/* EDF698 80240CD8 14400025 */ bnez $v0, .L80240D70 +/* EDF69C 80240CDC 00000000 */ nop +/* EDF6A0 80240CE0 8602008E */ lh $v0, 0x8e($s0) +/* EDF6A4 80240CE4 1C400022 */ bgtz $v0, .L80240D70 +/* EDF6A8 80240CE8 00000000 */ nop +/* EDF6AC 80240CEC 8E620074 */ lw $v0, 0x74($s3) +/* EDF6B0 80240CF0 2442FFFF */ addiu $v0, $v0, -1 +/* EDF6B4 80240CF4 1840001D */ blez $v0, .L80240D6C +/* EDF6B8 80240CF8 AE620074 */ sw $v0, 0x74($s3) +/* EDF6BC 80240CFC 8E220018 */ lw $v0, 0x18($s1) +/* EDF6C0 80240D00 9442002A */ lhu $v0, 0x2a($v0) +/* EDF6C4 80240D04 30420010 */ andi $v0, $v0, 0x10 +/* EDF6C8 80240D08 14400007 */ bnez $v0, .L80240D28 +/* EDF6CC 80240D0C 00000000 */ nop +/* EDF6D0 80240D10 C600000C */ lwc1 $f0, 0xc($s0) +/* EDF6D4 80240D14 3C014334 */ lui $at, 0x4334 +/* EDF6D8 80240D18 44816000 */ mtc1 $at, $f12 +/* EDF6DC 80240D1C 0C00AB85 */ jal func_8002AE14 +/* EDF6E0 80240D20 460C0300 */ add.s $f12, $f0, $f12 +/* EDF6E4 80240D24 E600000C */ swc1 $f0, 0xc($s0) +.L80240D28: +/* EDF6E8 80240D28 0C00AB3B */ jal func_8002ACEC +/* EDF6EC 80240D2C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EDF6F0 80240D30 3C032E8B */ lui $v1, 0x2e8b +/* EDF6F4 80240D34 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* EDF6F8 80240D38 00430018 */ mult $v0, $v1 +/* EDF6FC 80240D3C 00021FC3 */ sra $v1, $v0, 0x1f +/* EDF700 80240D40 00004010 */ mfhi $t0 +/* EDF704 80240D44 00082043 */ sra $a0, $t0, 1 +/* EDF708 80240D48 00832023 */ subu $a0, $a0, $v1 +/* EDF70C 80240D4C 00041840 */ sll $v1, $a0, 1 +/* EDF710 80240D50 00641821 */ addu $v1, $v1, $a0 +/* EDF714 80240D54 00031880 */ sll $v1, $v1, 2 +/* EDF718 80240D58 00641823 */ subu $v1, $v1, $a0 +/* EDF71C 80240D5C 00431023 */ subu $v0, $v0, $v1 +/* EDF720 80240D60 24420005 */ addiu $v0, $v0, 5 +/* EDF724 80240D64 0809035C */ j .L80240D70 +/* EDF728 80240D68 A602008E */ sh $v0, 0x8e($s0) +.L80240D6C: +/* EDF72C 80240D6C AE600070 */ sw $zero, 0x70($s3) +.L80240D70: +/* EDF730 80240D70 8FBF0054 */ lw $ra, 0x54($sp) +/* EDF734 80240D74 8FB40050 */ lw $s4, 0x50($sp) +/* EDF738 80240D78 8FB3004C */ lw $s3, 0x4c($sp) +/* EDF73C 80240D7C 8FB20048 */ lw $s2, 0x48($sp) +/* EDF740 80240D80 8FB10044 */ lw $s1, 0x44($sp) +/* EDF744 80240D84 8FB00040 */ lw $s0, 0x40($sp) +/* EDF748 80240D88 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* EDF74C 80240D8C D7B80068 */ ldc1 $f24, 0x68($sp) +/* EDF750 80240D90 D7B60060 */ ldc1 $f22, 0x60($sp) +/* EDF754 80240D94 D7B40058 */ ldc1 $f20, 0x58($sp) +/* EDF758 80240D98 03E00008 */ jr $ra +/* EDF75C 80240D9C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/code_EDEA00/func_80240DA0_EDF760.s b/asm/nonmatchings/code_EDEA00/func_80240DA0_EDF760.s new file mode 100644 index 0000000000..ab0541f01a --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80240DA0_EDF760.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DA0_EDF760 +/* EDF760 80240DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EDF764 80240DA4 AFB20018 */ sw $s2, 0x18($sp) +/* EDF768 80240DA8 0080902D */ daddu $s2, $a0, $zero +/* EDF76C 80240DAC AFBF001C */ sw $ra, 0x1c($sp) +/* EDF770 80240DB0 AFB10014 */ sw $s1, 0x14($sp) +/* EDF774 80240DB4 AFB00010 */ sw $s0, 0x10($sp) +/* EDF778 80240DB8 8E510148 */ lw $s1, 0x148($s2) +/* EDF77C 80240DBC 0C00F92F */ jal func_8003E4BC +/* EDF780 80240DC0 86240008 */ lh $a0, 8($s1) +/* EDF784 80240DC4 0040802D */ daddu $s0, $v0, $zero +/* EDF788 80240DC8 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EDF78C 80240DCC 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EDF790 80240DD0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EDF794 80240DD4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EDF798 80240DD8 A600008E */ sh $zero, 0x8e($s0) +/* EDF79C 80240DDC 8C460028 */ lw $a2, 0x28($v0) +/* EDF7A0 80240DE0 0C00ABDC */ jal fio_validate_header_checksums +/* EDF7A4 80240DE4 8C470030 */ lw $a3, 0x30($v0) +/* EDF7A8 80240DE8 E600000C */ swc1 $f0, 0xc($s0) +/* EDF7AC 80240DEC 8E2200CC */ lw $v0, 0xcc($s1) +/* EDF7B0 80240DF0 8C420020 */ lw $v0, 0x20($v0) +/* EDF7B4 80240DF4 AE020028 */ sw $v0, 0x28($s0) +/* EDF7B8 80240DF8 2402000B */ addiu $v0, $zero, 0xb +/* EDF7BC 80240DFC AE420070 */ sw $v0, 0x70($s2) +/* EDF7C0 80240E00 8FBF001C */ lw $ra, 0x1c($sp) +/* EDF7C4 80240E04 8FB20018 */ lw $s2, 0x18($sp) +/* EDF7C8 80240E08 8FB10014 */ lw $s1, 0x14($sp) +/* EDF7CC 80240E0C 8FB00010 */ lw $s0, 0x10($sp) +/* EDF7D0 80240E10 03E00008 */ jr $ra +/* EDF7D4 80240E14 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EDEA00/func_80240E18_EDF7D8.s b/asm/nonmatchings/code_EDEA00/func_80240E18_EDF7D8.s new file mode 100644 index 0000000000..18d2b9ca22 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80240E18_EDF7D8.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E18_EDF7D8 +/* EDF7D8 80240E18 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EDF7DC 80240E1C AFB00010 */ sw $s0, 0x10($sp) +/* EDF7E0 80240E20 0080802D */ daddu $s0, $a0, $zero +/* EDF7E4 80240E24 AFBF0014 */ sw $ra, 0x14($sp) +/* EDF7E8 80240E28 8E020148 */ lw $v0, 0x148($s0) +/* EDF7EC 80240E2C 0C00F92F */ jal func_8003E4BC +/* EDF7F0 80240E30 84440008 */ lh $a0, 8($v0) +/* EDF7F4 80240E34 9443008E */ lhu $v1, 0x8e($v0) +/* EDF7F8 80240E38 C440003C */ lwc1 $f0, 0x3c($v0) +/* EDF7FC 80240E3C 24640001 */ addiu $a0, $v1, 1 +/* EDF800 80240E40 00031C00 */ sll $v1, $v1, 0x10 +/* EDF804 80240E44 00031B83 */ sra $v1, $v1, 0xe +/* EDF808 80240E48 A444008E */ sh $a0, 0x8e($v0) +/* EDF80C 80240E4C 3C018024 */ lui $at, %hi(D_802441DC) +/* EDF810 80240E50 00230821 */ addu $at, $at, $v1 +/* EDF814 80240E54 C42241DC */ lwc1 $f2, %lo(D_802441DC)($at) +/* EDF818 80240E58 8443008E */ lh $v1, 0x8e($v0) +/* EDF81C 80240E5C 46020000 */ add.s $f0, $f0, $f2 +/* EDF820 80240E60 28630005 */ slti $v1, $v1, 5 +/* EDF824 80240E64 14600003 */ bnez $v1, .L80240E74 +/* EDF828 80240E68 E440003C */ swc1 $f0, 0x3c($v0) +/* EDF82C 80240E6C 2402000C */ addiu $v0, $zero, 0xc +/* EDF830 80240E70 AE020070 */ sw $v0, 0x70($s0) +.L80240E74: +/* EDF834 80240E74 8FBF0014 */ lw $ra, 0x14($sp) +/* EDF838 80240E78 8FB00010 */ lw $s0, 0x10($sp) +/* EDF83C 80240E7C 03E00008 */ jr $ra +/* EDF840 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s b/asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s new file mode 100644 index 0000000000..51b96df34a --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80240E84_EDF844.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E84_EDF844 +/* EDF844 80240E84 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EDF848 80240E88 AFB3001C */ sw $s3, 0x1c($sp) +/* EDF84C 80240E8C 0080982D */ daddu $s3, $a0, $zero +/* EDF850 80240E90 AFBF0020 */ sw $ra, 0x20($sp) +/* EDF854 80240E94 AFB20018 */ sw $s2, 0x18($sp) +/* EDF858 80240E98 AFB10014 */ sw $s1, 0x14($sp) +/* EDF85C 80240E9C AFB00010 */ sw $s0, 0x10($sp) +/* EDF860 80240EA0 8E720148 */ lw $s2, 0x148($s3) +/* EDF864 80240EA4 86440008 */ lh $a0, 8($s2) +/* EDF868 80240EA8 0C00F92F */ jal func_8003E4BC +/* EDF86C 80240EAC 00A0802D */ daddu $s0, $a1, $zero +/* EDF870 80240EB0 0040882D */ daddu $s1, $v0, $zero +/* EDF874 80240EB4 C6420080 */ lwc1 $f2, 0x80($s2) +/* EDF878 80240EB8 468010A0 */ cvt.s.w $f2, $f2 +/* EDF87C 80240EBC 460010A1 */ cvt.d.s $f2, $f2 +/* EDF880 80240EC0 C6400084 */ lwc1 $f0, 0x84($s2) +/* EDF884 80240EC4 46800020 */ cvt.s.w $f0, $f0 +/* EDF888 80240EC8 46000021 */ cvt.d.s $f0, $f0 +/* EDF88C 80240ECC 3C014059 */ lui $at, 0x4059 +/* EDF890 80240ED0 44812800 */ mtc1 $at, $f5 +/* EDF894 80240ED4 44802000 */ mtc1 $zero, $f4 +/* EDF898 80240ED8 8E4200CC */ lw $v0, 0xcc($s2) +/* EDF89C 80240EDC C62C0038 */ lwc1 $f12, 0x38($s1) +/* EDF8A0 80240EE0 C62E0040 */ lwc1 $f14, 0x40($s1) +/* EDF8A4 80240EE4 46241083 */ div.d $f2, $f2, $f4 +/* EDF8A8 80240EE8 462010A0 */ cvt.s.d $f2, $f2 +/* EDF8AC 80240EEC 46240003 */ div.d $f0, $f0, $f4 +/* EDF8B0 80240EF0 8C420020 */ lw $v0, 0x20($v0) +/* EDF8B4 80240EF4 46200020 */ cvt.s.d $f0, $f0 +/* EDF8B8 80240EF8 E622001C */ swc1 $f2, 0x1c($s1) +/* EDF8BC 80240EFC E6200014 */ swc1 $f0, 0x14($s1) +/* EDF8C0 80240F00 AE220028 */ sw $v0, 0x28($s1) +/* EDF8C4 80240F04 C6000018 */ lwc1 $f0, 0x18($s0) +/* EDF8C8 80240F08 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EDF8CC 80240F0C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EDF8D0 80240F10 E6200018 */ swc1 $f0, 0x18($s1) +/* EDF8D4 80240F14 8C460028 */ lw $a2, 0x28($v0) +/* EDF8D8 80240F18 0C00ABDC */ jal fio_validate_header_checksums +/* EDF8DC 80240F1C 8C470030 */ lw $a3, 0x30($v0) +/* EDF8E0 80240F20 E620000C */ swc1 $f0, 0xc($s1) +/* EDF8E4 80240F24 8E420018 */ lw $v0, 0x18($s2) +/* EDF8E8 80240F28 AE400074 */ sw $zero, 0x74($s2) +/* EDF8EC 80240F2C 9442002A */ lhu $v0, 0x2a($v0) +/* EDF8F0 80240F30 30420002 */ andi $v0, $v0, 2 +/* EDF8F4 80240F34 10400005 */ beqz $v0, .L80240F4C +/* EDF8F8 80240F38 24020003 */ addiu $v0, $zero, 3 +/* EDF8FC 80240F3C A622008E */ sh $v0, 0x8e($s1) +/* EDF900 80240F40 2402000D */ addiu $v0, $zero, 0xd +/* EDF904 80240F44 080903E7 */ j .L80240F9C +/* EDF908 80240F48 AE620070 */ sw $v0, 0x70($s3) +.L80240F4C: +/* EDF90C 80240F4C 24030001 */ addiu $v1, $zero, 1 +/* EDF910 80240F50 2402000E */ addiu $v0, $zero, 0xe +/* EDF914 80240F54 A623008E */ sh $v1, 0x8e($s1) +/* EDF918 80240F58 AE620070 */ sw $v0, 0x70($s3) +/* EDF91C 80240F5C C6200038 */ lwc1 $f0, 0x38($s1) +/* EDF920 80240F60 4600018D */ trunc.w.s $f6, $f0 +/* EDF924 80240F64 44023000 */ mfc1 $v0, $f6 +/* EDF928 80240F68 00000000 */ nop +/* EDF92C 80240F6C A6420010 */ sh $v0, 0x10($s2) +/* EDF930 80240F70 C620003C */ lwc1 $f0, 0x3c($s1) +/* EDF934 80240F74 4600018D */ trunc.w.s $f6, $f0 +/* EDF938 80240F78 44023000 */ mfc1 $v0, $f6 +/* EDF93C 80240F7C 00000000 */ nop +/* EDF940 80240F80 A6420012 */ sh $v0, 0x12($s2) +/* EDF944 80240F84 C6200040 */ lwc1 $f0, 0x40($s1) +/* EDF948 80240F88 A2430007 */ sb $v1, 7($s2) +/* EDF94C 80240F8C 4600018D */ trunc.w.s $f6, $f0 +/* EDF950 80240F90 44023000 */ mfc1 $v0, $f6 +/* EDF954 80240F94 00000000 */ nop +/* EDF958 80240F98 A6420014 */ sh $v0, 0x14($s2) +.L80240F9C: +/* EDF95C 80240F9C 8FBF0020 */ lw $ra, 0x20($sp) +/* EDF960 80240FA0 8FB3001C */ lw $s3, 0x1c($sp) +/* EDF964 80240FA4 8FB20018 */ lw $s2, 0x18($sp) +/* EDF968 80240FA8 8FB10014 */ lw $s1, 0x14($sp) +/* EDF96C 80240FAC 8FB00010 */ lw $s0, 0x10($sp) +/* EDF970 80240FB0 03E00008 */ jr $ra +/* EDF974 80240FB4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EDEA00/func_80240FB8_EDF978.s b/asm/nonmatchings/code_EDEA00/func_80240FB8_EDF978.s new file mode 100644 index 0000000000..714e169976 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80240FB8_EDF978.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FB8_EDF978 +/* EDF978 80240FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EDF97C 80240FBC AFB00010 */ sw $s0, 0x10($sp) +/* EDF980 80240FC0 0080802D */ daddu $s0, $a0, $zero +/* EDF984 80240FC4 AFBF0014 */ sw $ra, 0x14($sp) +/* EDF988 80240FC8 8E020148 */ lw $v0, 0x148($s0) +/* EDF98C 80240FCC 0C00F92F */ jal func_8003E4BC +/* EDF990 80240FD0 84440008 */ lh $a0, 8($v0) +/* EDF994 80240FD4 0040202D */ daddu $a0, $v0, $zero +/* EDF998 80240FD8 8482008E */ lh $v0, 0x8e($a0) +/* EDF99C 80240FDC 9483008E */ lhu $v1, 0x8e($a0) +/* EDF9A0 80240FE0 18400005 */ blez $v0, .L80240FF8 +/* EDF9A4 80240FE4 2462FFFF */ addiu $v0, $v1, -1 +/* EDF9A8 80240FE8 A482008E */ sh $v0, 0x8e($a0) +/* EDF9AC 80240FEC 00021400 */ sll $v0, $v0, 0x10 +/* EDF9B0 80240FF0 1C400006 */ bgtz $v0, .L8024100C +/* EDF9B4 80240FF4 00000000 */ nop +.L80240FF8: +/* EDF9B8 80240FF8 8482008C */ lh $v0, 0x8c($a0) +/* EDF9BC 80240FFC 14400003 */ bnez $v0, .L8024100C +/* EDF9C0 80241000 2402000E */ addiu $v0, $zero, 0xe +/* EDF9C4 80241004 A480008E */ sh $zero, 0x8e($a0) +/* EDF9C8 80241008 AE020070 */ sw $v0, 0x70($s0) +.L8024100C: +/* EDF9CC 8024100C 8FBF0014 */ lw $ra, 0x14($sp) +/* EDF9D0 80241010 8FB00010 */ lw $s0, 0x10($sp) +/* EDF9D4 80241014 03E00008 */ jr $ra +/* EDF9D8 80241018 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EDEA00/func_8024101C_EDF9DC.s b/asm/nonmatchings/code_EDEA00/func_8024101C_EDF9DC.s new file mode 100644 index 0000000000..5a3e63d4d3 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_8024101C_EDF9DC.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024101C_EDF9DC +/* EDF9DC 8024101C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EDF9E0 80241020 AFB20030 */ sw $s2, 0x30($sp) +/* EDF9E4 80241024 0080902D */ daddu $s2, $a0, $zero +/* EDF9E8 80241028 AFBF0038 */ sw $ra, 0x38($sp) +/* EDF9EC 8024102C AFB30034 */ sw $s3, 0x34($sp) +/* EDF9F0 80241030 AFB1002C */ sw $s1, 0x2c($sp) +/* EDF9F4 80241034 AFB00028 */ sw $s0, 0x28($sp) +/* EDF9F8 80241038 F7B60048 */ sdc1 $f22, 0x48($sp) +/* EDF9FC 8024103C F7B40040 */ sdc1 $f20, 0x40($sp) +/* EDFA00 80241040 8E510148 */ lw $s1, 0x148($s2) +/* EDFA04 80241044 86240008 */ lh $a0, 8($s1) +/* EDFA08 80241048 0C00F92F */ jal func_8003E4BC +/* EDFA0C 8024104C 00A0982D */ daddu $s3, $a1, $zero +/* EDFA10 80241050 0040802D */ daddu $s0, $v0, $zero +/* EDFA14 80241054 0200202D */ daddu $a0, $s0, $zero +/* EDFA18 80241058 C6220088 */ lwc1 $f2, 0x88($s1) +/* EDFA1C 8024105C 468010A0 */ cvt.s.w $f2, $f2 +/* EDFA20 80241060 460010A1 */ cvt.d.s $f2, $f2 +/* EDFA24 80241064 C604001C */ lwc1 $f4, 0x1c($s0) +/* EDFA28 80241068 C6000014 */ lwc1 $f0, 0x14($s0) +/* EDFA2C 8024106C 8E050018 */ lw $a1, 0x18($s0) +/* EDFA30 80241070 46002100 */ add.s $f4, $f4, $f0 +/* EDFA34 80241074 8E06000C */ lw $a2, 0xc($s0) +/* EDFA38 80241078 C6200078 */ lwc1 $f0, 0x78($s1) +/* EDFA3C 8024107C 46800020 */ cvt.s.w $f0, $f0 +/* EDFA40 80241080 E604001C */ swc1 $f4, 0x1c($s0) +/* EDFA44 80241084 3C014059 */ lui $at, 0x4059 +/* EDFA48 80241088 44812800 */ mtc1 $at, $f5 +/* EDFA4C 8024108C 44802000 */ mtc1 $zero, $f4 +/* EDFA50 80241090 46000021 */ cvt.d.s $f0, $f0 +/* EDFA54 80241094 46240003 */ div.d $f0, $f0, $f4 +/* EDFA58 80241098 46200520 */ cvt.s.d $f20, $f0 +/* EDFA5C 8024109C 46241083 */ div.d $f2, $f2, $f4 +/* EDFA60 802410A0 0C00F909 */ jal func_8003E424 +/* EDFA64 802410A4 462015A0 */ cvt.s.d $f22, $f2 +/* EDFA68 802410A8 C604001C */ lwc1 $f4, 0x1c($s0) +/* EDFA6C 802410AC 44801000 */ mtc1 $zero, $f2 +/* EDFA70 802410B0 44801800 */ mtc1 $zero, $f3 +/* EDFA74 802410B4 46002021 */ cvt.d.s $f0, $f4 +/* EDFA78 802410B8 4620103E */ c.le.d $f2, $f0 +/* EDFA7C 802410BC 00000000 */ nop +/* EDFA80 802410C0 45000030 */ bc1f .L80241184 +/* EDFA84 802410C4 00000000 */ nop +/* EDFA88 802410C8 C600003C */ lwc1 $f0, 0x3c($s0) +/* EDFA8C 802410CC 46040000 */ add.s $f0, $f0, $f4 +/* EDFA90 802410D0 E600003C */ swc1 $f0, 0x3c($s0) +/* EDFA94 802410D4 8E2200CC */ lw $v0, 0xcc($s1) +/* EDFA98 802410D8 8C420024 */ lw $v0, 0x24($v0) +/* EDFA9C 802410DC AE020028 */ sw $v0, 0x28($s0) +/* EDFAA0 802410E0 A2200007 */ sb $zero, 7($s1) +/* EDFAA4 802410E4 8E020000 */ lw $v0, ($s0) +/* EDFAA8 802410E8 30420008 */ andi $v0, $v0, 8 +/* EDFAAC 802410EC 14400011 */ bnez $v0, .L80241134 +/* EDFAB0 802410F0 0000102D */ daddu $v0, $zero, $zero +/* EDFAB4 802410F4 27A50018 */ addiu $a1, $sp, 0x18 +/* EDFAB8 802410F8 27A6001C */ addiu $a2, $sp, 0x1c +/* EDFABC 802410FC C6000038 */ lwc1 $f0, 0x38($s0) +/* EDFAC0 80241100 C602003C */ lwc1 $f2, 0x3c($s0) +/* EDFAC4 80241104 C6040040 */ lwc1 $f4, 0x40($s0) +/* EDFAC8 80241108 3C01447A */ lui $at, 0x447a +/* EDFACC 8024110C 44813000 */ mtc1 $at, $f6 +/* EDFAD0 80241110 27A20024 */ addiu $v0, $sp, 0x24 +/* EDFAD4 80241114 E7A00018 */ swc1 $f0, 0x18($sp) +/* EDFAD8 80241118 E7A2001C */ swc1 $f2, 0x1c($sp) +/* EDFADC 8024111C E7A40020 */ swc1 $f4, 0x20($sp) +/* EDFAE0 80241120 E7A60024 */ swc1 $f6, 0x24($sp) +/* EDFAE4 80241124 AFA20010 */ sw $v0, 0x10($sp) +/* EDFAE8 80241128 8E040080 */ lw $a0, 0x80($s0) +/* EDFAEC 8024112C 0C03908F */ jal func_800E423C +/* EDFAF0 80241130 27A70020 */ addiu $a3, $sp, 0x20 +.L80241134: +/* EDFAF4 80241134 1040000B */ beqz $v0, .L80241164 +/* EDFAF8 80241138 00000000 */ nop +/* EDFAFC 8024113C C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EDFB00 80241140 46140080 */ add.s $f2, $f0, $f20 +/* EDFB04 80241144 C600003C */ lwc1 $f0, 0x3c($s0) +/* EDFB08 80241148 4600103E */ c.le.s $f2, $f0 +/* EDFB0C 8024114C 00000000 */ nop +/* EDFB10 80241150 4500008D */ bc1f .L80241388 +/* EDFB14 80241154 00000000 */ nop +/* EDFB18 80241158 E602003C */ swc1 $f2, 0x3c($s0) +/* EDFB1C 8024115C 080904E2 */ j .L80241388 +/* EDFB20 80241160 AE400070 */ sw $zero, 0x70($s2) +.L80241164: +/* EDFB24 80241164 C602003C */ lwc1 $f2, 0x3c($s0) +/* EDFB28 80241168 C6000064 */ lwc1 $f0, 0x64($s0) +/* EDFB2C 8024116C 4602003E */ c.le.s $f0, $f2 +/* EDFB30 80241170 00000000 */ nop +/* EDFB34 80241174 45030084 */ bc1tl .L80241388 +/* EDFB38 80241178 AE400070 */ sw $zero, 0x70($s2) +/* EDFB3C 8024117C 080904E2 */ j .L80241388 +/* EDFB40 80241180 00000000 */ nop +.L80241184: +/* EDFB44 80241184 4622003C */ c.lt.d $f0, $f2 +/* EDFB48 80241188 00000000 */ nop +/* EDFB4C 8024118C 4500007E */ bc1f .L80241388 +/* EDFB50 80241190 00000000 */ nop +/* EDFB54 80241194 9602008E */ lhu $v0, 0x8e($s0) +/* EDFB58 80241198 24420001 */ addiu $v0, $v0, 1 +/* EDFB5C 8024119C A602008E */ sh $v0, 0x8e($s0) +/* EDFB60 802411A0 00021400 */ sll $v0, $v0, 0x10 +/* EDFB64 802411A4 8E630020 */ lw $v1, 0x20($s3) +/* EDFB68 802411A8 00021403 */ sra $v0, $v0, 0x10 +/* EDFB6C 802411AC 0043102A */ slt $v0, $v0, $v1 +/* EDFB70 802411B0 14400026 */ bnez $v0, .L8024124C +/* EDFB74 802411B4 00000000 */ nop +/* EDFB78 802411B8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EDFB7C 802411BC C60E0040 */ lwc1 $f14, 0x40($s0) +/* EDFB80 802411C0 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EDFB84 802411C4 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EDFB88 802411C8 A600008E */ sh $zero, 0x8e($s0) +/* EDFB8C 802411CC 8C460028 */ lw $a2, 0x28($v0) +/* EDFB90 802411D0 0C00ABDC */ jal fio_validate_header_checksums +/* EDFB94 802411D4 8C470030 */ lw $a3, 0x30($v0) +/* EDFB98 802411D8 46000506 */ mov.s $f20, $f0 +/* EDFB9C 802411DC C60C000C */ lwc1 $f12, 0xc($s0) +/* EDFBA0 802411E0 0C00ABC6 */ jal func_8002AF18 +/* EDFBA4 802411E4 4600A386 */ mov.s $f14, $f20 +/* EDFBA8 802411E8 46000086 */ mov.s $f2, $f0 +/* EDFBAC 802411EC 8E62001C */ lw $v0, 0x1c($s3) +/* EDFBB0 802411F0 46001005 */ abs.s $f0, $f2 +/* EDFBB4 802411F4 44822000 */ mtc1 $v0, $f4 +/* EDFBB8 802411F8 00000000 */ nop +/* EDFBBC 802411FC 46802120 */ cvt.s.w $f4, $f4 +/* EDFBC0 80241200 4600203C */ c.lt.s $f4, $f0 +/* EDFBC4 80241204 00000000 */ nop +/* EDFBC8 80241208 4500000D */ bc1f .L80241240 +/* EDFBCC 8024120C 00000000 */ nop +/* EDFBD0 80241210 44800000 */ mtc1 $zero, $f0 +/* EDFBD4 80241214 C614000C */ lwc1 $f20, 0xc($s0) +/* EDFBD8 80241218 4600103C */ c.lt.s $f2, $f0 +/* EDFBDC 8024121C 00000000 */ nop +/* EDFBE0 80241220 45000006 */ bc1f .L8024123C +/* EDFBE4 80241224 00021023 */ negu $v0, $v0 +/* EDFBE8 80241228 44820000 */ mtc1 $v0, $f0 +/* EDFBEC 8024122C 00000000 */ nop +/* EDFBF0 80241230 46800020 */ cvt.s.w $f0, $f0 +/* EDFBF4 80241234 08090490 */ j .L80241240 +/* EDFBF8 80241238 4600A500 */ add.s $f20, $f20, $f0 +.L8024123C: +/* EDFBFC 8024123C 4604A500 */ add.s $f20, $f20, $f4 +.L80241240: +/* EDFC00 80241240 0C00AB85 */ jal func_8002AE14 +/* EDFC04 80241244 4600A306 */ mov.s $f12, $f20 +/* EDFC08 80241248 E600000C */ swc1 $f0, 0xc($s0) +.L8024124C: +/* EDFC0C 8024124C 8E020000 */ lw $v0, ($s0) +/* EDFC10 80241250 30420008 */ andi $v0, $v0, 8 +/* EDFC14 80241254 1040000A */ beqz $v0, .L80241280 +/* EDFC18 80241258 27A50018 */ addiu $a1, $sp, 0x18 +/* EDFC1C 8024125C C602003C */ lwc1 $f2, 0x3c($s0) +/* EDFC20 80241260 C600001C */ lwc1 $f0, 0x1c($s0) +/* EDFC24 80241264 46001080 */ add.s $f2, $f2, $f0 +/* EDFC28 80241268 4616103C */ c.lt.s $f2, $f22 +/* EDFC2C 8024126C 00000000 */ nop +/* EDFC30 80241270 45020045 */ bc1fl .L80241388 +/* EDFC34 80241274 E602003C */ swc1 $f2, 0x3c($s0) +/* EDFC38 80241278 080904E1 */ j .L80241384 +/* EDFC3C 8024127C E616003C */ swc1 $f22, 0x3c($s0) +.L80241280: +/* EDFC40 80241280 C6000038 */ lwc1 $f0, 0x38($s0) +/* EDFC44 80241284 27A6001C */ addiu $a2, $sp, 0x1c +/* EDFC48 80241288 E7A00018 */ swc1 $f0, 0x18($sp) +/* EDFC4C 8024128C 860200A8 */ lh $v0, 0xa8($s0) +/* EDFC50 80241290 C600001C */ lwc1 $f0, 0x1c($s0) +/* EDFC54 80241294 C604003C */ lwc1 $f4, 0x3c($s0) +/* EDFC58 80241298 44821000 */ mtc1 $v0, $f2 +/* EDFC5C 8024129C 00000000 */ nop +/* EDFC60 802412A0 468010A0 */ cvt.s.w $f2, $f2 +/* EDFC64 802412A4 46000005 */ abs.s $f0, $f0 +/* EDFC68 802412A8 46020000 */ add.s $f0, $f0, $f2 +/* EDFC6C 802412AC C6060040 */ lwc1 $f6, 0x40($s0) +/* EDFC70 802412B0 27A20024 */ addiu $v0, $sp, 0x24 +/* EDFC74 802412B4 46022100 */ add.s $f4, $f4, $f2 +/* EDFC78 802412B8 3C014024 */ lui $at, 0x4024 +/* EDFC7C 802412BC 44811800 */ mtc1 $at, $f3 +/* EDFC80 802412C0 44801000 */ mtc1 $zero, $f2 +/* EDFC84 802412C4 46000021 */ cvt.d.s $f0, $f0 +/* EDFC88 802412C8 46220000 */ add.d $f0, $f0, $f2 +/* EDFC8C 802412CC E7A60020 */ swc1 $f6, 0x20($sp) +/* EDFC90 802412D0 E7A4001C */ swc1 $f4, 0x1c($sp) +/* EDFC94 802412D4 46200020 */ cvt.s.d $f0, $f0 +/* EDFC98 802412D8 E7A00024 */ swc1 $f0, 0x24($sp) +/* EDFC9C 802412DC AFA20010 */ sw $v0, 0x10($sp) +/* EDFCA0 802412E0 8E040080 */ lw $a0, 0x80($s0) +/* EDFCA4 802412E4 0C03908F */ jal func_800E423C +/* EDFCA8 802412E8 27A70020 */ addiu $a3, $sp, 0x20 +/* EDFCAC 802412EC 10400015 */ beqz $v0, .L80241344 +/* EDFCB0 802412F0 00000000 */ nop +/* EDFCB4 802412F4 860200A8 */ lh $v0, 0xa8($s0) +/* EDFCB8 802412F8 C604001C */ lwc1 $f4, 0x1c($s0) +/* EDFCBC 802412FC 44820000 */ mtc1 $v0, $f0 +/* EDFCC0 80241300 00000000 */ nop +/* EDFCC4 80241304 46800020 */ cvt.s.w $f0, $f0 +/* EDFCC8 80241308 46002085 */ abs.s $f2, $f4 +/* EDFCCC 8024130C 46020000 */ add.s $f0, $f0, $f2 +/* EDFCD0 80241310 C7A20024 */ lwc1 $f2, 0x24($sp) +/* EDFCD4 80241314 4600103E */ c.le.s $f2, $f0 +/* EDFCD8 80241318 00000000 */ nop +/* EDFCDC 8024131C 45000005 */ bc1f .L80241334 +/* EDFCE0 80241320 00000000 */ nop +/* EDFCE4 80241324 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EDFCE8 80241328 AE00001C */ sw $zero, 0x1c($s0) +/* EDFCEC 8024132C 080904E2 */ j .L80241388 +/* EDFCF0 80241330 E600003C */ swc1 $f0, 0x3c($s0) +.L80241334: +/* EDFCF4 80241334 C600003C */ lwc1 $f0, 0x3c($s0) +/* EDFCF8 80241338 46040000 */ add.s $f0, $f0, $f4 +/* EDFCFC 8024133C 080904E2 */ j .L80241388 +/* EDFD00 80241340 E600003C */ swc1 $f0, 0x3c($s0) +.L80241344: +/* EDFD04 80241344 C606003C */ lwc1 $f6, 0x3c($s0) +/* EDFD08 80241348 860200A8 */ lh $v0, 0xa8($s0) +/* EDFD0C 8024134C 46163081 */ sub.s $f2, $f6, $f22 +/* EDFD10 80241350 44820000 */ mtc1 $v0, $f0 +/* EDFD14 80241354 00000000 */ nop +/* EDFD18 80241358 46800020 */ cvt.s.w $f0, $f0 +/* EDFD1C 8024135C 46001080 */ add.s $f2, $f2, $f0 +/* EDFD20 80241360 C604001C */ lwc1 $f4, 0x1c($s0) +/* EDFD24 80241364 46002005 */ abs.s $f0, $f4 +/* EDFD28 80241368 4602003C */ c.lt.s $f0, $f2 +/* EDFD2C 8024136C 00000000 */ nop +/* EDFD30 80241370 45020005 */ bc1fl .L80241388 +/* EDFD34 80241374 AE00001C */ sw $zero, 0x1c($s0) +/* EDFD38 80241378 46043000 */ add.s $f0, $f6, $f4 +/* EDFD3C 8024137C 080904E2 */ j .L80241388 +/* EDFD40 80241380 E600003C */ swc1 $f0, 0x3c($s0) +.L80241384: +/* EDFD44 80241384 AE00001C */ sw $zero, 0x1c($s0) +.L80241388: +/* EDFD48 80241388 8FBF0038 */ lw $ra, 0x38($sp) +/* EDFD4C 8024138C 8FB30034 */ lw $s3, 0x34($sp) +/* EDFD50 80241390 8FB20030 */ lw $s2, 0x30($sp) +/* EDFD54 80241394 8FB1002C */ lw $s1, 0x2c($sp) +/* EDFD58 80241398 8FB00028 */ lw $s0, 0x28($sp) +/* EDFD5C 8024139C D7B60048 */ ldc1 $f22, 0x48($sp) +/* EDFD60 802413A0 D7B40040 */ ldc1 $f20, 0x40($sp) +/* EDFD64 802413A4 03E00008 */ jr $ra +/* EDFD68 802413A8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EDEA00/func_802413AC_EDFD6C.s b/asm/nonmatchings/code_EDEA00/func_802413AC_EDFD6C.s new file mode 100644 index 0000000000..93404f507a --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_802413AC_EDFD6C.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413AC_EDFD6C +/* EDFD6C 802413AC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EDFD70 802413B0 AFB00028 */ sw $s0, 0x28($sp) +/* EDFD74 802413B4 00A0802D */ daddu $s0, $a1, $zero +/* EDFD78 802413B8 AFB1002C */ sw $s1, 0x2c($sp) +/* EDFD7C 802413BC 00C0882D */ daddu $s1, $a2, $zero +/* EDFD80 802413C0 AFBF0034 */ sw $ra, 0x34($sp) +/* EDFD84 802413C4 AFB20030 */ sw $s2, 0x30($sp) +/* EDFD88 802413C8 AE200070 */ sw $zero, 0x70($s1) +/* EDFD8C 802413CC 8C830000 */ lw $v1, ($a0) +/* EDFD90 802413D0 2402FDFF */ addiu $v0, $zero, -0x201 +/* EDFD94 802413D4 A480008E */ sh $zero, 0x8e($a0) +/* EDFD98 802413D8 00621824 */ and $v1, $v1, $v0 +/* EDFD9C 802413DC 34650800 */ ori $a1, $v1, 0x800 +/* EDFDA0 802413E0 AC850000 */ sw $a1, ($a0) +/* EDFDA4 802413E4 8E0200D0 */ lw $v0, 0xd0($s0) +/* EDFDA8 802413E8 8C420034 */ lw $v0, 0x34($v0) +/* EDFDAC 802413EC 10400003 */ beqz $v0, .L802413FC +/* EDFDB0 802413F0 00E0902D */ daddu $s2, $a3, $zero +/* EDFDB4 802413F4 08090501 */ j .L80241404 +/* EDFDB8 802413F8 34620808 */ ori $v0, $v1, 0x808 +.L802413FC: +/* EDFDBC 802413FC 2402FFF7 */ addiu $v0, $zero, -9 +/* EDFDC0 80241400 00A21024 */ and $v0, $a1, $v0 +.L80241404: +/* EDFDC4 80241404 AC820000 */ sw $v0, ($a0) +/* EDFDC8 80241408 27A20024 */ addiu $v0, $sp, 0x24 +/* EDFDCC 8024140C 27A50018 */ addiu $a1, $sp, 0x18 +/* EDFDD0 80241410 C4800038 */ lwc1 $f0, 0x38($a0) +/* EDFDD4 80241414 C482003C */ lwc1 $f2, 0x3c($a0) +/* EDFDD8 80241418 C4840040 */ lwc1 $f4, 0x40($a0) +/* EDFDDC 8024141C 3C01447A */ lui $at, 0x447a +/* EDFDE0 80241420 44813000 */ mtc1 $at, $f6 +/* EDFDE4 80241424 27A6001C */ addiu $a2, $sp, 0x1c +/* EDFDE8 80241428 E7A00018 */ swc1 $f0, 0x18($sp) +/* EDFDEC 8024142C E7A2001C */ swc1 $f2, 0x1c($sp) +/* EDFDF0 80241430 E7A40020 */ swc1 $f4, 0x20($sp) +/* EDFDF4 80241434 E7A60024 */ swc1 $f6, 0x24($sp) +/* EDFDF8 80241438 AFA20010 */ sw $v0, 0x10($sp) +/* EDFDFC 8024143C 8C840080 */ lw $a0, 0x80($a0) +/* EDFE00 80241440 0C03908F */ jal func_800E423C +/* EDFE04 80241444 27A70020 */ addiu $a3, $sp, 0x20 +/* EDFE08 80241448 C7A20024 */ lwc1 $f2, 0x24($sp) +/* EDFE0C 8024144C 3C014059 */ lui $at, 0x4059 +/* EDFE10 80241450 44812800 */ mtc1 $at, $f5 +/* EDFE14 80241454 44802000 */ mtc1 $zero, $f4 +/* EDFE18 80241458 460010A1 */ cvt.d.s $f2, $f2 +/* EDFE1C 8024145C 46241082 */ mul.d $f2, $f2, $f4 +/* EDFE20 80241460 00000000 */ nop +/* EDFE24 80241464 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EDFE28 80241468 46000021 */ cvt.d.s $f0, $f0 +/* EDFE2C 8024146C 46240002 */ mul.d $f0, $f0, $f4 +/* EDFE30 80241470 00000000 */ nop +/* EDFE34 80241474 3C013FE0 */ lui $at, 0x3fe0 +/* EDFE38 80241478 44812800 */ mtc1 $at, $f5 +/* EDFE3C 8024147C 44802000 */ mtc1 $zero, $f4 +/* EDFE40 80241480 00000000 */ nop +/* EDFE44 80241484 46241080 */ add.d $f2, $f2, $f4 +/* EDFE48 80241488 AE000074 */ sw $zero, 0x74($s0) +/* EDFE4C 8024148C 46240000 */ add.d $f0, $f0, $f4 +/* EDFE50 80241490 AE000090 */ sw $zero, 0x90($s0) +/* EDFE54 80241494 4620120D */ trunc.w.d $f8, $f2 +/* EDFE58 80241498 E6080078 */ swc1 $f8, 0x78($s0) +/* EDFE5C 8024149C 4620020D */ trunc.w.d $f8, $f0 +/* EDFE60 802414A0 E6080088 */ swc1 $f8, 0x88($s0) +/* EDFE64 802414A4 8E420014 */ lw $v0, 0x14($s2) +/* EDFE68 802414A8 AE220074 */ sw $v0, 0x74($s1) +/* EDFE6C 802414AC 8E0200B0 */ lw $v0, 0xb0($s0) +/* EDFE70 802414B0 34420010 */ ori $v0, $v0, 0x10 +/* EDFE74 802414B4 AE0200B0 */ sw $v0, 0xb0($s0) +/* EDFE78 802414B8 8FBF0034 */ lw $ra, 0x34($sp) +/* EDFE7C 802414BC 8FB20030 */ lw $s2, 0x30($sp) +/* EDFE80 802414C0 8FB1002C */ lw $s1, 0x2c($sp) +/* EDFE84 802414C4 8FB00028 */ lw $s0, 0x28($sp) +/* EDFE88 802414C8 03E00008 */ jr $ra +/* EDFE8C 802414CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s b/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s new file mode 100644 index 0000000000..c6c5847008 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414D0_EDFE90 +/* EDFE90 802414D0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EDFE94 802414D4 AFB50044 */ sw $s5, 0x44($sp) +/* EDFE98 802414D8 0080A82D */ daddu $s5, $a0, $zero +/* EDFE9C 802414DC AFBF0048 */ sw $ra, 0x48($sp) +/* EDFEA0 802414E0 AFB40040 */ sw $s4, 0x40($sp) +/* EDFEA4 802414E4 AFB3003C */ sw $s3, 0x3c($sp) +/* EDFEA8 802414E8 AFB20038 */ sw $s2, 0x38($sp) +/* EDFEAC 802414EC AFB10034 */ sw $s1, 0x34($sp) +/* EDFEB0 802414F0 AFB00030 */ sw $s0, 0x30($sp) +/* EDFEB4 802414F4 8EB20148 */ lw $s2, 0x148($s5) +/* EDFEB8 802414F8 86440008 */ lh $a0, 8($s2) +/* EDFEBC 802414FC 8EB0000C */ lw $s0, 0xc($s5) +/* EDFEC0 80241500 0C00F92F */ jal func_8003E4BC +/* EDFEC4 80241504 00A0882D */ daddu $s1, $a1, $zero +/* EDFEC8 80241508 02A0202D */ daddu $a0, $s5, $zero +/* EDFECC 8024150C 8E050000 */ lw $a1, ($s0) +/* EDFED0 80241510 0C0B53A3 */ jal func_802D4E8C +/* EDFED4 80241514 0040A02D */ daddu $s4, $v0, $zero +/* EDFED8 80241518 AFA00010 */ sw $zero, 0x10($sp) +/* EDFEDC 8024151C 8E4300D0 */ lw $v1, 0xd0($s2) +/* EDFEE0 80241520 8C630030 */ lw $v1, 0x30($v1) +/* EDFEE4 80241524 AFA30014 */ sw $v1, 0x14($sp) +/* EDFEE8 80241528 8E4300D0 */ lw $v1, 0xd0($s2) +/* EDFEEC 8024152C 8C63001C */ lw $v1, 0x1c($v1) +/* EDFEF0 80241530 AFA30018 */ sw $v1, 0x18($sp) +/* EDFEF4 80241534 8E4300D0 */ lw $v1, 0xd0($s2) +/* EDFEF8 80241538 8C630024 */ lw $v1, 0x24($v1) +/* EDFEFC 8024153C AFA3001C */ sw $v1, 0x1c($sp) +/* EDFF00 80241540 8E4300D0 */ lw $v1, 0xd0($s2) +/* EDFF04 80241544 8C630028 */ lw $v1, 0x28($v1) +/* EDFF08 80241548 AFA30020 */ sw $v1, 0x20($sp) +/* EDFF0C 8024154C 8E4300D0 */ lw $v1, 0xd0($s2) +/* EDFF10 80241550 3C0142F0 */ lui $at, 0x42f0 +/* EDFF14 80241554 44810000 */ mtc1 $at, $f0 +/* EDFF18 80241558 8C63002C */ lw $v1, 0x2c($v1) +/* EDFF1C 8024155C E7A00028 */ swc1 $f0, 0x28($sp) +/* EDFF20 80241560 A7A0002C */ sh $zero, 0x2c($sp) +/* EDFF24 80241564 AFA30024 */ sw $v1, 0x24($sp) +/* EDFF28 80241568 C6800038 */ lwc1 $f0, 0x38($s4) +/* EDFF2C 8024156C E6400108 */ swc1 $f0, 0x108($s2) +/* EDFF30 80241570 C680003C */ lwc1 $f0, 0x3c($s4) +/* EDFF34 80241574 27B30010 */ addiu $s3, $sp, 0x10 +/* EDFF38 80241578 E640010C */ swc1 $f0, 0x10c($s2) +/* EDFF3C 8024157C 3C0138D1 */ lui $at, 0x38d1 +/* EDFF40 80241580 3421B717 */ ori $at, $at, 0xb717 +/* EDFF44 80241584 44810000 */ mtc1 $at, $f0 +/* EDFF48 80241588 C6820040 */ lwc1 $f2, 0x40($s4) +/* EDFF4C 8024158C 0040802D */ daddu $s0, $v0, $zero +/* EDFF50 80241590 E6400114 */ swc1 $f0, 0x114($s2) +/* EDFF54 80241594 E6400118 */ swc1 $f0, 0x118($s2) +/* EDFF58 80241598 12200006 */ beqz $s1, .L802415B4 +/* EDFF5C 8024159C E6420110 */ swc1 $f2, 0x110($s2) +/* EDFF60 802415A0 0280202D */ daddu $a0, $s4, $zero +/* EDFF64 802415A4 0240282D */ daddu $a1, $s2, $zero +/* EDFF68 802415A8 02A0302D */ daddu $a2, $s5, $zero +/* EDFF6C 802415AC 0C0904EB */ jal func_802413AC_EDFD6C +/* EDFF70 802415B0 0200382D */ daddu $a3, $s0, $zero +.L802415B4: +/* EDFF74 802415B4 2402FFFE */ addiu $v0, $zero, -2 +/* EDFF78 802415B8 A28200AB */ sb $v0, 0xab($s4) +/* EDFF7C 802415BC 8E4300B0 */ lw $v1, 0xb0($s2) +/* EDFF80 802415C0 30620004 */ andi $v0, $v1, 4 +/* EDFF84 802415C4 10400007 */ beqz $v0, .L802415E4 +/* EDFF88 802415C8 00000000 */ nop +/* EDFF8C 802415CC 824200B4 */ lb $v0, 0xb4($s2) +/* EDFF90 802415D0 1440003C */ bnez $v0, .L802416C4 +/* EDFF94 802415D4 0000102D */ daddu $v0, $zero, $zero +/* EDFF98 802415D8 2402FFFB */ addiu $v0, $zero, -5 +/* EDFF9C 802415DC 00621024 */ and $v0, $v1, $v0 +/* EDFFA0 802415E0 AE4200B0 */ sw $v0, 0xb0($s2) +.L802415E4: +/* EDFFA4 802415E4 8EA30070 */ lw $v1, 0x70($s5) +/* EDFFA8 802415E8 2C62000F */ sltiu $v0, $v1, 0xf +/* EDFFAC 802415EC 10400034 */ beqz $v0, .L802416C0 +/* EDFFB0 802415F0 00031080 */ sll $v0, $v1, 2 +/* EDFFB4 802415F4 3C018024 */ lui $at, %hi(D_80247B08) +/* EDFFB8 802415F8 00220821 */ addu $at, $at, $v0 +/* EDFFBC 802415FC 8C227B08 */ lw $v0, %lo(D_80247B08)($at) +/* EDFFC0 80241600 00400008 */ jr $v0 +/* EDFFC4 80241604 00000000 */ nop +/* EDFFC8 80241608 02A0202D */ daddu $a0, $s5, $zero +/* EDFFCC 8024160C 0200282D */ daddu $a1, $s0, $zero +/* EDFFD0 80241610 0C090071 */ jal func_802401C4_EDEB84 +/* EDFFD4 80241614 0260302D */ daddu $a2, $s3, $zero +/* EDFFD8 80241618 02A0202D */ daddu $a0, $s5, $zero +/* EDFFDC 8024161C 0200282D */ daddu $a1, $s0, $zero +/* EDFFE0 80241620 0C0900DD */ jal func_80240374_EDED34 +/* EDFFE4 80241624 0260302D */ daddu $a2, $s3, $zero +/* EDFFE8 80241628 080905B1 */ j .L802416C4 +/* EDFFEC 8024162C 0000102D */ daddu $v0, $zero, $zero +/* EDFFF0 80241630 02A0202D */ daddu $a0, $s5, $zero +/* EDFFF4 80241634 0200282D */ daddu $a1, $s0, $zero +/* EDFFF8 80241638 0C090267 */ jal func_8024099C_EDF35C +/* EDFFFC 8024163C 0260302D */ daddu $a2, $s3, $zero +/* EE0000 80241640 02A0202D */ daddu $a0, $s5, $zero +/* EE0004 80241644 0200282D */ daddu $a1, $s0, $zero +/* EE0008 80241648 0C090297 */ jal func_80240A5C_EDF41C +/* EE000C 8024164C 0260302D */ daddu $a2, $s3, $zero +/* EE0010 80241650 080905B1 */ j .L802416C4 +/* EE0014 80241654 0000102D */ daddu $v0, $zero, $zero +/* EE0018 80241658 02A0202D */ daddu $a0, $s5, $zero +/* EE001C 8024165C 0200282D */ daddu $a1, $s0, $zero +/* EE0020 80241660 0C090368 */ jal func_80240DA0_EDF760 +/* EE0024 80241664 0260302D */ daddu $a2, $s3, $zero +/* EE0028 80241668 02A0202D */ daddu $a0, $s5, $zero +/* EE002C 8024166C 0200282D */ daddu $a1, $s0, $zero +/* EE0030 80241670 0C090386 */ jal func_80240E18_EDF7D8 +/* EE0034 80241674 0260302D */ daddu $a2, $s3, $zero +/* EE0038 80241678 080905B1 */ j .L802416C4 +/* EE003C 8024167C 0000102D */ daddu $v0, $zero, $zero +/* EE0040 80241680 02A0202D */ daddu $a0, $s5, $zero +/* EE0044 80241684 0200282D */ daddu $a1, $s0, $zero +/* EE0048 80241688 0C0903A1 */ jal func_80240E84_EDF844 +/* EE004C 8024168C 0260302D */ daddu $a2, $s3, $zero +/* EE0050 80241690 080905B1 */ j .L802416C4 +/* EE0054 80241694 0000102D */ daddu $v0, $zero, $zero +/* EE0058 80241698 02A0202D */ daddu $a0, $s5, $zero +/* EE005C 8024169C 0200282D */ daddu $a1, $s0, $zero +/* EE0060 802416A0 0C0903EE */ jal func_80240FB8_EDF978 +/* EE0064 802416A4 0260302D */ daddu $a2, $s3, $zero +/* EE0068 802416A8 080905B1 */ j .L802416C4 +/* EE006C 802416AC 0000102D */ daddu $v0, $zero, $zero +/* EE0070 802416B0 02A0202D */ daddu $a0, $s5, $zero +/* EE0074 802416B4 0200282D */ daddu $a1, $s0, $zero +/* EE0078 802416B8 0C090407 */ jal func_8024101C_EDF9DC +/* EE007C 802416BC 0260302D */ daddu $a2, $s3, $zero +.L802416C0: +/* EE0080 802416C0 0000102D */ daddu $v0, $zero, $zero +.L802416C4: +/* EE0084 802416C4 8FBF0048 */ lw $ra, 0x48($sp) +/* EE0088 802416C8 8FB50044 */ lw $s5, 0x44($sp) +/* EE008C 802416CC 8FB40040 */ lw $s4, 0x40($sp) +/* EE0090 802416D0 8FB3003C */ lw $s3, 0x3c($sp) +/* EE0094 802416D4 8FB20038 */ lw $s2, 0x38($sp) +/* EE0098 802416D8 8FB10034 */ lw $s1, 0x34($sp) +/* EE009C 802416DC 8FB00030 */ lw $s0, 0x30($sp) +/* EE00A0 802416E0 03E00008 */ jr $ra +/* EE00A4 802416E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EDEA00/func_802416E8_EE00A8.s b/asm/nonmatchings/code_EDEA00/func_802416E8_EE00A8.s new file mode 100644 index 0000000000..2b88cccb34 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_802416E8_EE00A8.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416E8_EE00A8 +/* EE00A8 802416E8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE00AC 802416EC AFB00010 */ sw $s0, 0x10($sp) +/* EE00B0 802416F0 24100032 */ addiu $s0, $zero, 0x32 +/* EE00B4 802416F4 AFBF0014 */ sw $ra, 0x14($sp) +.L802416F8: +/* EE00B8 802416F8 0C010ABD */ jal func_80042AF4 +/* EE00BC 802416FC 0200202D */ daddu $a0, $s0, $zero +/* EE00C0 80241700 8C420094 */ lw $v0, 0x94($v0) +/* EE00C4 80241704 54400003 */ bnel $v0, $zero, .L80241714 +/* EE00C8 80241708 26100001 */ addiu $s0, $s0, 1 +/* EE00CC 8024170C 080905C8 */ j .L80241720 +/* EE00D0 80241710 0200102D */ daddu $v0, $s0, $zero +.L80241714: +/* EE00D4 80241714 2A020038 */ slti $v0, $s0, 0x38 +/* EE00D8 80241718 1440FFF7 */ bnez $v0, .L802416F8 +/* EE00DC 8024171C 2402FFFF */ addiu $v0, $zero, -1 +.L80241720: +/* EE00E0 80241720 8FBF0014 */ lw $ra, 0x14($sp) +/* EE00E4 80241724 8FB00010 */ lw $s0, 0x10($sp) +/* EE00E8 80241728 03E00008 */ jr $ra +/* EE00EC 8024172C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EDEA00/func_80241730_EE00F0.s b/asm/nonmatchings/code_EDEA00/func_80241730_EE00F0.s new file mode 100644 index 0000000000..626aab98f5 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80241730_EE00F0.s @@ -0,0 +1,295 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241730_EE00F0 +/* EE00F0 80241730 27BDFF78 */ addiu $sp, $sp, -0x88 +/* EE00F4 80241734 AFB20048 */ sw $s2, 0x48($sp) +/* EE00F8 80241738 0080902D */ daddu $s2, $a0, $zero +/* EE00FC 8024173C AFBF0064 */ sw $ra, 0x64($sp) +/* EE0100 80241740 AFBE0060 */ sw $fp, 0x60($sp) +/* EE0104 80241744 AFB7005C */ sw $s7, 0x5c($sp) +/* EE0108 80241748 AFB60058 */ sw $s6, 0x58($sp) +/* EE010C 8024174C AFB50054 */ sw $s5, 0x54($sp) +/* EE0110 80241750 AFB40050 */ sw $s4, 0x50($sp) +/* EE0114 80241754 AFB3004C */ sw $s3, 0x4c($sp) +/* EE0118 80241758 AFB10044 */ sw $s1, 0x44($sp) +/* EE011C 8024175C AFB00040 */ sw $s0, 0x40($sp) +/* EE0120 80241760 F7BA0080 */ sdc1 $f26, 0x80($sp) +/* EE0124 80241764 F7B80078 */ sdc1 $f24, 0x78($sp) +/* EE0128 80241768 F7B60070 */ sdc1 $f22, 0x70($sp) +/* EE012C 8024176C F7B40068 */ sdc1 $f20, 0x68($sp) +/* EE0130 80241770 8E510148 */ lw $s1, 0x148($s2) +/* EE0134 80241774 00A0B82D */ daddu $s7, $a1, $zero +/* EE0138 80241778 86240008 */ lh $a0, 8($s1) +/* EE013C 8024177C 0C00F92F */ jal func_8003E4BC +/* EE0140 80241780 00C0F02D */ daddu $fp, $a2, $zero +/* EE0144 80241784 C620007C */ lwc1 $f0, 0x7c($s1) +/* EE0148 80241788 46800020 */ cvt.s.w $f0, $f0 +/* EE014C 8024178C 46000021 */ cvt.d.s $f0, $f0 +/* EE0150 80241790 0040802D */ daddu $s0, $v0, $zero +/* EE0154 80241794 3C014059 */ lui $at, 0x4059 +/* EE0158 80241798 44813800 */ mtc1 $at, $f7 +/* EE015C 8024179C 44803000 */ mtc1 $zero, $f6 +/* EE0160 802417A0 8602008E */ lh $v0, 0x8e($s0) +/* EE0164 802417A4 9603008E */ lhu $v1, 0x8e($s0) +/* EE0168 802417A8 46260003 */ div.d $f0, $f0, $f6 +/* EE016C 802417AC 462005A0 */ cvt.s.d $f22, $f0 +/* EE0170 802417B0 C6200078 */ lwc1 $f0, 0x78($s1) +/* EE0174 802417B4 46800020 */ cvt.s.w $f0, $f0 +/* EE0178 802417B8 46000021 */ cvt.d.s $f0, $f0 +/* EE017C 802417BC 46260003 */ div.d $f0, $f0, $f6 +/* EE0180 802417C0 18400003 */ blez $v0, .L802417D0 +/* EE0184 802417C4 46200620 */ cvt.s.d $f24, $f0 +/* EE0188 802417C8 2462FFFF */ addiu $v0, $v1, -1 +/* EE018C 802417CC A602008E */ sh $v0, 0x8e($s0) +.L802417D0: +/* EE0190 802417D0 27B40028 */ addiu $s4, $sp, 0x28 +/* EE0194 802417D4 0280282D */ daddu $a1, $s4, $zero +/* EE0198 802417D8 27B5002C */ addiu $s5, $sp, 0x2c +/* EE019C 802417DC 02A0302D */ daddu $a2, $s5, $zero +/* EE01A0 802417E0 27B60030 */ addiu $s6, $sp, 0x30 +/* EE01A4 802417E4 02C0382D */ daddu $a3, $s6, $zero +/* EE01A8 802417E8 C6000038 */ lwc1 $f0, 0x38($s0) +/* EE01AC 802417EC C602003C */ lwc1 $f2, 0x3c($s0) +/* EE01B0 802417F0 C6040040 */ lwc1 $f4, 0x40($s0) +/* EE01B4 802417F4 3C01447A */ lui $at, 0x447a +/* EE01B8 802417F8 4481D000 */ mtc1 $at, $f26 +/* EE01BC 802417FC 27B30034 */ addiu $s3, $sp, 0x34 +/* EE01C0 80241800 E7A00028 */ swc1 $f0, 0x28($sp) +/* EE01C4 80241804 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EE01C8 80241808 E7A40030 */ swc1 $f4, 0x30($sp) +/* EE01CC 8024180C E7BA0034 */ swc1 $f26, 0x34($sp) +/* EE01D0 80241810 C6340070 */ lwc1 $f20, 0x70($s1) +/* EE01D4 80241814 4680A520 */ cvt.s.w $f20, $f20 +/* EE01D8 80241818 4600A521 */ cvt.d.s $f20, $f20 +/* EE01DC 8024181C 4626A503 */ div.d $f20, $f20, $f6 +/* EE01E0 80241820 AFB30010 */ sw $s3, 0x10($sp) +/* EE01E4 80241824 8E040080 */ lw $a0, 0x80($s0) +/* EE01E8 80241828 0C03908F */ jal func_800E423C +/* EE01EC 8024182C 4620A520 */ cvt.s.d $f20, $f20 +/* EE01F0 80241830 C62C0074 */ lwc1 $f12, 0x74($s1) +/* EE01F4 80241834 0C00AD77 */ jal func_8002B5DC +/* EE01F8 80241838 46806320 */ cvt.s.w $f12, $f12 +/* EE01FC 8024183C 46140002 */ mul.s $f0, $f0, $f20 +/* EE0200 80241840 00000000 */ nop +/* EE0204 80241844 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* EE0208 80241848 46181080 */ add.s $f2, $f2, $f24 +/* EE020C 8024184C 46001080 */ add.s $f2, $f2, $f0 +/* EE0210 80241850 E602003C */ swc1 $f2, 0x3c($s0) +/* EE0214 80241854 8E220074 */ lw $v0, 0x74($s1) +/* EE0218 80241858 2442000C */ addiu $v0, $v0, 0xc +/* EE021C 8024185C 44826000 */ mtc1 $v0, $f12 +/* EE0220 80241860 00000000 */ nop +/* EE0224 80241864 0C00AB85 */ jal func_8002AE14 +/* EE0228 80241868 46806320 */ cvt.s.w $f12, $f12 +/* EE022C 8024186C 4600020D */ trunc.w.s $f8, $f0 +/* EE0230 80241870 E6280074 */ swc1 $f8, 0x74($s1) +/* EE0234 80241874 8EE30014 */ lw $v1, 0x14($s7) +/* EE0238 80241878 0460003C */ bltz $v1, .L8024196C +/* EE023C 8024187C 00000000 */ nop +/* EE0240 80241880 8E420074 */ lw $v0, 0x74($s2) +/* EE0244 80241884 1C400038 */ bgtz $v0, .L80241968 +/* EE0248 80241888 2442FFFF */ addiu $v0, $v0, -1 +/* EE024C 8024188C 03C0202D */ daddu $a0, $fp, $zero +/* EE0250 80241890 AE430074 */ sw $v1, 0x74($s2) +/* EE0254 80241894 AFA00010 */ sw $zero, 0x10($sp) +/* EE0258 80241898 8EE6000C */ lw $a2, 0xc($s7) +/* EE025C 8024189C 8EE70010 */ lw $a3, 0x10($s7) +/* EE0260 802418A0 0C013469 */ jal func_8004D1A4 +/* EE0264 802418A4 0220282D */ daddu $a1, $s1, $zero +/* EE0268 802418A8 1040002D */ beqz $v0, .L80241960 +/* EE026C 802418AC 0000202D */ daddu $a0, $zero, $zero +/* EE0270 802418B0 0200282D */ daddu $a1, $s0, $zero +/* EE0274 802418B4 0000302D */ daddu $a2, $zero, $zero +/* EE0278 802418B8 860300A8 */ lh $v1, 0xa8($s0) +/* EE027C 802418BC 3C013F80 */ lui $at, 0x3f80 +/* EE0280 802418C0 44810000 */ mtc1 $at, $f0 +/* EE0284 802418C4 3C014000 */ lui $at, 0x4000 +/* EE0288 802418C8 44811000 */ mtc1 $at, $f2 +/* EE028C 802418CC 3C01C1A0 */ lui $at, 0xc1a0 +/* EE0290 802418D0 44812000 */ mtc1 $at, $f4 +/* EE0294 802418D4 2402000F */ addiu $v0, $zero, 0xf +/* EE0298 802418D8 AFA2001C */ sw $v0, 0x1c($sp) +/* EE029C 802418DC 44834000 */ mtc1 $v1, $f8 +/* EE02A0 802418E0 00000000 */ nop +/* EE02A4 802418E4 46804220 */ cvt.s.w $f8, $f8 +/* EE02A8 802418E8 44074000 */ mfc1 $a3, $f8 +/* EE02AC 802418EC 27A20038 */ addiu $v0, $sp, 0x38 +/* EE02B0 802418F0 AFA20020 */ sw $v0, 0x20($sp) +/* EE02B4 802418F4 E7A00010 */ swc1 $f0, 0x10($sp) +/* EE02B8 802418F8 E7A20014 */ swc1 $f2, 0x14($sp) +/* EE02BC 802418FC 0C01D444 */ jal func_80075110 +/* EE02C0 80241900 E7A40018 */ swc1 $f4, 0x18($sp) +/* EE02C4 80241904 0200202D */ daddu $a0, $s0, $zero +/* EE02C8 80241908 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EE02CC 8024190C 0C013600 */ jal func_8004D800 +/* EE02D0 80241910 3C060020 */ lui $a2, 0x20 +/* EE02D4 80241914 0280282D */ daddu $a1, $s4, $zero +/* EE02D8 80241918 C6000038 */ lwc1 $f0, 0x38($s0) +/* EE02DC 8024191C C602003C */ lwc1 $f2, 0x3c($s0) +/* EE02E0 80241920 C6040040 */ lwc1 $f4, 0x40($s0) +/* EE02E4 80241924 02A0302D */ daddu $a2, $s5, $zero +/* EE02E8 80241928 E7BA0034 */ swc1 $f26, 0x34($sp) +/* EE02EC 8024192C E7A00028 */ swc1 $f0, 0x28($sp) +/* EE02F0 80241930 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EE02F4 80241934 E7A40030 */ swc1 $f4, 0x30($sp) +/* EE02F8 80241938 AFB30010 */ sw $s3, 0x10($sp) +/* EE02FC 8024193C 8E040080 */ lw $a0, 0x80($s0) +/* EE0300 80241940 0C03908F */ jal func_800E423C +/* EE0304 80241944 02C0382D */ daddu $a3, $s6, $zero +/* EE0308 80241948 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EE030C 8024194C 46180000 */ add.s $f0, $f0, $f24 +/* EE0310 80241950 2402000C */ addiu $v0, $zero, 0xc +/* EE0314 80241954 E6000064 */ swc1 $f0, 0x64($s0) +/* EE0318 80241958 080906D5 */ j .L80241B54 +/* EE031C 8024195C AE420070 */ sw $v0, 0x70($s2) +.L80241960: +/* EE0320 80241960 8E420074 */ lw $v0, 0x74($s2) +/* EE0324 80241964 2442FFFF */ addiu $v0, $v0, -1 +.L80241968: +/* EE0328 80241968 AE420074 */ sw $v0, 0x74($s2) +.L8024196C: +/* EE032C 8024196C 8E2300D0 */ lw $v1, 0xd0($s1) +/* EE0330 80241970 C6000040 */ lwc1 $f0, 0x40($s0) +/* EE0334 80241974 C4620000 */ lwc1 $f2, ($v1) +/* EE0338 80241978 468010A0 */ cvt.s.w $f2, $f2 +/* EE033C 8024197C C4640008 */ lwc1 $f4, 8($v1) +/* EE0340 80241980 46802120 */ cvt.s.w $f4, $f4 +/* EE0344 80241984 E7A00010 */ swc1 $f0, 0x10($sp) +/* EE0348 80241988 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE034C 8024198C 44051000 */ mfc1 $a1, $f2 +/* EE0350 80241990 C440000C */ lwc1 $f0, 0xc($v0) +/* EE0354 80241994 46800020 */ cvt.s.w $f0, $f0 +/* EE0358 80241998 E7A00014 */ swc1 $f0, 0x14($sp) +/* EE035C 8024199C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE0360 802419A0 44062000 */ mfc1 $a2, $f4 +/* EE0364 802419A4 C4400010 */ lwc1 $f0, 0x10($v0) +/* EE0368 802419A8 46800020 */ cvt.s.w $f0, $f0 +/* EE036C 802419AC E7A00018 */ swc1 $f0, 0x18($sp) +/* EE0370 802419B0 8C640018 */ lw $a0, 0x18($v1) +/* EE0374 802419B4 0C013431 */ jal func_8004D0C4 +/* EE0378 802419B8 8E070038 */ lw $a3, 0x38($s0) +/* EE037C 802419BC 1040000D */ beqz $v0, .L802419F4 +/* EE0380 802419C0 00000000 */ nop +/* EE0384 802419C4 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE0388 802419C8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EE038C 802419CC C60E0040 */ lwc1 $f14, 0x40($s0) +/* EE0390 802419D0 C4480000 */ lwc1 $f8, ($v0) +/* EE0394 802419D4 46804220 */ cvt.s.w $f8, $f8 +/* EE0398 802419D8 44064000 */ mfc1 $a2, $f8 +/* EE039C 802419DC C4480008 */ lwc1 $f8, 8($v0) +/* EE03A0 802419E0 46804220 */ cvt.s.w $f8, $f8 +/* EE03A4 802419E4 44074000 */ mfc1 $a3, $f8 +/* EE03A8 802419E8 0C00ABDC */ jal fio_validate_header_checksums +/* EE03AC 802419EC 00000000 */ nop +/* EE03B0 802419F0 E600000C */ swc1 $f0, 0xc($s0) +.L802419F4: +/* EE03B4 802419F4 8602008C */ lh $v0, 0x8c($s0) +/* EE03B8 802419F8 14400056 */ bnez $v0, .L80241B54 +/* EE03BC 802419FC 00000000 */ nop +/* EE03C0 80241A00 8602008E */ lh $v0, 0x8e($s0) +/* EE03C4 80241A04 1840003D */ blez $v0, .L80241AFC +/* EE03C8 80241A08 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EE03CC 80241A0C 8E050018 */ lw $a1, 0x18($s0) +/* EE03D0 80241A10 8E06000C */ lw $a2, 0xc($s0) +/* EE03D4 80241A14 0C00F909 */ jal func_8003E424 +/* EE03D8 80241A18 0200202D */ daddu $a0, $s0, $zero +/* EE03DC 80241A1C 8E22006C */ lw $v0, 0x6c($s1) +/* EE03E0 80241A20 30420001 */ andi $v0, $v0, 1 +/* EE03E4 80241A24 10400032 */ beqz $v0, .L80241AF0 +/* EE03E8 80241A28 27A50028 */ addiu $a1, $sp, 0x28 +/* EE03EC 80241A2C 27A6002C */ addiu $a2, $sp, 0x2c +/* EE03F0 80241A30 C6000038 */ lwc1 $f0, 0x38($s0) +/* EE03F4 80241A34 C6020040 */ lwc1 $f2, 0x40($s0) +/* EE03F8 80241A38 3C01447A */ lui $at, 0x447a +/* EE03FC 80241A3C 44812000 */ mtc1 $at, $f4 +/* EE0400 80241A40 27A20034 */ addiu $v0, $sp, 0x34 +/* EE0404 80241A44 E7B6002C */ swc1 $f22, 0x2c($sp) +/* EE0408 80241A48 E7A00028 */ swc1 $f0, 0x28($sp) +/* EE040C 80241A4C E7A20030 */ swc1 $f2, 0x30($sp) +/* EE0410 80241A50 E7A40034 */ swc1 $f4, 0x34($sp) +/* EE0414 80241A54 AFA20010 */ sw $v0, 0x10($sp) +/* EE0418 80241A58 8E040080 */ lw $a0, 0x80($s0) +/* EE041C 80241A5C 0C03908F */ jal func_800E423C +/* EE0420 80241A60 27A70030 */ addiu $a3, $sp, 0x30 +/* EE0424 80241A64 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EE0428 80241A68 46180100 */ add.s $f4, $f0, $f24 +/* EE042C 80241A6C 3C014000 */ lui $at, 0x4000 +/* EE0430 80241A70 44813800 */ mtc1 $at, $f7 +/* EE0434 80241A74 44803000 */ mtc1 $zero, $f6 +/* EE0438 80241A78 46162001 */ sub.s $f0, $f4, $f22 +/* EE043C 80241A7C E7A4002C */ swc1 $f4, 0x2c($sp) +/* EE0440 80241A80 460000A1 */ cvt.d.s $f2, $f0 +/* EE0444 80241A84 4622303C */ c.lt.d $f6, $f2 +/* EE0448 80241A88 00000000 */ nop +/* EE044C 80241A8C 45000005 */ bc1f .L80241AA4 +/* EE0450 80241A90 E7A00034 */ swc1 $f0, 0x34($sp) +/* EE0454 80241A94 4600B021 */ cvt.d.s $f0, $f22 +/* EE0458 80241A98 46260000 */ add.d $f0, $f0, $f6 +/* EE045C 80241A9C 080906B4 */ j .L80241AD0 +/* EE0460 80241AA0 462005A0 */ cvt.s.d $f22, $f0 +.L80241AA4: +/* EE0464 80241AA4 3C01C000 */ lui $at, 0xc000 +/* EE0468 80241AA8 44810800 */ mtc1 $at, $f1 +/* EE046C 80241AAC 44800000 */ mtc1 $zero, $f0 +/* EE0470 80241AB0 00000000 */ nop +/* EE0474 80241AB4 4620103C */ c.lt.d $f2, $f0 +/* EE0478 80241AB8 00000000 */ nop +/* EE047C 80241ABC 45020004 */ bc1fl .L80241AD0 +/* EE0480 80241AC0 46002586 */ mov.s $f22, $f4 +/* EE0484 80241AC4 4600B021 */ cvt.d.s $f0, $f22 +/* EE0488 80241AC8 46260001 */ sub.d $f0, $f0, $f6 +/* EE048C 80241ACC 462005A0 */ cvt.s.d $f22, $f0 +.L80241AD0: +/* EE0490 80241AD0 3C014059 */ lui $at, 0x4059 +/* EE0494 80241AD4 44811800 */ mtc1 $at, $f3 +/* EE0498 80241AD8 44801000 */ mtc1 $zero, $f2 +/* EE049C 80241ADC 4600B021 */ cvt.d.s $f0, $f22 +/* EE04A0 80241AE0 46220002 */ mul.d $f0, $f0, $f2 +/* EE04A4 80241AE4 00000000 */ nop +/* EE04A8 80241AE8 4620020D */ trunc.w.d $f8, $f0 +/* EE04AC 80241AEC E628007C */ swc1 $f8, 0x7c($s1) +.L80241AF0: +/* EE04B0 80241AF0 8602008E */ lh $v0, 0x8e($s0) +/* EE04B4 80241AF4 1C400017 */ bgtz $v0, .L80241B54 +/* EE04B8 80241AF8 240403E8 */ addiu $a0, $zero, 0x3e8 +.L80241AFC: +/* EE04BC 80241AFC 24020002 */ addiu $v0, $zero, 2 +/* EE04C0 80241B00 0C00AB3B */ jal func_8002ACEC +/* EE04C4 80241B04 AE420070 */ sw $v0, 0x70($s2) +/* EE04C8 80241B08 3C035555 */ lui $v1, 0x5555 +/* EE04CC 80241B0C 34635556 */ ori $v1, $v1, 0x5556 +/* EE04D0 80241B10 00430018 */ mult $v0, $v1 +/* EE04D4 80241B14 000227C3 */ sra $a0, $v0, 0x1f +/* EE04D8 80241B18 00004010 */ mfhi $t0 +/* EE04DC 80241B1C 01042023 */ subu $a0, $t0, $a0 +/* EE04E0 80241B20 00041840 */ sll $v1, $a0, 1 +/* EE04E4 80241B24 00641821 */ addu $v1, $v1, $a0 +/* EE04E8 80241B28 00431023 */ subu $v0, $v0, $v1 +/* EE04EC 80241B2C 24430002 */ addiu $v1, $v0, 2 +/* EE04F0 80241B30 AE430074 */ sw $v1, 0x74($s2) +/* EE04F4 80241B34 8EE2002C */ lw $v0, 0x2c($s7) +/* EE04F8 80241B38 58400006 */ blezl $v0, .L80241B54 +/* EE04FC 80241B3C AE400070 */ sw $zero, 0x70($s2) +/* EE0500 80241B40 8EE20004 */ lw $v0, 4($s7) +/* EE0504 80241B44 58400003 */ blezl $v0, .L80241B54 +/* EE0508 80241B48 AE400070 */ sw $zero, 0x70($s2) +/* EE050C 80241B4C 50600001 */ beql $v1, $zero, .L80241B54 +/* EE0510 80241B50 AE400070 */ sw $zero, 0x70($s2) +.L80241B54: +/* EE0514 80241B54 8FBF0064 */ lw $ra, 0x64($sp) +/* EE0518 80241B58 8FBE0060 */ lw $fp, 0x60($sp) +/* EE051C 80241B5C 8FB7005C */ lw $s7, 0x5c($sp) +/* EE0520 80241B60 8FB60058 */ lw $s6, 0x58($sp) +/* EE0524 80241B64 8FB50054 */ lw $s5, 0x54($sp) +/* EE0528 80241B68 8FB40050 */ lw $s4, 0x50($sp) +/* EE052C 80241B6C 8FB3004C */ lw $s3, 0x4c($sp) +/* EE0530 80241B70 8FB20048 */ lw $s2, 0x48($sp) +/* EE0534 80241B74 8FB10044 */ lw $s1, 0x44($sp) +/* EE0538 80241B78 8FB00040 */ lw $s0, 0x40($sp) +/* EE053C 80241B7C D7BA0080 */ ldc1 $f26, 0x80($sp) +/* EE0540 80241B80 D7B80078 */ ldc1 $f24, 0x78($sp) +/* EE0544 80241B84 D7B60070 */ ldc1 $f22, 0x70($sp) +/* EE0548 80241B88 D7B40068 */ ldc1 $f20, 0x68($sp) +/* EE054C 80241B8C 03E00008 */ jr $ra +/* EE0550 80241B90 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/code_EDEA00/func_80241B94_EE0554.s b/asm/nonmatchings/code_EDEA00/func_80241B94_EE0554.s new file mode 100644 index 0000000000..3019c58100 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80241B94_EE0554.s @@ -0,0 +1,156 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B94_EE0554 +/* EE0554 80241B94 27BDFF98 */ addiu $sp, $sp, -0x68 +/* EE0558 80241B98 AFB20048 */ sw $s2, 0x48($sp) +/* EE055C 80241B9C 0080902D */ daddu $s2, $a0, $zero +/* EE0560 80241BA0 AFBF0054 */ sw $ra, 0x54($sp) +/* EE0564 80241BA4 AFB40050 */ sw $s4, 0x50($sp) +/* EE0568 80241BA8 AFB3004C */ sw $s3, 0x4c($sp) +/* EE056C 80241BAC AFB10044 */ sw $s1, 0x44($sp) +/* EE0570 80241BB0 AFB00040 */ sw $s0, 0x40($sp) +/* EE0574 80241BB4 F7B60060 */ sdc1 $f22, 0x60($sp) +/* EE0578 80241BB8 F7B40058 */ sdc1 $f20, 0x58($sp) +/* EE057C 80241BBC 8E510148 */ lw $s1, 0x148($s2) +/* EE0580 80241BC0 00A0982D */ daddu $s3, $a1, $zero +/* EE0584 80241BC4 86240008 */ lh $a0, 8($s1) +/* EE0588 80241BC8 0C00F92F */ jal func_8003E4BC +/* EE058C 80241BCC 00C0A02D */ daddu $s4, $a2, $zero +/* EE0590 80241BD0 0040802D */ daddu $s0, $v0, $zero +/* EE0594 80241BD4 C6200078 */ lwc1 $f0, 0x78($s1) +/* EE0598 80241BD8 46800020 */ cvt.s.w $f0, $f0 +/* EE059C 80241BDC 46000021 */ cvt.d.s $f0, $f0 +/* EE05A0 80241BE0 3C014059 */ lui $at, 0x4059 +/* EE05A4 80241BE4 44814800 */ mtc1 $at, $f9 +/* EE05A8 80241BE8 44804000 */ mtc1 $zero, $f8 +/* EE05AC 80241BEC 8602008E */ lh $v0, 0x8e($s0) +/* EE05B0 80241BF0 9603008E */ lhu $v1, 0x8e($s0) +/* EE05B4 80241BF4 46280003 */ div.d $f0, $f0, $f8 +/* EE05B8 80241BF8 18400003 */ blez $v0, .L80241C08 +/* EE05BC 80241BFC 462005A0 */ cvt.s.d $f22, $f0 +/* EE05C0 80241C00 2462FFFF */ addiu $v0, $v1, -1 +/* EE05C4 80241C04 A602008E */ sh $v0, 0x8e($s0) +.L80241C08: +/* EE05C8 80241C08 27A50028 */ addiu $a1, $sp, 0x28 +/* EE05CC 80241C0C 27A6002C */ addiu $a2, $sp, 0x2c +/* EE05D0 80241C10 27A70030 */ addiu $a3, $sp, 0x30 +/* EE05D4 80241C14 C6000038 */ lwc1 $f0, 0x38($s0) +/* EE05D8 80241C18 C602003C */ lwc1 $f2, 0x3c($s0) +/* EE05DC 80241C1C C6040040 */ lwc1 $f4, 0x40($s0) +/* EE05E0 80241C20 3C01447A */ lui $at, 0x447a +/* EE05E4 80241C24 44813000 */ mtc1 $at, $f6 +/* EE05E8 80241C28 27A20034 */ addiu $v0, $sp, 0x34 +/* EE05EC 80241C2C E7A00028 */ swc1 $f0, 0x28($sp) +/* EE05F0 80241C30 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EE05F4 80241C34 E7A40030 */ swc1 $f4, 0x30($sp) +/* EE05F8 80241C38 E7A60034 */ swc1 $f6, 0x34($sp) +/* EE05FC 80241C3C C6340070 */ lwc1 $f20, 0x70($s1) +/* EE0600 80241C40 4680A520 */ cvt.s.w $f20, $f20 +/* EE0604 80241C44 4600A521 */ cvt.d.s $f20, $f20 +/* EE0608 80241C48 4628A503 */ div.d $f20, $f20, $f8 +/* EE060C 80241C4C AFA20010 */ sw $v0, 0x10($sp) +/* EE0610 80241C50 8E040080 */ lw $a0, 0x80($s0) +/* EE0614 80241C54 0C03908F */ jal func_800E423C +/* EE0618 80241C58 4620A520 */ cvt.s.d $f20, $f20 +/* EE061C 80241C5C C62C0074 */ lwc1 $f12, 0x74($s1) +/* EE0620 80241C60 0C00AD77 */ jal func_8002B5DC +/* EE0624 80241C64 46806320 */ cvt.s.w $f12, $f12 +/* EE0628 80241C68 46140002 */ mul.s $f0, $f0, $f20 +/* EE062C 80241C6C 00000000 */ nop +/* EE0630 80241C70 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* EE0634 80241C74 46161080 */ add.s $f2, $f2, $f22 +/* EE0638 80241C78 46001080 */ add.s $f2, $f2, $f0 +/* EE063C 80241C7C E602003C */ swc1 $f2, 0x3c($s0) +/* EE0640 80241C80 8E220074 */ lw $v0, 0x74($s1) +/* EE0644 80241C84 2442000C */ addiu $v0, $v0, 0xc +/* EE0648 80241C88 44826000 */ mtc1 $v0, $f12 +/* EE064C 80241C8C 00000000 */ nop +/* EE0650 80241C90 0C00AB85 */ jal func_8002AE14 +/* EE0654 80241C94 46806320 */ cvt.s.w $f12, $f12 +/* EE0658 80241C98 4600028D */ trunc.w.s $f10, $f0 +/* EE065C 80241C9C E62A0074 */ swc1 $f10, 0x74($s1) +/* EE0660 80241CA0 0280202D */ daddu $a0, $s4, $zero +/* EE0664 80241CA4 24020001 */ addiu $v0, $zero, 1 +/* EE0668 80241CA8 AFA20010 */ sw $v0, 0x10($sp) +/* EE066C 80241CAC 8E660024 */ lw $a2, 0x24($s3) +/* EE0670 80241CB0 8E670028 */ lw $a3, 0x28($s3) +/* EE0674 80241CB4 0C013469 */ jal func_8004D1A4 +/* EE0678 80241CB8 0220282D */ daddu $a1, $s1, $zero +/* EE067C 80241CBC 1040001D */ beqz $v0, .L80241D34 +/* EE0680 80241CC0 0000202D */ daddu $a0, $zero, $zero +/* EE0684 80241CC4 0200282D */ daddu $a1, $s0, $zero +/* EE0688 80241CC8 0000302D */ daddu $a2, $zero, $zero +/* EE068C 80241CCC 860300A8 */ lh $v1, 0xa8($s0) +/* EE0690 80241CD0 3C013F80 */ lui $at, 0x3f80 +/* EE0694 80241CD4 44810000 */ mtc1 $at, $f0 +/* EE0698 80241CD8 3C014000 */ lui $at, 0x4000 +/* EE069C 80241CDC 44811000 */ mtc1 $at, $f2 +/* EE06A0 80241CE0 3C01C1A0 */ lui $at, 0xc1a0 +/* EE06A4 80241CE4 44812000 */ mtc1 $at, $f4 +/* EE06A8 80241CE8 2402000F */ addiu $v0, $zero, 0xf +/* EE06AC 80241CEC AFA2001C */ sw $v0, 0x1c($sp) +/* EE06B0 80241CF0 44835000 */ mtc1 $v1, $f10 +/* EE06B4 80241CF4 00000000 */ nop +/* EE06B8 80241CF8 468052A0 */ cvt.s.w $f10, $f10 +/* EE06BC 80241CFC 44075000 */ mfc1 $a3, $f10 +/* EE06C0 80241D00 27A20038 */ addiu $v0, $sp, 0x38 +/* EE06C4 80241D04 AFA20020 */ sw $v0, 0x20($sp) +/* EE06C8 80241D08 E7A00010 */ swc1 $f0, 0x10($sp) +/* EE06CC 80241D0C E7A20014 */ swc1 $f2, 0x14($sp) +/* EE06D0 80241D10 0C01D444 */ jal func_80075110 +/* EE06D4 80241D14 E7A40018 */ swc1 $f4, 0x18($sp) +/* EE06D8 80241D18 0200202D */ daddu $a0, $s0, $zero +/* EE06DC 80241D1C 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EE06E0 80241D20 0C013600 */ jal func_8004D800 +/* EE06E4 80241D24 3C060020 */ lui $a2, 0x20 +/* EE06E8 80241D28 2402000C */ addiu $v0, $zero, 0xc +/* EE06EC 80241D2C 0809076F */ j .L80241DBC +/* EE06F0 80241D30 AE420070 */ sw $v0, 0x70($s2) +.L80241D34: +/* EE06F4 80241D34 8602008C */ lh $v0, 0x8c($s0) +/* EE06F8 80241D38 14400020 */ bnez $v0, .L80241DBC +/* EE06FC 80241D3C 00000000 */ nop +/* EE0700 80241D40 8602008E */ lh $v0, 0x8e($s0) +/* EE0704 80241D44 1C40001D */ bgtz $v0, .L80241DBC +/* EE0708 80241D48 00000000 */ nop +/* EE070C 80241D4C 8E420074 */ lw $v0, 0x74($s2) +/* EE0710 80241D50 2442FFFF */ addiu $v0, $v0, -1 +/* EE0714 80241D54 18400018 */ blez $v0, .L80241DB8 +/* EE0718 80241D58 AE420074 */ sw $v0, 0x74($s2) +/* EE071C 80241D5C C600000C */ lwc1 $f0, 0xc($s0) +/* EE0720 80241D60 3C014334 */ lui $at, 0x4334 +/* EE0724 80241D64 44816000 */ mtc1 $at, $f12 +/* EE0728 80241D68 0C00AB85 */ jal func_8002AE14 +/* EE072C 80241D6C 460C0300 */ add.s $f12, $f0, $f12 +/* EE0730 80241D70 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EE0734 80241D74 0C00AB3B */ jal func_8002ACEC +/* EE0738 80241D78 E600000C */ swc1 $f0, 0xc($s0) +/* EE073C 80241D7C 3C032E8B */ lui $v1, 0x2e8b +/* EE0740 80241D80 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* EE0744 80241D84 00430018 */ mult $v0, $v1 +/* EE0748 80241D88 00021FC3 */ sra $v1, $v0, 0x1f +/* EE074C 80241D8C 00004010 */ mfhi $t0 +/* EE0750 80241D90 00082043 */ sra $a0, $t0, 1 +/* EE0754 80241D94 00832023 */ subu $a0, $a0, $v1 +/* EE0758 80241D98 00041840 */ sll $v1, $a0, 1 +/* EE075C 80241D9C 00641821 */ addu $v1, $v1, $a0 +/* EE0760 80241DA0 00031880 */ sll $v1, $v1, 2 +/* EE0764 80241DA4 00641823 */ subu $v1, $v1, $a0 +/* EE0768 80241DA8 00431023 */ subu $v0, $v0, $v1 +/* EE076C 80241DAC 24420005 */ addiu $v0, $v0, 5 +/* EE0770 80241DB0 0809076F */ j .L80241DBC +/* EE0774 80241DB4 A602008E */ sh $v0, 0x8e($s0) +.L80241DB8: +/* EE0778 80241DB8 AE400070 */ sw $zero, 0x70($s2) +.L80241DBC: +/* EE077C 80241DBC 8FBF0054 */ lw $ra, 0x54($sp) +/* EE0780 80241DC0 8FB40050 */ lw $s4, 0x50($sp) +/* EE0784 80241DC4 8FB3004C */ lw $s3, 0x4c($sp) +/* EE0788 80241DC8 8FB20048 */ lw $s2, 0x48($sp) +/* EE078C 80241DCC 8FB10044 */ lw $s1, 0x44($sp) +/* EE0790 80241DD0 8FB00040 */ lw $s0, 0x40($sp) +/* EE0794 80241DD4 D7B60060 */ ldc1 $f22, 0x60($sp) +/* EE0798 80241DD8 D7B40058 */ ldc1 $f20, 0x58($sp) +/* EE079C 80241DDC 03E00008 */ jr $ra +/* EE07A0 80241DE0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s b/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s new file mode 100644 index 0000000000..2819db542f --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s @@ -0,0 +1,352 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DE4_EE07A4 +/* EE07A4 80241DE4 27BDFF98 */ addiu $sp, $sp, -0x68 +/* EE07A8 80241DE8 AFB40050 */ sw $s4, 0x50($sp) +/* EE07AC 80241DEC 0080A02D */ daddu $s4, $a0, $zero +/* EE07B0 80241DF0 AFBF005C */ sw $ra, 0x5c($sp) +/* EE07B4 80241DF4 AFB60058 */ sw $s6, 0x58($sp) +/* EE07B8 80241DF8 AFB50054 */ sw $s5, 0x54($sp) +/* EE07BC 80241DFC AFB3004C */ sw $s3, 0x4c($sp) +/* EE07C0 80241E00 AFB20048 */ sw $s2, 0x48($sp) +/* EE07C4 80241E04 AFB10044 */ sw $s1, 0x44($sp) +/* EE07C8 80241E08 AFB00040 */ sw $s0, 0x40($sp) +/* EE07CC 80241E0C F7B40060 */ sdc1 $f20, 0x60($sp) +/* EE07D0 80241E10 8E930148 */ lw $s3, 0x148($s4) +/* EE07D4 80241E14 86640008 */ lh $a0, 8($s3) +/* EE07D8 80241E18 8E90000C */ lw $s0, 0xc($s4) +/* EE07DC 80241E1C 0C00F92F */ jal func_8003E4BC +/* EE07E0 80241E20 00A0882D */ daddu $s1, $a1, $zero +/* EE07E4 80241E24 0280202D */ daddu $a0, $s4, $zero +/* EE07E8 80241E28 8E050000 */ lw $a1, ($s0) +/* EE07EC 80241E2C 0C0B53A3 */ jal func_802D4E8C +/* EE07F0 80241E30 0040902D */ daddu $s2, $v0, $zero +/* EE07F4 80241E34 AFA00020 */ sw $zero, 0x20($sp) +/* EE07F8 80241E38 8E6300D0 */ lw $v1, 0xd0($s3) +/* EE07FC 80241E3C 8C630030 */ lw $v1, 0x30($v1) +/* EE0800 80241E40 AFA30024 */ sw $v1, 0x24($sp) +/* EE0804 80241E44 8E6300D0 */ lw $v1, 0xd0($s3) +/* EE0808 80241E48 8C63001C */ lw $v1, 0x1c($v1) +/* EE080C 80241E4C AFA30028 */ sw $v1, 0x28($sp) +/* EE0810 80241E50 8E6300D0 */ lw $v1, 0xd0($s3) +/* EE0814 80241E54 8C630024 */ lw $v1, 0x24($v1) +/* EE0818 80241E58 AFA3002C */ sw $v1, 0x2c($sp) +/* EE081C 80241E5C 8E6300D0 */ lw $v1, 0xd0($s3) +/* EE0820 80241E60 8C630028 */ lw $v1, 0x28($v1) +/* EE0824 80241E64 AFA30030 */ sw $v1, 0x30($sp) +/* EE0828 80241E68 8E6300D0 */ lw $v1, 0xd0($s3) +/* EE082C 80241E6C 3C0142F0 */ lui $at, 0x42f0 +/* EE0830 80241E70 44810000 */ mtc1 $at, $f0 +/* EE0834 80241E74 8C63002C */ lw $v1, 0x2c($v1) +/* EE0838 80241E78 E7A00038 */ swc1 $f0, 0x38($sp) +/* EE083C 80241E7C A7A0003C */ sh $zero, 0x3c($sp) +/* EE0840 80241E80 AFA30034 */ sw $v1, 0x34($sp) +/* EE0844 80241E84 C6400038 */ lwc1 $f0, 0x38($s2) +/* EE0848 80241E88 E6600108 */ swc1 $f0, 0x108($s3) +/* EE084C 80241E8C C640003C */ lwc1 $f0, 0x3c($s2) +/* EE0850 80241E90 27B50020 */ addiu $s5, $sp, 0x20 +/* EE0854 80241E94 E660010C */ swc1 $f0, 0x10c($s3) +/* EE0858 80241E98 3C0138D1 */ lui $at, 0x38d1 +/* EE085C 80241E9C 3421B717 */ ori $at, $at, 0xb717 +/* EE0860 80241EA0 44810000 */ mtc1 $at, $f0 +/* EE0864 80241EA4 C6420040 */ lwc1 $f2, 0x40($s2) +/* EE0868 80241EA8 0040B02D */ daddu $s6, $v0, $zero +/* EE086C 80241EAC E6600114 */ swc1 $f0, 0x114($s3) +/* EE0870 80241EB0 E6600118 */ swc1 $f0, 0x118($s3) +/* EE0874 80241EB4 12200007 */ beqz $s1, .L80241ED4 +/* EE0878 80241EB8 E6620110 */ swc1 $f2, 0x110($s3) +/* EE087C 80241EBC 0240202D */ daddu $a0, $s2, $zero +/* EE0880 80241EC0 0260282D */ daddu $a1, $s3, $zero +/* EE0884 80241EC4 0280302D */ daddu $a2, $s4, $zero +/* EE0888 80241EC8 0C0904EB */ jal func_802413AC_EDFD6C +/* EE088C 80241ECC 02C0382D */ daddu $a3, $s6, $zero +/* EE0890 80241ED0 AE800070 */ sw $zero, 0x70($s4) +.L80241ED4: +/* EE0894 80241ED4 2402FFFD */ addiu $v0, $zero, -3 +/* EE0898 80241ED8 A24200AB */ sb $v0, 0xab($s2) +/* EE089C 80241EDC 8E6300B0 */ lw $v1, 0xb0($s3) +/* EE08A0 80241EE0 30620004 */ andi $v0, $v1, 4 +/* EE08A4 80241EE4 10400007 */ beqz $v0, .L80241F04 +/* EE08A8 80241EE8 00000000 */ nop +/* EE08AC 80241EEC 826200B4 */ lb $v0, 0xb4($s3) +/* EE08B0 80241EF0 144000F4 */ bnez $v0, .L802422C4 +/* EE08B4 80241EF4 0000102D */ daddu $v0, $zero, $zero +/* EE08B8 80241EF8 2402FFFB */ addiu $v0, $zero, -5 +/* EE08BC 80241EFC 00621024 */ and $v0, $v1, $v0 +/* EE08C0 80241F00 AE6200B0 */ sw $v0, 0xb0($s3) +.L80241F04: +/* EE08C4 80241F04 8E830070 */ lw $v1, 0x70($s4) +/* EE08C8 80241F08 24020001 */ addiu $v0, $zero, 1 +/* EE08CC 80241F0C 10620011 */ beq $v1, $v0, .L80241F54 +/* EE08D0 80241F10 28620002 */ slti $v0, $v1, 2 +/* EE08D4 80241F14 10400005 */ beqz $v0, .L80241F2C +/* EE08D8 80241F18 24020002 */ addiu $v0, $zero, 2 +/* EE08DC 80241F1C 10600009 */ beqz $v1, .L80241F44 +/* EE08E0 80241F20 2402000C */ addiu $v0, $zero, 0xc +/* EE08E4 80241F24 080907E5 */ j .L80241F94 +/* EE08E8 80241F28 00000000 */ nop +.L80241F2C: +/* EE08EC 80241F2C 1062000F */ beq $v1, $v0, .L80241F6C +/* EE08F0 80241F30 24020003 */ addiu $v0, $zero, 3 +/* EE08F4 80241F34 10620012 */ beq $v1, $v0, .L80241F80 +/* EE08F8 80241F38 0280202D */ daddu $a0, $s4, $zero +/* EE08FC 80241F3C 080907E3 */ j .L80241F8C +/* EE0900 80241F40 00000000 */ nop +.L80241F44: +/* EE0904 80241F44 0280202D */ daddu $a0, $s4, $zero +/* EE0908 80241F48 02C0282D */ daddu $a1, $s6, $zero +/* EE090C 80241F4C 0C090071 */ jal func_802401C4_EDEB84 +/* EE0910 80241F50 02A0302D */ daddu $a2, $s5, $zero +.L80241F54: +/* EE0914 80241F54 0280202D */ daddu $a0, $s4, $zero +/* EE0918 80241F58 02C0282D */ daddu $a1, $s6, $zero +/* EE091C 80241F5C 0C0905CC */ jal func_80241730_EE00F0 +/* EE0920 80241F60 02A0302D */ daddu $a2, $s5, $zero +/* EE0924 80241F64 080907E3 */ j .L80241F8C +/* EE0928 80241F68 00000000 */ nop +.L80241F6C: +/* EE092C 80241F6C 0280202D */ daddu $a0, $s4, $zero +/* EE0930 80241F70 02C0282D */ daddu $a1, $s6, $zero +/* EE0934 80241F74 0C090267 */ jal func_8024099C_EDF35C +/* EE0938 80241F78 02A0302D */ daddu $a2, $s5, $zero +/* EE093C 80241F7C 0280202D */ daddu $a0, $s4, $zero +.L80241F80: +/* EE0940 80241F80 02C0282D */ daddu $a1, $s6, $zero +/* EE0944 80241F84 0C0906E5 */ jal func_80241B94_EE0554 +/* EE0948 80241F88 02A0302D */ daddu $a2, $s5, $zero +.L80241F8C: +/* EE094C 80241F8C 8E830070 */ lw $v1, 0x70($s4) +/* EE0950 80241F90 2402000C */ addiu $v0, $zero, 0xc +.L80241F94: +/* EE0954 80241F94 1462001A */ bne $v1, $v0, .L80242000 +/* EE0958 80241F98 00000000 */ nop +/* EE095C 80241F9C C64C0038 */ lwc1 $f12, 0x38($s2) +/* EE0960 80241FA0 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EE0964 80241FA4 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EE0968 80241FA8 C64E0040 */ lwc1 $f14, 0x40($s2) +/* EE096C 80241FAC 8C460028 */ lw $a2, 0x28($v0) +/* EE0970 80241FB0 0C00ABDC */ jal fio_validate_header_checksums +/* EE0974 80241FB4 8C470030 */ lw $a3, 0x30($v0) +/* EE0978 80241FB8 0C0905BA */ jal func_802416E8_EE00A8 +/* EE097C 80241FBC E640000C */ swc1 $f0, 0xc($s2) +/* EE0980 80241FC0 0440000F */ bltz $v0, .L80242000 +/* EE0984 80241FC4 AE62007C */ sw $v0, 0x7c($s3) +/* EE0988 80241FC8 0C010ABD */ jal func_80042AF4 +/* EE098C 80241FCC 0040202D */ daddu $a0, $v0, $zero +/* EE0990 80241FD0 3C030049 */ lui $v1, 0x49 +/* EE0994 80241FD4 0040202D */ daddu $a0, $v0, $zero +/* EE0998 80241FD8 24020001 */ addiu $v0, $zero, 1 +/* EE099C 80241FDC AC820094 */ sw $v0, 0x94($a0) +/* EE09A0 80241FE0 86620008 */ lh $v0, 8($s3) +/* EE09A4 80241FE4 34630014 */ ori $v1, $v1, 0x14 +/* EE09A8 80241FE8 AC820098 */ sw $v0, 0x98($a0) +/* EE09AC 80241FEC 2402000F */ addiu $v0, $zero, 0xf +/* EE09B0 80241FF0 A642008E */ sh $v0, 0x8e($s2) +/* EE09B4 80241FF4 2402001E */ addiu $v0, $zero, 0x1e +/* EE09B8 80241FF8 AE430028 */ sw $v1, 0x28($s2) +/* EE09BC 80241FFC AE820070 */ sw $v0, 0x70($s4) +.L80242000: +/* EE09C0 80242000 8E830070 */ lw $v1, 0x70($s4) +/* EE09C4 80242004 2402000D */ addiu $v0, $zero, 0xd +/* EE09C8 80242008 10620010 */ beq $v1, $v0, .L8024204C +/* EE09CC 8024200C 2862000E */ slti $v0, $v1, 0xe +/* EE09D0 80242010 10400005 */ beqz $v0, .L80242028 +/* EE09D4 80242014 2402000C */ addiu $v0, $zero, 0xc +/* EE09D8 80242018 10620008 */ beq $v1, $v0, .L8024203C +/* EE09DC 8024201C 2410001F */ addiu $s0, $zero, 0x1f +/* EE09E0 80242020 0809081E */ j .L80242078 +/* EE09E4 80242024 00000000 */ nop +.L80242028: +/* EE09E8 80242028 2402000E */ addiu $v0, $zero, 0xe +/* EE09EC 8024202C 1062000D */ beq $v1, $v0, .L80242064 +/* EE09F0 80242030 0280202D */ daddu $a0, $s4, $zero +/* EE09F4 80242034 0809081C */ j .L80242070 +/* EE09F8 80242038 00000000 */ nop +.L8024203C: +/* EE09FC 8024203C 0280202D */ daddu $a0, $s4, $zero +/* EE0A00 80242040 02C0282D */ daddu $a1, $s6, $zero +/* EE0A04 80242044 0C0903A1 */ jal func_80240E84_EDF844 +/* EE0A08 80242048 02A0302D */ daddu $a2, $s5, $zero +.L8024204C: +/* EE0A0C 8024204C 0280202D */ daddu $a0, $s4, $zero +/* EE0A10 80242050 02C0282D */ daddu $a1, $s6, $zero +/* EE0A14 80242054 0C0903EE */ jal func_80240FB8_EDF978 +/* EE0A18 80242058 02A0302D */ daddu $a2, $s5, $zero +/* EE0A1C 8024205C 0809081C */ j .L80242070 +/* EE0A20 80242060 00000000 */ nop +.L80242064: +/* EE0A24 80242064 02C0282D */ daddu $a1, $s6, $zero +/* EE0A28 80242068 0C090407 */ jal func_8024101C_EDF9DC +/* EE0A2C 8024206C 02A0302D */ daddu $a2, $s5, $zero +.L80242070: +/* EE0A30 80242070 8E830070 */ lw $v1, 0x70($s4) +/* EE0A34 80242074 2410001F */ addiu $s0, $zero, 0x1f +.L80242078: +/* EE0A38 80242078 1070001B */ beq $v1, $s0, .L802420E8 +/* EE0A3C 8024207C 28620020 */ slti $v0, $v1, 0x20 +/* EE0A40 80242080 10400005 */ beqz $v0, .L80242098 +/* EE0A44 80242084 2402001E */ addiu $v0, $zero, 0x1e +/* EE0A48 80242088 1062000A */ beq $v1, $v0, .L802420B4 +/* EE0A4C 8024208C 00000000 */ nop +/* EE0A50 80242090 08090859 */ j .L80242164 +/* EE0A54 80242094 00000000 */ nop +.L80242098: +/* EE0A58 80242098 24020020 */ addiu $v0, $zero, 0x20 +/* EE0A5C 8024209C 10620022 */ beq $v1, $v0, .L80242128 +/* EE0A60 802420A0 24020021 */ addiu $v0, $zero, 0x21 +/* EE0A64 802420A4 10620029 */ beq $v1, $v0, .L8024214C +/* EE0A68 802420A8 00000000 */ nop +/* EE0A6C 802420AC 08090859 */ j .L80242164 +/* EE0A70 802420B0 00000000 */ nop +.L802420B4: +/* EE0A74 802420B4 9642008E */ lhu $v0, 0x8e($s2) +/* EE0A78 802420B8 2442FFFF */ addiu $v0, $v0, -1 +/* EE0A7C 802420BC A642008E */ sh $v0, 0x8e($s2) +/* EE0A80 802420C0 00021400 */ sll $v0, $v0, 0x10 +/* EE0A84 802420C4 1C400027 */ bgtz $v0, .L80242164 +/* EE0A88 802420C8 00000000 */ nop +/* EE0A8C 802420CC 0C010ABD */ jal func_80042AF4 +/* EE0A90 802420D0 8E64007C */ lw $a0, 0x7c($s3) +/* EE0A94 802420D4 24030002 */ addiu $v1, $zero, 2 +/* EE0A98 802420D8 AC430094 */ sw $v1, 0x94($v0) +/* EE0A9C 802420DC 24020005 */ addiu $v0, $zero, 5 +/* EE0AA0 802420E0 A642008E */ sh $v0, 0x8e($s2) +/* EE0AA4 802420E4 AE900070 */ sw $s0, 0x70($s4) +.L802420E8: +/* EE0AA8 802420E8 9642008E */ lhu $v0, 0x8e($s2) +/* EE0AAC 802420EC 2442FFFF */ addiu $v0, $v0, -1 +/* EE0AB0 802420F0 A642008E */ sh $v0, 0x8e($s2) +/* EE0AB4 802420F4 00021400 */ sll $v0, $v0, 0x10 +/* EE0AB8 802420F8 1C40001A */ bgtz $v0, .L80242164 +/* EE0ABC 802420FC 3C020049 */ lui $v0, 0x49 +/* EE0AC0 80242100 34420015 */ ori $v0, $v0, 0x15 +/* EE0AC4 80242104 AE420028 */ sw $v0, 0x28($s2) +/* EE0AC8 80242108 0C010ABD */ jal func_80042AF4 +/* EE0ACC 8024210C 8E64007C */ lw $a0, 0x7c($s3) +/* EE0AD0 80242110 24030003 */ addiu $v1, $zero, 3 +/* EE0AD4 80242114 AC430094 */ sw $v1, 0x94($v0) +/* EE0AD8 80242118 2402000A */ addiu $v0, $zero, 0xa +/* EE0ADC 8024211C A642008E */ sh $v0, 0x8e($s2) +/* EE0AE0 80242120 24020020 */ addiu $v0, $zero, 0x20 +/* EE0AE4 80242124 AE820070 */ sw $v0, 0x70($s4) +.L80242128: +/* EE0AE8 80242128 9642008E */ lhu $v0, 0x8e($s2) +/* EE0AEC 8024212C 2442FFFF */ addiu $v0, $v0, -1 +/* EE0AF0 80242130 A642008E */ sh $v0, 0x8e($s2) +/* EE0AF4 80242134 00021400 */ sll $v0, $v0, 0x10 +/* EE0AF8 80242138 1C40000A */ bgtz $v0, .L80242164 +/* EE0AFC 8024213C 24020003 */ addiu $v0, $zero, 3 +/* EE0B00 80242140 A642008E */ sh $v0, 0x8e($s2) +/* EE0B04 80242144 24020021 */ addiu $v0, $zero, 0x21 +/* EE0B08 80242148 AE820070 */ sw $v0, 0x70($s4) +.L8024214C: +/* EE0B0C 8024214C 9642008E */ lhu $v0, 0x8e($s2) +/* EE0B10 80242150 2442FFFF */ addiu $v0, $v0, -1 +/* EE0B14 80242154 A642008E */ sh $v0, 0x8e($s2) +/* EE0B18 80242158 00021400 */ sll $v0, $v0, 0x10 +/* EE0B1C 8024215C 58400001 */ blezl $v0, .L80242164 +/* EE0B20 80242160 AE800070 */ sw $zero, 0x70($s4) +.L80242164: +/* EE0B24 80242164 8E820070 */ lw $v0, 0x70($s4) +/* EE0B28 80242168 2442FFE2 */ addiu $v0, $v0, -0x1e +/* EE0B2C 8024216C 2C420002 */ sltiu $v0, $v0, 2 +/* EE0B30 80242170 10400054 */ beqz $v0, .L802422C4 +/* EE0B34 80242174 0000102D */ daddu $v0, $zero, $zero +/* EE0B38 80242178 3C108010 */ lui $s0, %hi(D_800FFC90) +/* EE0B3C 8024217C 2610FC90 */ addiu $s0, $s0, %lo(D_800FFC90) +/* EE0B40 80242180 C64C0038 */ lwc1 $f12, 0x38($s2) +/* EE0B44 80242184 8E020000 */ lw $v0, ($s0) +/* EE0B48 80242188 C64E0040 */ lwc1 $f14, 0x40($s2) +/* EE0B4C 8024218C 8C460028 */ lw $a2, 0x28($v0) +/* EE0B50 80242190 0C00ABDC */ jal fio_validate_header_checksums +/* EE0B54 80242194 8C470030 */ lw $a3, 0x30($v0) +/* EE0B58 80242198 8E460038 */ lw $a2, 0x38($s2) +/* EE0B5C 8024219C 8E470040 */ lw $a3, 0x40($s2) +/* EE0B60 802421A0 8E020000 */ lw $v0, ($s0) +/* EE0B64 802421A4 E640000C */ swc1 $f0, 0xc($s2) +/* EE0B68 802421A8 C44C0028 */ lwc1 $f12, 0x28($v0) +/* EE0B6C 802421AC 0C00AC71 */ jal func_8002B1C4 +/* EE0B70 802421B0 C44E0030 */ lwc1 $f14, 0x30($v0) +/* EE0B74 802421B4 C6A20008 */ lwc1 $f2, 8($s5) +/* EE0B78 802421B8 468010A0 */ cvt.s.w $f2, $f2 +/* EE0B7C 802421BC 44051000 */ mfc1 $a1, $f2 +/* EE0B80 802421C0 C6A2000C */ lwc1 $f2, 0xc($s5) +/* EE0B84 802421C4 468010A0 */ cvt.s.w $f2, $f2 +/* EE0B88 802421C8 44061000 */ mfc1 $a2, $f2 +/* EE0B8C 802421CC C6420040 */ lwc1 $f2, 0x40($s2) +/* EE0B90 802421D0 E7A20010 */ swc1 $f2, 0x10($sp) +/* EE0B94 802421D4 C6A20010 */ lwc1 $f2, 0x10($s5) +/* EE0B98 802421D8 468010A0 */ cvt.s.w $f2, $f2 +/* EE0B9C 802421DC E7A20014 */ swc1 $f2, 0x14($sp) +/* EE0BA0 802421E0 C6A20014 */ lwc1 $f2, 0x14($s5) +/* EE0BA4 802421E4 468010A0 */ cvt.s.w $f2, $f2 +/* EE0BA8 802421E8 E7A20018 */ swc1 $f2, 0x18($sp) +/* EE0BAC 802421EC 8EA40004 */ lw $a0, 4($s5) +/* EE0BB0 802421F0 8E470038 */ lw $a3, 0x38($s2) +/* EE0BB4 802421F4 0C013431 */ jal func_8004D0C4 +/* EE0BB8 802421F8 46000506 */ mov.s $f20, $f0 +/* EE0BBC 802421FC 14400031 */ bnez $v0, .L802422C4 +/* EE0BC0 80242200 0000102D */ daddu $v0, $zero, $zero +/* EE0BC4 80242204 3C01403E */ lui $at, 0x403e +/* EE0BC8 80242208 44810800 */ mtc1 $at, $f1 +/* EE0BCC 8024220C 44800000 */ mtc1 $zero, $f0 +/* EE0BD0 80242210 4600A0A1 */ cvt.d.s $f2, $f20 +/* EE0BD4 80242214 4622003C */ c.lt.d $f0, $f2 +/* EE0BD8 80242218 00000000 */ nop +/* EE0BDC 8024221C 45000029 */ bc1f .L802422C4 +/* EE0BE0 80242220 00000000 */ nop +/* EE0BE4 80242224 8642008C */ lh $v0, 0x8c($s2) +/* EE0BE8 80242228 54400026 */ bnel $v0, $zero, .L802422C4 +/* EE0BEC 8024222C 0000102D */ daddu $v0, $zero, $zero +/* EE0BF0 80242230 3C014034 */ lui $at, 0x4034 +/* EE0BF4 80242234 44810800 */ mtc1 $at, $f1 +/* EE0BF8 80242238 44800000 */ mtc1 $zero, $f0 +/* EE0BFC 8024223C 00000000 */ nop +/* EE0C00 80242240 46201001 */ sub.d $f0, $f2, $f0 +/* EE0C04 80242244 44801000 */ mtc1 $zero, $f2 +/* EE0C08 80242248 44801800 */ mtc1 $zero, $f3 +/* EE0C0C 8024224C 46200120 */ cvt.s.d $f4, $f0 +/* EE0C10 80242250 46002021 */ cvt.d.s $f0, $f4 +/* EE0C14 80242254 4622003C */ c.lt.d $f0, $f2 +/* EE0C18 80242258 00000000 */ nop +/* EE0C1C 8024225C 45000002 */ bc1f .L80242268 +/* EE0C20 80242260 00000000 */ nop +/* EE0C24 80242264 44802000 */ mtc1 $zero, $f4 +.L80242268: +/* EE0C28 80242268 3C014069 */ lui $at, 0x4069 +/* EE0C2C 8024226C 44811800 */ mtc1 $at, $f3 +/* EE0C30 80242270 44801000 */ mtc1 $zero, $f2 +/* EE0C34 80242274 46002021 */ cvt.d.s $f0, $f4 +/* EE0C38 80242278 4620103C */ c.lt.d $f2, $f0 +/* EE0C3C 8024227C 00000000 */ nop +/* EE0C40 80242280 45000003 */ bc1f .L80242290 +/* EE0C44 80242284 240200C8 */ addiu $v0, $zero, 0xc8 +/* EE0C48 80242288 3C014348 */ lui $at, 0x4348 +/* EE0C4C 8024228C 44812000 */ mtc1 $at, $f4 +.L80242290: +/* EE0C50 80242290 AFA20010 */ sw $v0, 0x10($sp) +/* EE0C54 80242294 8EC50000 */ lw $a1, ($s6) +/* EE0C58 80242298 8EC60018 */ lw $a2, 0x18($s6) +/* EE0C5C 8024229C 4600218D */ trunc.w.s $f6, $f4 +/* EE0C60 802422A0 44073000 */ mfc1 $a3, $f6 +/* EE0C64 802422A4 0C00ADA9 */ jal func_8002B6A4 +/* EE0C68 802422A8 0000202D */ daddu $a0, $zero, $zero +/* EE0C6C 802422AC 44050000 */ mfc1 $a1, $f0 +/* EE0C70 802422B0 8E46000C */ lw $a2, 0xc($s2) +/* EE0C74 802422B4 0240202D */ daddu $a0, $s2, $zero +/* EE0C78 802422B8 0C00F909 */ jal func_8003E424 +/* EE0C7C 802422BC AC850018 */ sw $a1, 0x18($a0) +/* EE0C80 802422C0 0000102D */ daddu $v0, $zero, $zero +.L802422C4: +/* EE0C84 802422C4 8FBF005C */ lw $ra, 0x5c($sp) +/* EE0C88 802422C8 8FB60058 */ lw $s6, 0x58($sp) +/* EE0C8C 802422CC 8FB50054 */ lw $s5, 0x54($sp) +/* EE0C90 802422D0 8FB40050 */ lw $s4, 0x50($sp) +/* EE0C94 802422D4 8FB3004C */ lw $s3, 0x4c($sp) +/* EE0C98 802422D8 8FB20048 */ lw $s2, 0x48($sp) +/* EE0C9C 802422DC 8FB10044 */ lw $s1, 0x44($sp) +/* EE0CA0 802422E0 8FB00040 */ lw $s0, 0x40($sp) +/* EE0CA4 802422E4 D7B40060 */ ldc1 $f20, 0x60($sp) +/* EE0CA8 802422E8 03E00008 */ jr $ra +/* EE0CAC 802422EC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/code_EDEA00/func_802422F0_EE0CB0.s b/asm/nonmatchings/code_EDEA00/func_802422F0_EE0CB0.s new file mode 100644 index 0000000000..042055edc7 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_802422F0_EE0CB0.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422F0_EE0CB0 +/* EE0CB0 802422F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EE0CB4 802422F4 AFB20018 */ sw $s2, 0x18($sp) +/* EE0CB8 802422F8 0080902D */ daddu $s2, $a0, $zero +/* EE0CBC 802422FC AFBF001C */ sw $ra, 0x1c($sp) +/* EE0CC0 80242300 AFB10014 */ sw $s1, 0x14($sp) +/* EE0CC4 80242304 AFB00010 */ sw $s0, 0x10($sp) +/* EE0CC8 80242308 8E510148 */ lw $s1, 0x148($s2) +/* EE0CCC 8024230C 0C00F92F */ jal func_8003E4BC +/* EE0CD0 80242310 86240008 */ lh $a0, 8($s1) +/* EE0CD4 80242314 0040802D */ daddu $s0, $v0, $zero +/* EE0CD8 80242318 8E2300CC */ lw $v1, 0xcc($s1) +/* EE0CDC 8024231C C60C0038 */ lwc1 $f12, 0x38($s0) +/* EE0CE0 80242320 8C630020 */ lw $v1, 0x20($v1) +/* EE0CE4 80242324 AE030028 */ sw $v1, 0x28($s0) +/* EE0CE8 80242328 96220076 */ lhu $v0, 0x76($s1) +/* EE0CEC 8024232C A602008E */ sh $v0, 0x8e($s0) +/* EE0CF0 80242330 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EE0CF4 80242334 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EE0CF8 80242338 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EE0CFC 8024233C 8C460028 */ lw $a2, 0x28($v0) +/* EE0D00 80242340 0C00ABDC */ jal fio_validate_header_checksums +/* EE0D04 80242344 8C470030 */ lw $a3, 0x30($v0) +/* EE0D08 80242348 2402000D */ addiu $v0, $zero, 0xd +/* EE0D0C 8024234C E600000C */ swc1 $f0, 0xc($s0) +/* EE0D10 80242350 AE420070 */ sw $v0, 0x70($s2) +/* EE0D14 80242354 8FBF001C */ lw $ra, 0x1c($sp) +/* EE0D18 80242358 8FB20018 */ lw $s2, 0x18($sp) +/* EE0D1C 8024235C 8FB10014 */ lw $s1, 0x14($sp) +/* EE0D20 80242360 8FB00010 */ lw $s0, 0x10($sp) +/* EE0D24 80242364 03E00008 */ jr $ra +/* EE0D28 80242368 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EDEA00/func_8024236C_EE0D2C.s b/asm/nonmatchings/code_EDEA00/func_8024236C_EE0D2C.s new file mode 100644 index 0000000000..1f8aa64ec5 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_8024236C_EE0D2C.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024236C_EE0D2C +/* EE0D2C 8024236C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EE0D30 80242370 AFB3001C */ sw $s3, 0x1c($sp) +/* EE0D34 80242374 0080982D */ daddu $s3, $a0, $zero +/* EE0D38 80242378 AFBF0020 */ sw $ra, 0x20($sp) +/* EE0D3C 8024237C AFB20018 */ sw $s2, 0x18($sp) +/* EE0D40 80242380 AFB10014 */ sw $s1, 0x14($sp) +/* EE0D44 80242384 AFB00010 */ sw $s0, 0x10($sp) +/* EE0D48 80242388 8E710148 */ lw $s1, 0x148($s3) +/* EE0D4C 8024238C 86240008 */ lh $a0, 8($s1) +/* EE0D50 80242390 0C00F92F */ jal func_8003E4BC +/* EE0D54 80242394 00A0902D */ daddu $s2, $a1, $zero +/* EE0D58 80242398 0040802D */ daddu $s0, $v0, $zero +/* EE0D5C 8024239C 8602008E */ lh $v0, 0x8e($s0) +/* EE0D60 802423A0 9603008E */ lhu $v1, 0x8e($s0) +/* EE0D64 802423A4 18400005 */ blez $v0, .L802423BC +/* EE0D68 802423A8 2462FFFF */ addiu $v0, $v1, -1 +/* EE0D6C 802423AC A602008E */ sh $v0, 0x8e($s0) +/* EE0D70 802423B0 00021400 */ sll $v0, $v0, 0x10 +/* EE0D74 802423B4 1C400033 */ bgtz $v0, .L80242484 +/* EE0D78 802423B8 00000000 */ nop +.L802423BC: +/* EE0D7C 802423BC 8602008C */ lh $v0, 0x8c($s0) +/* EE0D80 802423C0 14400030 */ bnez $v0, .L80242484 +/* EE0D84 802423C4 00000000 */ nop +/* EE0D88 802423C8 8E2200CC */ lw $v0, 0xcc($s1) +/* EE0D8C 802423CC 8C420024 */ lw $v0, 0x24($v0) +/* EE0D90 802423D0 AE020028 */ sw $v0, 0x28($s0) +/* EE0D94 802423D4 C6400018 */ lwc1 $f0, 0x18($s2) +/* EE0D98 802423D8 E6000018 */ swc1 $f0, 0x18($s0) +/* EE0D9C 802423DC 8E230088 */ lw $v1, 0x88($s1) +/* EE0DA0 802423E0 24020005 */ addiu $v0, $zero, 5 +/* EE0DA4 802423E4 10620005 */ beq $v1, $v0, .L802423FC +/* EE0DA8 802423E8 00000000 */ nop +/* EE0DAC 802423EC 10600003 */ beqz $v1, .L802423FC +/* EE0DB0 802423F0 24020001 */ addiu $v0, $zero, 1 +/* EE0DB4 802423F4 14620006 */ bne $v1, $v0, .L80242410 +/* EE0DB8 802423F8 00000000 */ nop +.L802423FC: +/* EE0DBC 802423FC 8E220084 */ lw $v0, 0x84($s1) +/* EE0DC0 80242400 00021FC2 */ srl $v1, $v0, 0x1f +/* EE0DC4 80242404 00431021 */ addu $v0, $v0, $v1 +/* EE0DC8 80242408 00021043 */ sra $v0, $v0, 1 +/* EE0DCC 8024240C A60200A8 */ sh $v0, 0xa8($s0) +.L80242410: +/* EE0DD0 80242410 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EE0DD4 80242414 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EE0DD8 80242418 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EE0DDC 8024241C C60E0040 */ lwc1 $f14, 0x40($s0) +/* EE0DE0 80242420 8C460028 */ lw $a2, 0x28($v0) +/* EE0DE4 80242424 0C00AC71 */ jal func_8002B1C4 +/* EE0DE8 80242428 8C470030 */ lw $a3, 0x30($v0) +/* EE0DEC 8024242C C6020018 */ lwc1 $f2, 0x18($s0) +/* EE0DF0 80242430 46020003 */ div.s $f0, $f0, $f2 +/* EE0DF4 80242434 3C018024 */ lui $at, %hi(D_80247B50) +/* EE0DF8 80242438 D4227B50 */ ldc1 $f2, %lo(D_80247B50)($at) +/* EE0DFC 8024243C 46000021 */ cvt.d.s $f0, $f0 +/* EE0E00 80242440 46220000 */ add.d $f0, $f0, $f2 +/* EE0E04 80242444 4620010D */ trunc.w.d $f4, $f0 +/* EE0E08 80242448 44022000 */ mfc1 $v0, $f4 +/* EE0E0C 8024244C 00000000 */ nop +/* EE0E10 80242450 A602008E */ sh $v0, 0x8e($s0) +/* EE0E14 80242454 00021400 */ sll $v0, $v0, 0x10 +/* EE0E18 80242458 8E230078 */ lw $v1, 0x78($s1) +/* EE0E1C 8024245C 00021403 */ sra $v0, $v0, 0x10 +/* EE0E20 80242460 0043102A */ slt $v0, $v0, $v1 +/* EE0E24 80242464 10400003 */ beqz $v0, .L80242474 +/* EE0E28 80242468 00000000 */ nop +/* EE0E2C 8024246C 9622007A */ lhu $v0, 0x7a($s1) +/* EE0E30 80242470 A602008E */ sh $v0, 0x8e($s0) +.L80242474: +/* EE0E34 80242474 8602008E */ lh $v0, 0x8e($s0) +/* EE0E38 80242478 AE22007C */ sw $v0, 0x7c($s1) +/* EE0E3C 8024247C 2402000E */ addiu $v0, $zero, 0xe +/* EE0E40 80242480 AE620070 */ sw $v0, 0x70($s3) +.L80242484: +/* EE0E44 80242484 8FBF0020 */ lw $ra, 0x20($sp) +/* EE0E48 80242488 8FB3001C */ lw $s3, 0x1c($sp) +/* EE0E4C 8024248C 8FB20018 */ lw $s2, 0x18($sp) +/* EE0E50 80242490 8FB10014 */ lw $s1, 0x14($sp) +/* EE0E54 80242494 8FB00010 */ lw $s0, 0x10($sp) +/* EE0E58 80242498 03E00008 */ jr $ra +/* EE0E5C 8024249C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EDEA00/func_802424A0_EE0E60.s b/asm/nonmatchings/code_EDEA00/func_802424A0_EE0E60.s new file mode 100644 index 0000000000..4711189901 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_802424A0_EE0E60.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424A0_EE0E60 +/* EE0E60 802424A0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EE0E64 802424A4 AFB3003C */ sw $s3, 0x3c($sp) +/* EE0E68 802424A8 0080982D */ daddu $s3, $a0, $zero +/* EE0E6C 802424AC AFBF0040 */ sw $ra, 0x40($sp) +/* EE0E70 802424B0 AFB20038 */ sw $s2, 0x38($sp) +/* EE0E74 802424B4 AFB10034 */ sw $s1, 0x34($sp) +/* EE0E78 802424B8 AFB00030 */ sw $s0, 0x30($sp) +/* EE0E7C 802424BC 8E710148 */ lw $s1, 0x148($s3) +/* EE0E80 802424C0 0C00F92F */ jal func_8003E4BC +/* EE0E84 802424C4 86240008 */ lh $a0, 8($s1) +/* EE0E88 802424C8 0040802D */ daddu $s0, $v0, $zero +/* EE0E8C 802424CC 8E22007C */ lw $v0, 0x7c($s1) +/* EE0E90 802424D0 8603008E */ lh $v1, 0x8e($s0) +/* EE0E94 802424D4 2442FFFF */ addiu $v0, $v0, -1 +/* EE0E98 802424D8 14620012 */ bne $v1, $v0, .L80242524 +/* EE0E9C 802424DC 00000000 */ nop +/* EE0EA0 802424E0 C6000038 */ lwc1 $f0, 0x38($s0) +/* EE0EA4 802424E4 4600020D */ trunc.w.s $f8, $f0 +/* EE0EA8 802424E8 44024000 */ mfc1 $v0, $f8 +/* EE0EAC 802424EC 00000000 */ nop +/* EE0EB0 802424F0 A6220010 */ sh $v0, 0x10($s1) +/* EE0EB4 802424F4 C600003C */ lwc1 $f0, 0x3c($s0) +/* EE0EB8 802424F8 4600020D */ trunc.w.s $f8, $f0 +/* EE0EBC 802424FC 44024000 */ mfc1 $v0, $f8 +/* EE0EC0 80242500 00000000 */ nop +/* EE0EC4 80242504 A6220012 */ sh $v0, 0x12($s1) +/* EE0EC8 80242508 C6000040 */ lwc1 $f0, 0x40($s0) +/* EE0ECC 8024250C 24020001 */ addiu $v0, $zero, 1 +/* EE0ED0 80242510 A2220007 */ sb $v0, 7($s1) +/* EE0ED4 80242514 4600020D */ trunc.w.s $f8, $f0 +/* EE0ED8 80242518 44024000 */ mfc1 $v0, $f8 +/* EE0EDC 8024251C 00000000 */ nop +/* EE0EE0 80242520 A6220014 */ sh $v0, 0x14($s1) +.L80242524: +/* EE0EE4 80242524 C6000038 */ lwc1 $f0, 0x38($s0) +/* EE0EE8 80242528 C602003C */ lwc1 $f2, 0x3c($s0) +/* EE0EEC 8024252C C6040040 */ lwc1 $f4, 0x40($s0) +/* EE0EF0 80242530 C6060018 */ lwc1 $f6, 0x18($s0) +/* EE0EF4 80242534 E7A00020 */ swc1 $f0, 0x20($sp) +/* EE0EF8 80242538 E7A20024 */ swc1 $f2, 0x24($sp) +/* EE0EFC 8024253C E7A40028 */ swc1 $f4, 0x28($sp) +/* EE0F00 80242540 E7A60010 */ swc1 $f6, 0x10($sp) +/* EE0F04 80242544 C600000C */ lwc1 $f0, 0xc($s0) +/* EE0F08 80242548 E7A00014 */ swc1 $f0, 0x14($sp) +/* EE0F0C 8024254C 860200A8 */ lh $v0, 0xa8($s0) +/* EE0F10 80242550 27A50020 */ addiu $a1, $sp, 0x20 +/* EE0F14 80242554 44820000 */ mtc1 $v0, $f0 +/* EE0F18 80242558 00000000 */ nop +/* EE0F1C 8024255C 46800020 */ cvt.s.w $f0, $f0 +/* EE0F20 80242560 E7A00018 */ swc1 $f0, 0x18($sp) +/* EE0F24 80242564 860200A6 */ lh $v0, 0xa6($s0) +/* EE0F28 80242568 27A60024 */ addiu $a2, $sp, 0x24 +/* EE0F2C 8024256C 44820000 */ mtc1 $v0, $f0 +/* EE0F30 80242570 00000000 */ nop +/* EE0F34 80242574 46800020 */ cvt.s.w $f0, $f0 +/* EE0F38 80242578 E7A0001C */ swc1 $f0, 0x1c($sp) +/* EE0F3C 8024257C 8E040080 */ lw $a0, 0x80($s0) +/* EE0F40 80242580 0C0394C1 */ jal func_800E5304 +/* EE0F44 80242584 27A70028 */ addiu $a3, $sp, 0x28 +/* EE0F48 80242588 0040902D */ daddu $s2, $v0, $zero +/* EE0F4C 8024258C 16400005 */ bnez $s2, .L802425A4 +/* EE0F50 80242590 00000000 */ nop +/* EE0F54 80242594 8E050018 */ lw $a1, 0x18($s0) +/* EE0F58 80242598 8E06000C */ lw $a2, 0xc($s0) +/* EE0F5C 8024259C 0C00F909 */ jal func_8003E424 +/* EE0F60 802425A0 0200202D */ daddu $a0, $s0, $zero +.L802425A4: +/* EE0F64 802425A4 8602008E */ lh $v0, 0x8e($s0) +/* EE0F68 802425A8 9603008E */ lhu $v1, 0x8e($s0) +/* EE0F6C 802425AC 18400007 */ blez $v0, .L802425CC +/* EE0F70 802425B0 2462FFFF */ addiu $v0, $v1, -1 +/* EE0F74 802425B4 A602008E */ sh $v0, 0x8e($s0) +/* EE0F78 802425B8 00021400 */ sll $v0, $v0, 0x10 +/* EE0F7C 802425BC 18400003 */ blez $v0, .L802425CC +/* EE0F80 802425C0 00000000 */ nop +/* EE0F84 802425C4 12400008 */ beqz $s2, .L802425E8 +/* EE0F88 802425C8 00000000 */ nop +.L802425CC: +/* EE0F8C 802425CC 8E2200CC */ lw $v0, 0xcc($s1) +/* EE0F90 802425D0 A2200007 */ sb $zero, 7($s1) +/* EE0F94 802425D4 8C420028 */ lw $v0, 0x28($v0) +/* EE0F98 802425D8 A600008E */ sh $zero, 0x8e($s0) +/* EE0F9C 802425DC AE020028 */ sw $v0, 0x28($s0) +/* EE0FA0 802425E0 2402000F */ addiu $v0, $zero, 0xf +/* EE0FA4 802425E4 AE620070 */ sw $v0, 0x70($s3) +.L802425E8: +/* EE0FA8 802425E8 8FBF0040 */ lw $ra, 0x40($sp) +/* EE0FAC 802425EC 8FB3003C */ lw $s3, 0x3c($sp) +/* EE0FB0 802425F0 8FB20038 */ lw $s2, 0x38($sp) +/* EE0FB4 802425F4 8FB10034 */ lw $s1, 0x34($sp) +/* EE0FB8 802425F8 8FB00030 */ lw $s0, 0x30($sp) +/* EE0FBC 802425FC 03E00008 */ jr $ra +/* EE0FC0 80242600 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EDEA00/func_80242604_EE0FC4.s b/asm/nonmatchings/code_EDEA00/func_80242604_EE0FC4.s new file mode 100644 index 0000000000..bd4dbe01c6 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80242604_EE0FC4.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242604_EE0FC4 +/* EE0FC4 80242604 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EE0FC8 80242608 AFB10014 */ sw $s1, 0x14($sp) +/* EE0FCC 8024260C 0080882D */ daddu $s1, $a0, $zero +/* EE0FD0 80242610 AFBF0018 */ sw $ra, 0x18($sp) +/* EE0FD4 80242614 AFB00010 */ sw $s0, 0x10($sp) +/* EE0FD8 80242618 8E300148 */ lw $s0, 0x148($s1) +/* EE0FDC 8024261C 0C00F92F */ jal func_8003E4BC +/* EE0FE0 80242620 86040008 */ lh $a0, 8($s0) +/* EE0FE4 80242624 0040202D */ daddu $a0, $v0, $zero +/* EE0FE8 80242628 9482008E */ lhu $v0, 0x8e($a0) +/* EE0FEC 8024262C 24030003 */ addiu $v1, $zero, 3 +/* EE0FF0 80242630 24420001 */ addiu $v0, $v0, 1 +/* EE0FF4 80242634 A482008E */ sh $v0, 0x8e($a0) +/* EE0FF8 80242638 00021400 */ sll $v0, $v0, 0x10 +/* EE0FFC 8024263C 00021403 */ sra $v0, $v0, 0x10 +/* EE1000 80242640 14430003 */ bne $v0, $v1, .L80242650 +/* EE1004 80242644 00000000 */ nop +/* EE1008 80242648 96020086 */ lhu $v0, 0x86($s0) +/* EE100C 8024264C A48200A8 */ sh $v0, 0xa8($a0) +.L80242650: +/* EE1010 80242650 8482008E */ lh $v0, 0x8e($a0) +/* EE1014 80242654 8E030080 */ lw $v1, 0x80($s0) +/* EE1018 80242658 0043102A */ slt $v0, $v0, $v1 +/* EE101C 8024265C 14400004 */ bnez $v0, .L80242670 +/* EE1020 80242660 00000000 */ nop +/* EE1024 80242664 96020086 */ lhu $v0, 0x86($s0) +/* EE1028 80242668 A48200A8 */ sh $v0, 0xa8($a0) +/* EE102C 8024266C AE200070 */ sw $zero, 0x70($s1) +.L80242670: +/* EE1030 80242670 8FBF0018 */ lw $ra, 0x18($sp) +/* EE1034 80242674 8FB10014 */ lw $s1, 0x14($sp) +/* EE1038 80242678 8FB00010 */ lw $s0, 0x10($sp) +/* EE103C 8024267C 03E00008 */ jr $ra +/* EE1040 80242680 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s b/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s new file mode 100644 index 0000000000..4fc25f4e35 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s @@ -0,0 +1,312 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242684_EE1044 +/* EE1044 80242684 27BDFF90 */ addiu $sp, $sp, -0x70 +/* EE1048 80242688 AFB3005C */ sw $s3, 0x5c($sp) +/* EE104C 8024268C 0080982D */ daddu $s3, $a0, $zero +/* EE1050 80242690 AFBF0068 */ sw $ra, 0x68($sp) +/* EE1054 80242694 AFB50064 */ sw $s5, 0x64($sp) +/* EE1058 80242698 AFB40060 */ sw $s4, 0x60($sp) +/* EE105C 8024269C AFB20058 */ sw $s2, 0x58($sp) +/* EE1060 802426A0 AFB10054 */ sw $s1, 0x54($sp) +/* EE1064 802426A4 AFB00050 */ sw $s0, 0x50($sp) +/* EE1068 802426A8 8E710148 */ lw $s1, 0x148($s3) +/* EE106C 802426AC 86240008 */ lh $a0, 8($s1) +/* EE1070 802426B0 0C00F92F */ jal func_8003E4BC +/* EE1074 802426B4 00A0802D */ daddu $s0, $a1, $zero +/* EE1078 802426B8 8E63000C */ lw $v1, 0xc($s3) +/* EE107C 802426BC 0260202D */ daddu $a0, $s3, $zero +/* EE1080 802426C0 8C650000 */ lw $a1, ($v1) +/* EE1084 802426C4 0C0B53A3 */ jal func_802D4E8C +/* EE1088 802426C8 0040902D */ daddu $s2, $v0, $zero +/* EE108C 802426CC AFA00028 */ sw $zero, 0x28($sp) +/* EE1090 802426D0 8E2300D0 */ lw $v1, 0xd0($s1) +/* EE1094 802426D4 8C630030 */ lw $v1, 0x30($v1) +/* EE1098 802426D8 AFA3002C */ sw $v1, 0x2c($sp) +/* EE109C 802426DC 8E2300D0 */ lw $v1, 0xd0($s1) +/* EE10A0 802426E0 8C63001C */ lw $v1, 0x1c($v1) +/* EE10A4 802426E4 AFA30030 */ sw $v1, 0x30($sp) +/* EE10A8 802426E8 8E2300D0 */ lw $v1, 0xd0($s1) +/* EE10AC 802426EC 8C630024 */ lw $v1, 0x24($v1) +/* EE10B0 802426F0 AFA30034 */ sw $v1, 0x34($sp) +/* EE10B4 802426F4 8E2300D0 */ lw $v1, 0xd0($s1) +/* EE10B8 802426F8 8C630028 */ lw $v1, 0x28($v1) +/* EE10BC 802426FC AFA30038 */ sw $v1, 0x38($sp) +/* EE10C0 80242700 8E2300D0 */ lw $v1, 0xd0($s1) +/* EE10C4 80242704 3C0142C8 */ lui $at, 0x42c8 +/* EE10C8 80242708 44810000 */ mtc1 $at, $f0 +/* EE10CC 8024270C 8C63002C */ lw $v1, 0x2c($v1) +/* EE10D0 80242710 E7A00040 */ swc1 $f0, 0x40($sp) +/* EE10D4 80242714 A7A00044 */ sh $zero, 0x44($sp) +/* EE10D8 80242718 AFA3003C */ sw $v1, 0x3c($sp) +/* EE10DC 8024271C C6400038 */ lwc1 $f0, 0x38($s2) +/* EE10E0 80242720 E6200108 */ swc1 $f0, 0x108($s1) +/* EE10E4 80242724 C640003C */ lwc1 $f0, 0x3c($s2) +/* EE10E8 80242728 27B50028 */ addiu $s5, $sp, 0x28 +/* EE10EC 8024272C E620010C */ swc1 $f0, 0x10c($s1) +/* EE10F0 80242730 3C013C23 */ lui $at, 0x3c23 +/* EE10F4 80242734 3421D70A */ ori $at, $at, 0xd70a +/* EE10F8 80242738 44810000 */ mtc1 $at, $f0 +/* EE10FC 8024273C C6420040 */ lwc1 $f2, 0x40($s2) +/* EE1100 80242740 0040A02D */ daddu $s4, $v0, $zero +/* EE1104 80242744 E6200114 */ swc1 $f0, 0x114($s1) +/* EE1108 80242748 E6200118 */ swc1 $f0, 0x118($s1) +/* EE110C 8024274C 12000009 */ beqz $s0, .L80242774 +/* EE1110 80242750 E6220110 */ swc1 $f2, 0x110($s1) +/* EE1114 80242754 864300A8 */ lh $v1, 0xa8($s2) +/* EE1118 80242758 8E2200B0 */ lw $v0, 0xb0($s1) +/* EE111C 8024275C AE20008C */ sw $zero, 0x8c($s1) +/* EE1120 80242760 A22000B5 */ sb $zero, 0xb5($s1) +/* EE1124 80242764 34420008 */ ori $v0, $v0, 8 +/* EE1128 80242768 AE230084 */ sw $v1, 0x84($s1) +/* EE112C 8024276C 080909E1 */ j .L80242784 +/* EE1130 80242770 AE2200B0 */ sw $v0, 0xb0($s1) +.L80242774: +/* EE1134 80242774 8E2200B0 */ lw $v0, 0xb0($s1) +/* EE1138 80242778 30420004 */ andi $v0, $v0, 4 +/* EE113C 8024277C 10400047 */ beqz $v0, .L8024289C +/* EE1140 80242780 00000000 */ nop +.L80242784: +/* EE1144 80242784 AE600070 */ sw $zero, 0x70($s3) +/* EE1148 80242788 A640008E */ sh $zero, 0x8e($s2) +/* EE114C 8024278C 8E2300CC */ lw $v1, 0xcc($s1) +/* EE1150 80242790 2404F7FF */ addiu $a0, $zero, -0x801 +/* EE1154 80242794 A2200007 */ sb $zero, 7($s1) +/* EE1158 80242798 8E420000 */ lw $v0, ($s2) +/* EE115C 8024279C 8C630000 */ lw $v1, ($v1) +/* EE1160 802427A0 00441024 */ and $v0, $v0, $a0 +/* EE1164 802427A4 AE420000 */ sw $v0, ($s2) +/* EE1168 802427A8 AE430028 */ sw $v1, 0x28($s2) +/* EE116C 802427AC 96220086 */ lhu $v0, 0x86($s1) +/* EE1170 802427B0 A64200A8 */ sh $v0, 0xa8($s2) +/* EE1174 802427B4 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE1178 802427B8 AE200090 */ sw $zero, 0x90($s1) +/* EE117C 802427BC 8C420034 */ lw $v0, 0x34($v0) +/* EE1180 802427C0 14400006 */ bnez $v0, .L802427DC +/* EE1184 802427C4 2403FDFF */ addiu $v1, $zero, -0x201 +/* EE1188 802427C8 8E420000 */ lw $v0, ($s2) +/* EE118C 802427CC 2403FFF7 */ addiu $v1, $zero, -9 +/* EE1190 802427D0 34420200 */ ori $v0, $v0, 0x200 +/* EE1194 802427D4 080909FA */ j .L802427E8 +/* EE1198 802427D8 00431024 */ and $v0, $v0, $v1 +.L802427DC: +/* EE119C 802427DC 8E420000 */ lw $v0, ($s2) +/* EE11A0 802427E0 00431024 */ and $v0, $v0, $v1 +/* EE11A4 802427E4 34420008 */ ori $v0, $v0, 8 +.L802427E8: +/* EE11A8 802427E8 AE420000 */ sw $v0, ($s2) +/* EE11AC 802427EC 8E2200B0 */ lw $v0, 0xb0($s1) +/* EE11B0 802427F0 30420004 */ andi $v0, $v0, 4 +/* EE11B4 802427F4 1040001E */ beqz $v0, .L80242870 +/* EE11B8 802427F8 24040002 */ addiu $a0, $zero, 2 +/* EE11BC 802427FC 0240282D */ daddu $a1, $s2, $zero +/* EE11C0 80242800 0000302D */ daddu $a2, $zero, $zero +/* EE11C4 80242804 24020063 */ addiu $v0, $zero, 0x63 +/* EE11C8 80242808 AE620070 */ sw $v0, 0x70($s3) +/* EE11CC 8024280C AE600074 */ sw $zero, 0x74($s3) +/* EE11D0 80242810 864300A8 */ lh $v1, 0xa8($s2) +/* EE11D4 80242814 3C013F80 */ lui $at, 0x3f80 +/* EE11D8 80242818 44810000 */ mtc1 $at, $f0 +/* EE11DC 8024281C 3C014000 */ lui $at, 0x4000 +/* EE11E0 80242820 44811000 */ mtc1 $at, $f2 +/* EE11E4 80242824 3C01C1A0 */ lui $at, 0xc1a0 +/* EE11E8 80242828 44812000 */ mtc1 $at, $f4 +/* EE11EC 8024282C 24020028 */ addiu $v0, $zero, 0x28 +/* EE11F0 80242830 AFA2001C */ sw $v0, 0x1c($sp) +/* EE11F4 80242834 44833000 */ mtc1 $v1, $f6 +/* EE11F8 80242838 00000000 */ nop +/* EE11FC 8024283C 468031A0 */ cvt.s.w $f6, $f6 +/* EE1200 80242840 44073000 */ mfc1 $a3, $f6 +/* EE1204 80242844 27A20048 */ addiu $v0, $sp, 0x48 +/* EE1208 80242848 AFA20020 */ sw $v0, 0x20($sp) +/* EE120C 8024284C E7A00010 */ swc1 $f0, 0x10($sp) +/* EE1210 80242850 E7A20014 */ swc1 $f2, 0x14($sp) +/* EE1214 80242854 0C01D444 */ jal func_80075110 +/* EE1218 80242858 E7A40018 */ swc1 $f4, 0x18($sp) +/* EE121C 8024285C 8E2200B0 */ lw $v0, 0xb0($s1) +/* EE1220 80242860 2403FFFB */ addiu $v1, $zero, -5 +/* EE1224 80242864 00431024 */ and $v0, $v0, $v1 +/* EE1228 80242868 08090A27 */ j .L8024289C +/* EE122C 8024286C AE2200B0 */ sw $v0, 0xb0($s1) +.L80242870: +/* EE1230 80242870 8E220000 */ lw $v0, ($s1) +/* EE1234 80242874 3C034000 */ lui $v1, 0x4000 +/* EE1238 80242878 00431024 */ and $v0, $v0, $v1 +/* EE123C 8024287C 10400007 */ beqz $v0, .L8024289C +/* EE1240 80242880 3C03BFFF */ lui $v1, 0xbfff +/* EE1244 80242884 2402000C */ addiu $v0, $zero, 0xc +/* EE1248 80242888 AE620070 */ sw $v0, 0x70($s3) +/* EE124C 8024288C 8E220000 */ lw $v0, ($s1) +/* EE1250 80242890 3463FFFF */ ori $v1, $v1, 0xffff +/* EE1254 80242894 00431024 */ and $v0, $v0, $v1 +/* EE1258 80242898 AE220000 */ sw $v0, ($s1) +.L8024289C: +/* EE125C 8024289C 8E220090 */ lw $v0, 0x90($s1) +/* EE1260 802428A0 1840000C */ blez $v0, .L802428D4 +/* EE1264 802428A4 2442FFFF */ addiu $v0, $v0, -1 +/* EE1268 802428A8 14400087 */ bnez $v0, .L80242AC8 +/* EE126C 802428AC AE220090 */ sw $v0, 0x90($s1) +/* EE1270 802428B0 3C03FFAA */ lui $v1, 0xffaa +/* EE1274 802428B4 8E420028 */ lw $v0, 0x28($s2) +/* EE1278 802428B8 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* EE127C 802428BC 00431021 */ addu $v0, $v0, $v1 +/* EE1280 802428C0 2C420002 */ sltiu $v0, $v0, 2 +/* EE1284 802428C4 10400003 */ beqz $v0, .L802428D4 +/* EE1288 802428C8 3C020055 */ lui $v0, 0x55 +/* EE128C 802428CC 3442000C */ ori $v0, $v0, 0xc +/* EE1290 802428D0 AE420028 */ sw $v0, 0x28($s2) +.L802428D4: +/* EE1294 802428D4 8E630070 */ lw $v1, 0x70($s3) +/* EE1298 802428D8 2402000C */ addiu $v0, $zero, 0xc +/* EE129C 802428DC 10620048 */ beq $v1, $v0, .L80242A00 +/* EE12A0 802428E0 2862000D */ slti $v0, $v1, 0xd +/* EE12A4 802428E4 1040000F */ beqz $v0, .L80242924 +/* EE12A8 802428E8 24100001 */ addiu $s0, $zero, 1 +/* EE12AC 802428EC 1070001E */ beq $v1, $s0, .L80242968 +/* EE12B0 802428F0 28620002 */ slti $v0, $v1, 2 +/* EE12B4 802428F4 10400005 */ beqz $v0, .L8024290C +/* EE12B8 802428F8 24020002 */ addiu $v0, $zero, 2 +/* EE12BC 802428FC 10600015 */ beqz $v1, .L80242954 +/* EE12C0 80242900 0260202D */ daddu $a0, $s3, $zero +/* EE12C4 80242904 08090A97 */ j .L80242A5C +/* EE12C8 80242908 00000000 */ nop +.L8024290C: +/* EE12CC 8024290C 1062001C */ beq $v1, $v0, .L80242980 +/* EE12D0 80242910 24020003 */ addiu $v0, $zero, 3 +/* EE12D4 80242914 10620035 */ beq $v1, $v0, .L802429EC +/* EE12D8 80242918 0260202D */ daddu $a0, $s3, $zero +/* EE12DC 8024291C 08090A97 */ j .L80242A5C +/* EE12E0 80242920 00000000 */ nop +.L80242924: +/* EE12E4 80242924 2402000E */ addiu $v0, $zero, 0xe +/* EE12E8 80242928 1062003F */ beq $v1, $v0, .L80242A28 +/* EE12EC 8024292C 0062102A */ slt $v0, $v1, $v0 +/* EE12F0 80242930 14400038 */ bnez $v0, .L80242A14 +/* EE12F4 80242934 0260202D */ daddu $a0, $s3, $zero +/* EE12F8 80242938 2402000F */ addiu $v0, $zero, 0xf +/* EE12FC 8024293C 10620040 */ beq $v1, $v0, .L80242A40 +/* EE1300 80242940 24020063 */ addiu $v0, $zero, 0x63 +/* EE1304 80242944 10620043 */ beq $v1, $v0, .L80242A54 +/* EE1308 80242948 00000000 */ nop +/* EE130C 8024294C 08090A97 */ j .L80242A5C +/* EE1310 80242950 00000000 */ nop +.L80242954: +/* EE1314 80242954 0280282D */ daddu $a1, $s4, $zero +/* EE1318 80242958 0C013670 */ jal func_8004D9C0 +/* EE131C 8024295C 02A0302D */ daddu $a2, $s5, $zero +/* EE1320 80242960 96220086 */ lhu $v0, 0x86($s1) +/* EE1324 80242964 A64200A8 */ sh $v0, 0xa8($s2) +.L80242968: +/* EE1328 80242968 0260202D */ daddu $a0, $s3, $zero +/* EE132C 8024296C 0280282D */ daddu $a1, $s4, $zero +/* EE1330 80242970 0C0136B6 */ jal func_8004DAD8 +/* EE1334 80242974 02A0302D */ daddu $a2, $s5, $zero +/* EE1338 80242978 08090A97 */ j .L80242A5C +/* EE133C 8024297C 00000000 */ nop +.L80242980: +/* EE1340 80242980 0260202D */ daddu $a0, $s3, $zero +/* EE1344 80242984 0280282D */ daddu $a1, $s4, $zero +/* EE1348 80242988 0C0137D9 */ jal func_8004DF64 +/* EE134C 8024298C 02A0302D */ daddu $a2, $s5, $zero +/* EE1350 80242990 8E230088 */ lw $v1, 0x88($s1) +/* EE1354 80242994 24020006 */ addiu $v0, $zero, 6 +/* EE1358 80242998 14620014 */ bne $v1, $v0, .L802429EC +/* EE135C 8024299C 0260202D */ daddu $a0, $s3, $zero +/* EE1360 802429A0 0C00AB3B */ jal func_8002ACEC +/* EE1364 802429A4 24040064 */ addiu $a0, $zero, 0x64 +/* EE1368 802429A8 28420021 */ slti $v0, $v0, 0x21 +/* EE136C 802429AC 5040000F */ beql $v0, $zero, .L802429EC +/* EE1370 802429B0 0260202D */ daddu $a0, $s3, $zero +/* EE1374 802429B4 8E22008C */ lw $v0, 0x8c($s1) +/* EE1378 802429B8 10400005 */ beqz $v0, .L802429D0 +/* EE137C 802429BC 3C020055 */ lui $v0, 0x55 +/* EE1380 802429C0 3442002F */ ori $v0, $v0, 0x2f +/* EE1384 802429C4 AE20008C */ sw $zero, 0x8c($s1) +/* EE1388 802429C8 08090A77 */ j .L802429DC +/* EE138C 802429CC A22000B5 */ sb $zero, 0xb5($s1) +.L802429D0: +/* EE1390 802429D0 3442002E */ ori $v0, $v0, 0x2e +/* EE1394 802429D4 AE30008C */ sw $s0, 0x8c($s1) +/* EE1398 802429D8 A23000B5 */ sb $s0, 0xb5($s1) +.L802429DC: +/* EE139C 802429DC AE420028 */ sw $v0, 0x28($s2) +/* EE13A0 802429E0 24020007 */ addiu $v0, $zero, 7 +/* EE13A4 802429E4 08090AB2 */ j .L80242AC8 +/* EE13A8 802429E8 AE220090 */ sw $v0, 0x90($s1) +.L802429EC: +/* EE13AC 802429EC 0280282D */ daddu $a1, $s4, $zero +/* EE13B0 802429F0 0C013809 */ jal func_8004E024 +/* EE13B4 802429F4 02A0302D */ daddu $a2, $s5, $zero +/* EE13B8 802429F8 08090A97 */ j .L80242A5C +/* EE13BC 802429FC 00000000 */ nop +.L80242A00: +/* EE13C0 80242A00 0260202D */ daddu $a0, $s3, $zero +/* EE13C4 80242A04 0280282D */ daddu $a1, $s4, $zero +/* EE13C8 80242A08 0C0908BC */ jal func_802422F0_EE0CB0 +/* EE13CC 80242A0C 02A0302D */ daddu $a2, $s5, $zero +/* EE13D0 80242A10 0260202D */ daddu $a0, $s3, $zero +.L80242A14: +/* EE13D4 80242A14 0280282D */ daddu $a1, $s4, $zero +/* EE13D8 80242A18 0C0908DB */ jal func_8024236C_EE0D2C +/* EE13DC 80242A1C 02A0302D */ daddu $a2, $s5, $zero +/* EE13E0 80242A20 08090A97 */ j .L80242A5C +/* EE13E4 80242A24 00000000 */ nop +.L80242A28: +/* EE13E8 80242A28 0260202D */ daddu $a0, $s3, $zero +/* EE13EC 80242A2C 0280282D */ daddu $a1, $s4, $zero +/* EE13F0 80242A30 0C090928 */ jal func_802424A0_EE0E60 +/* EE13F4 80242A34 02A0302D */ daddu $a2, $s5, $zero +/* EE13F8 80242A38 08090A97 */ j .L80242A5C +/* EE13FC 80242A3C 00000000 */ nop +.L80242A40: +/* EE1400 80242A40 0280282D */ daddu $a1, $s4, $zero +/* EE1404 80242A44 0C090981 */ jal func_80242604_EE0FC4 +/* EE1408 80242A48 02A0302D */ daddu $a2, $s5, $zero +/* EE140C 80242A4C 08090A97 */ j .L80242A5C +/* EE1410 80242A50 00000000 */ nop +.L80242A54: +/* EE1414 80242A54 0C013AE3 */ jal func_8004EB8C +/* EE1418 80242A58 0260202D */ daddu $a0, $s3, $zero +.L80242A5C: +/* EE141C 80242A5C 8E230088 */ lw $v1, 0x88($s1) +/* EE1420 80242A60 24020006 */ addiu $v0, $zero, 6 +/* EE1424 80242A64 14620019 */ bne $v1, $v0, .L80242ACC +/* EE1428 80242A68 0000102D */ daddu $v0, $zero, $zero +/* EE142C 80242A6C 8E22008C */ lw $v0, 0x8c($s1) +/* EE1430 80242A70 10400003 */ beqz $v0, .L80242A80 +/* EE1434 80242A74 24020001 */ addiu $v0, $zero, 1 +/* EE1438 80242A78 08090AA1 */ j .L80242A84 +/* EE143C 80242A7C A22200B5 */ sb $v0, 0xb5($s1) +.L80242A80: +/* EE1440 80242A80 A22000B5 */ sb $zero, 0xb5($s1) +.L80242A84: +/* EE1444 80242A84 8E22008C */ lw $v0, 0x8c($s1) +/* EE1448 80242A88 1040000F */ beqz $v0, .L80242AC8 +/* EE144C 80242A8C 3C03FFAA */ lui $v1, 0xffaa +/* EE1450 80242A90 8E420028 */ lw $v0, 0x28($s2) +/* EE1454 80242A94 3463FFFC */ ori $v1, $v1, 0xfffc +/* EE1458 80242A98 00431821 */ addu $v1, $v0, $v1 +/* EE145C 80242A9C 2C620015 */ sltiu $v0, $v1, 0x15 +/* EE1460 80242AA0 10400009 */ beqz $v0, .L80242AC8 +/* EE1464 80242AA4 00031080 */ sll $v0, $v1, 2 +/* EE1468 80242AA8 3C018024 */ lui $at, %hi(D_80247B58) +/* EE146C 80242AAC 00220821 */ addu $at, $at, $v0 +/* EE1470 80242AB0 8C227B58 */ lw $v0, %lo(D_80247B58)($at) +/* EE1474 80242AB4 00400008 */ jr $v0 +/* EE1478 80242AB8 00000000 */ nop +/* EE147C 80242ABC 8E420028 */ lw $v0, 0x28($s2) +/* EE1480 80242AC0 24420001 */ addiu $v0, $v0, 1 +/* EE1484 80242AC4 AE420028 */ sw $v0, 0x28($s2) +.L80242AC8: +/* EE1488 80242AC8 0000102D */ daddu $v0, $zero, $zero +.L80242ACC: +/* EE148C 80242ACC 8FBF0068 */ lw $ra, 0x68($sp) +/* EE1490 80242AD0 8FB50064 */ lw $s5, 0x64($sp) +/* EE1494 80242AD4 8FB40060 */ lw $s4, 0x60($sp) +/* EE1498 80242AD8 8FB3005C */ lw $s3, 0x5c($sp) +/* EE149C 80242ADC 8FB20058 */ lw $s2, 0x58($sp) +/* EE14A0 80242AE0 8FB10054 */ lw $s1, 0x54($sp) +/* EE14A4 80242AE4 8FB00050 */ lw $s0, 0x50($sp) +/* EE14A8 80242AE8 03E00008 */ jr $ra +/* EE14AC 80242AEC 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/code_EDEA00/func_80242AF0_EE14B0.s b/asm/nonmatchings/code_EDEA00/func_80242AF0_EE14B0.s new file mode 100644 index 0000000000..f100cb618f --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80242AF0_EE14B0.s @@ -0,0 +1,627 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242AF0_EE14B0 +/* EE14B0 80242AF0 27BDFF68 */ addiu $sp, $sp, -0x98 +/* EE14B4 80242AF4 AFB5007C */ sw $s5, 0x7c($sp) +/* EE14B8 80242AF8 0080A82D */ daddu $s5, $a0, $zero +/* EE14BC 80242AFC AFBF0080 */ sw $ra, 0x80($sp) +/* EE14C0 80242B00 AFB40078 */ sw $s4, 0x78($sp) +/* EE14C4 80242B04 AFB30074 */ sw $s3, 0x74($sp) +/* EE14C8 80242B08 AFB20070 */ sw $s2, 0x70($sp) +/* EE14CC 80242B0C AFB1006C */ sw $s1, 0x6c($sp) +/* EE14D0 80242B10 AFB00068 */ sw $s0, 0x68($sp) +/* EE14D4 80242B14 F7B60090 */ sdc1 $f22, 0x90($sp) +/* EE14D8 80242B18 F7B40088 */ sdc1 $f20, 0x88($sp) +/* EE14DC 80242B1C 8EB20148 */ lw $s2, 0x148($s5) +/* EE14E0 80242B20 86440008 */ lh $a0, 8($s2) +/* EE14E4 80242B24 0C00F92F */ jal func_8003E4BC +/* EE14E8 80242B28 00A0802D */ daddu $s0, $a1, $zero +/* EE14EC 80242B2C 8EA3000C */ lw $v1, 0xc($s5) +/* EE14F0 80242B30 02A0202D */ daddu $a0, $s5, $zero +/* EE14F4 80242B34 8C650000 */ lw $a1, ($v1) +/* EE14F8 80242B38 0C0B53A3 */ jal func_802D4E8C +/* EE14FC 80242B3C 0040882D */ daddu $s1, $v0, $zero +/* EE1500 80242B40 AFA00028 */ sw $zero, 0x28($sp) +/* EE1504 80242B44 8E4300D0 */ lw $v1, 0xd0($s2) +/* EE1508 80242B48 8C630030 */ lw $v1, 0x30($v1) +/* EE150C 80242B4C AFA3002C */ sw $v1, 0x2c($sp) +/* EE1510 80242B50 8E4300D0 */ lw $v1, 0xd0($s2) +/* EE1514 80242B54 8C63001C */ lw $v1, 0x1c($v1) +/* EE1518 80242B58 AFA30030 */ sw $v1, 0x30($sp) +/* EE151C 80242B5C 8E4300D0 */ lw $v1, 0xd0($s2) +/* EE1520 80242B60 8C630024 */ lw $v1, 0x24($v1) +/* EE1524 80242B64 AFA30034 */ sw $v1, 0x34($sp) +/* EE1528 80242B68 8E4300D0 */ lw $v1, 0xd0($s2) +/* EE152C 80242B6C 8C630028 */ lw $v1, 0x28($v1) +/* EE1530 80242B70 AFA30038 */ sw $v1, 0x38($sp) +/* EE1534 80242B74 8E4300D0 */ lw $v1, 0xd0($s2) +/* EE1538 80242B78 3C014282 */ lui $at, 0x4282 +/* EE153C 80242B7C 44810000 */ mtc1 $at, $f0 +/* EE1540 80242B80 8C63002C */ lw $v1, 0x2c($v1) +/* EE1544 80242B84 E7A00040 */ swc1 $f0, 0x40($sp) +/* EE1548 80242B88 A7A00044 */ sh $zero, 0x44($sp) +/* EE154C 80242B8C AFA3003C */ sw $v1, 0x3c($sp) +/* EE1550 80242B90 C6200038 */ lwc1 $f0, 0x38($s1) +/* EE1554 80242B94 E6400108 */ swc1 $f0, 0x108($s2) +/* EE1558 80242B98 C620003C */ lwc1 $f0, 0x3c($s1) +/* EE155C 80242B9C 27B40028 */ addiu $s4, $sp, 0x28 +/* EE1560 80242BA0 E640010C */ swc1 $f0, 0x10c($s2) +/* EE1564 80242BA4 3C0138D1 */ lui $at, 0x38d1 +/* EE1568 80242BA8 3421B717 */ ori $at, $at, 0xb717 +/* EE156C 80242BAC 44810000 */ mtc1 $at, $f0 +/* EE1570 80242BB0 C6220040 */ lwc1 $f2, 0x40($s1) +/* EE1574 80242BB4 0040982D */ daddu $s3, $v0, $zero +/* EE1578 80242BB8 E6400114 */ swc1 $f0, 0x114($s2) +/* EE157C 80242BBC E6400118 */ swc1 $f0, 0x118($s2) +/* EE1580 80242BC0 12000007 */ beqz $s0, .L80242BE0 +/* EE1584 80242BC4 E6420110 */ swc1 $f2, 0x110($s2) +/* EE1588 80242BC8 8E4200B0 */ lw $v0, 0xb0($s2) +/* EE158C 80242BCC 862300A8 */ lh $v1, 0xa8($s1) +/* EE1590 80242BD0 34420008 */ ori $v0, $v0, 8 +/* EE1594 80242BD4 AE430084 */ sw $v1, 0x84($s2) +/* EE1598 80242BD8 08090AFC */ j .L80242BF0 +/* EE159C 80242BDC AE4200B0 */ sw $v0, 0xb0($s2) +.L80242BE0: +/* EE15A0 80242BE0 8E430094 */ lw $v1, 0x94($s2) +/* EE15A4 80242BE4 24020064 */ addiu $v0, $zero, 0x64 +/* EE15A8 80242BE8 1462001C */ bne $v1, $v0, .L80242C5C +/* EE15AC 80242BEC 00000000 */ nop +.L80242BF0: +/* EE15B0 80242BF0 24020064 */ addiu $v0, $zero, 0x64 +/* EE15B4 80242BF4 2404F7FF */ addiu $a0, $zero, -0x801 +/* EE15B8 80242BF8 AEA20070 */ sw $v0, 0x70($s5) +/* EE15BC 80242BFC A620008E */ sh $zero, 0x8e($s1) +/* EE15C0 80242C00 8E4300CC */ lw $v1, 0xcc($s2) +/* EE15C4 80242C04 8E220000 */ lw $v0, ($s1) +/* EE15C8 80242C08 3C01C47A */ lui $at, 0xc47a +/* EE15CC 80242C0C 44810000 */ mtc1 $at, $f0 +/* EE15D0 80242C10 8C630000 */ lw $v1, ($v1) +/* EE15D4 80242C14 00441024 */ and $v0, $v0, $a0 +/* EE15D8 80242C18 AE220000 */ sw $v0, ($s1) +/* EE15DC 80242C1C AE230028 */ sw $v1, 0x28($s1) +/* EE15E0 80242C20 8E420000 */ lw $v0, ($s2) +/* EE15E4 80242C24 3C030020 */ lui $v1, 0x20 +/* EE15E8 80242C28 00431025 */ or $v0, $v0, $v1 +/* EE15EC 80242C2C AE420000 */ sw $v0, ($s2) +/* EE15F0 80242C30 8E220000 */ lw $v0, ($s1) +/* EE15F4 80242C34 2403FDFF */ addiu $v1, $zero, -0x201 +/* EE15F8 80242C38 00431024 */ and $v0, $v0, $v1 +/* EE15FC 80242C3C 34420008 */ ori $v0, $v0, 8 +/* EE1600 80242C40 AE220000 */ sw $v0, ($s1) +/* EE1604 80242C44 2402FFFF */ addiu $v0, $zero, -1 +/* EE1608 80242C48 AE400094 */ sw $zero, 0x94($s2) +/* EE160C 80242C4C AE420098 */ sw $v0, 0x98($s2) +/* EE1610 80242C50 AE200038 */ sw $zero, 0x38($s1) +/* EE1614 80242C54 E620003C */ swc1 $f0, 0x3c($s1) +/* EE1618 80242C58 AE200040 */ sw $zero, 0x40($s1) +.L80242C5C: +/* EE161C 80242C5C 8E4200B0 */ lw $v0, 0xb0($s2) +/* EE1620 80242C60 30420004 */ andi $v0, $v0, 4 +/* EE1624 80242C64 10400030 */ beqz $v0, .L80242D28 +/* EE1628 80242C68 2403FFFB */ addiu $v1, $zero, -5 +/* EE162C 80242C6C A620008E */ sh $zero, 0x8e($s1) +/* EE1630 80242C70 96420086 */ lhu $v0, 0x86($s2) +/* EE1634 80242C74 A62200A8 */ sh $v0, 0xa8($s1) +/* EE1638 80242C78 8E4200B0 */ lw $v0, 0xb0($s2) +/* EE163C 80242C7C 00431024 */ and $v0, $v0, $v1 +/* EE1640 80242C80 AE4200B0 */ sw $v0, 0xb0($s2) +/* EE1644 80242C84 8E220000 */ lw $v0, ($s1) +/* EE1648 80242C88 30420800 */ andi $v0, $v0, 0x800 +/* EE164C 80242C8C 1040000A */ beqz $v0, .L80242CB8 +/* EE1650 80242C90 3C02004A */ lui $v0, 0x4a +/* EE1654 80242C94 3C013F80 */ lui $at, 0x3f80 +/* EE1658 80242C98 44810000 */ mtc1 $at, $f0 +/* EE165C 80242C9C 34420018 */ ori $v0, $v0, 0x18 +/* EE1660 80242CA0 AE220028 */ sw $v0, 0x28($s1) +/* EE1664 80242CA4 24020066 */ addiu $v0, $zero, 0x66 +/* EE1668 80242CA8 AE200018 */ sw $zero, 0x18($s1) +/* EE166C 80242CAC AE20001C */ sw $zero, 0x1c($s1) +/* EE1670 80242CB0 08090B49 */ j .L80242D24 +/* EE1674 80242CB4 E6200014 */ swc1 $f0, 0x14($s1) +.L80242CB8: +/* EE1678 80242CB8 24040002 */ addiu $a0, $zero, 2 +/* EE167C 80242CBC 0220282D */ daddu $a1, $s1, $zero +/* EE1680 80242CC0 0000302D */ daddu $a2, $zero, $zero +/* EE1684 80242CC4 862300A8 */ lh $v1, 0xa8($s1) +/* EE1688 80242CC8 3C013F80 */ lui $at, 0x3f80 +/* EE168C 80242CCC 44810000 */ mtc1 $at, $f0 +/* EE1690 80242CD0 3C014000 */ lui $at, 0x4000 +/* EE1694 80242CD4 44811000 */ mtc1 $at, $f2 +/* EE1698 80242CD8 3C01C1A0 */ lui $at, 0xc1a0 +/* EE169C 80242CDC 44812000 */ mtc1 $at, $f4 +/* EE16A0 80242CE0 24020028 */ addiu $v0, $zero, 0x28 +/* EE16A4 80242CE4 AFA2001C */ sw $v0, 0x1c($sp) +/* EE16A8 80242CE8 44834000 */ mtc1 $v1, $f8 +/* EE16AC 80242CEC 00000000 */ nop +/* EE16B0 80242CF0 46804220 */ cvt.s.w $f8, $f8 +/* EE16B4 80242CF4 44074000 */ mfc1 $a3, $f8 +/* EE16B8 80242CF8 27A20048 */ addiu $v0, $sp, 0x48 +/* EE16BC 80242CFC AFA20020 */ sw $v0, 0x20($sp) +/* EE16C0 80242D00 E7A00010 */ swc1 $f0, 0x10($sp) +/* EE16C4 80242D04 E7A20014 */ swc1 $f2, 0x14($sp) +/* EE16C8 80242D08 0C01D444 */ jal func_80075110 +/* EE16CC 80242D0C E7A40018 */ swc1 $f4, 0x18($sp) +/* EE16D0 80242D10 8E4200CC */ lw $v0, 0xcc($s2) +/* EE16D4 80242D14 8C420000 */ lw $v0, ($v0) +/* EE16D8 80242D18 AE220028 */ sw $v0, 0x28($s1) +/* EE16DC 80242D1C 240200C8 */ addiu $v0, $zero, 0xc8 +/* EE16E0 80242D20 AEA00074 */ sw $zero, 0x74($s5) +.L80242D24: +/* EE16E4 80242D24 AEA20070 */ sw $v0, 0x70($s5) +.L80242D28: +/* EE16E8 80242D28 27A2004C */ addiu $v0, $sp, 0x4c +/* EE16EC 80242D2C AFA20010 */ sw $v0, 0x10($sp) +/* EE16F0 80242D30 27A20050 */ addiu $v0, $sp, 0x50 +/* EE16F4 80242D34 AFA20014 */ sw $v0, 0x14($sp) +/* EE16F8 80242D38 27A20054 */ addiu $v0, $sp, 0x54 +/* EE16FC 80242D3C AFA20018 */ sw $v0, 0x18($sp) +/* EE1700 80242D40 8E250038 */ lw $a1, 0x38($s1) +/* EE1704 80242D44 8E26003C */ lw $a2, 0x3c($s1) +/* EE1708 80242D48 8E270040 */ lw $a3, 0x40($s1) +/* EE170C 80242D4C 0C00BF2F */ jal func_8002FCBC +/* EE1710 80242D50 0000202D */ daddu $a0, $zero, $zero +/* EE1714 80242D54 8EA20070 */ lw $v0, 0x70($s5) +/* EE1718 80242D58 28420064 */ slti $v0, $v0, 0x64 +/* EE171C 80242D5C 10400007 */ beqz $v0, .L80242D7C +/* EE1720 80242D60 00000000 */ nop +/* EE1724 80242D64 8FA2004C */ lw $v0, 0x4c($sp) +/* EE1728 80242D68 24420032 */ addiu $v0, $v0, 0x32 +/* EE172C 80242D6C 2C4201A5 */ sltiu $v0, $v0, 0x1a5 +/* EE1730 80242D70 14400002 */ bnez $v0, .L80242D7C +/* EE1734 80242D74 2402006E */ addiu $v0, $zero, 0x6e +/* EE1738 80242D78 AEA20070 */ sw $v0, 0x70($s5) +.L80242D7C: +/* EE173C 80242D7C 8EA30070 */ lw $v1, 0x70($s5) +/* EE1740 80242D80 2402000F */ addiu $v0, $zero, 0xf +/* EE1744 80242D84 1062006B */ beq $v1, $v0, .L80242F34 +/* EE1748 80242D88 28620010 */ slti $v0, $v1, 0x10 +/* EE174C 80242D8C 10400016 */ beqz $v0, .L80242DE8 +/* EE1750 80242D90 24020003 */ addiu $v0, $zero, 3 +/* EE1754 80242D94 10620051 */ beq $v1, $v0, .L80242EDC +/* EE1758 80242D98 28620004 */ slti $v0, $v1, 4 +/* EE175C 80242D9C 10400009 */ beqz $v0, .L80242DC4 +/* EE1760 80242DA0 24020001 */ addiu $v0, $zero, 1 +/* EE1764 80242DA4 10620044 */ beq $v1, $v0, .L80242EB8 +/* EE1768 80242DA8 28620002 */ slti $v0, $v1, 2 +/* EE176C 80242DAC 50400048 */ beql $v0, $zero, .L80242ED0 +/* EE1770 80242DB0 02A0202D */ daddu $a0, $s5, $zero +/* EE1774 80242DB4 50600027 */ beql $v1, $zero, .L80242E54 +/* EE1778 80242DB8 02A0202D */ daddu $a0, $s5, $zero +/* EE177C 80242DBC 08090CFA */ j .L802433E8 +/* EE1780 80242DC0 00000000 */ nop +.L80242DC4: +/* EE1784 80242DC4 2402000D */ addiu $v0, $zero, 0xd +/* EE1788 80242DC8 1062004D */ beq $v1, $v0, .L80242F00 +/* EE178C 80242DCC 2862000E */ slti $v0, $v1, 0xe +/* EE1790 80242DD0 10400052 */ beqz $v0, .L80242F1C +/* EE1794 80242DD4 2402000C */ addiu $v0, $zero, 0xc +/* EE1798 80242DD8 10620046 */ beq $v1, $v0, .L80242EF4 +/* EE179C 80242DDC 02A0202D */ daddu $a0, $s5, $zero +/* EE17A0 80242DE0 08090CFA */ j .L802433E8 +/* EE17A4 80242DE4 00000000 */ nop +.L80242DE8: +/* EE17A8 80242DE8 24020067 */ addiu $v0, $zero, 0x67 +/* EE17AC 80242DEC 10620158 */ beq $v1, $v0, .L80243350 +/* EE17B0 80242DF0 28620068 */ slti $v0, $v1, 0x68 +/* EE17B4 80242DF4 10400009 */ beqz $v0, .L80242E1C +/* EE17B8 80242DF8 24020065 */ addiu $v0, $zero, 0x65 +/* EE17BC 80242DFC 1062008F */ beq $v1, $v0, .L8024303C +/* EE17C0 80242E00 28620066 */ slti $v0, $v1, 0x66 +/* EE17C4 80242E04 104000A9 */ beqz $v0, .L802430AC +/* EE17C8 80242E08 24020064 */ addiu $v0, $zero, 0x64 +/* EE17CC 80242E0C 1062004F */ beq $v1, $v0, .L80242F4C +/* EE17D0 80242E10 24020002 */ addiu $v0, $zero, 2 +/* EE17D4 80242E14 08090CFA */ j .L802433E8 +/* EE17D8 80242E18 00000000 */ nop +.L80242E1C: +/* EE17DC 80242E1C 2404006F */ addiu $a0, $zero, 0x6f +/* EE17E0 80242E20 10640166 */ beq $v1, $a0, .L802433BC +/* EE17E4 80242E24 28620070 */ slti $v0, $v1, 0x70 +/* EE17E8 80242E28 10400005 */ beqz $v0, .L80242E40 +/* EE17EC 80242E2C 2402006E */ addiu $v0, $zero, 0x6e +/* EE17F0 80242E30 10620156 */ beq $v1, $v0, .L8024338C +/* EE17F4 80242E34 2402001E */ addiu $v0, $zero, 0x1e +/* EE17F8 80242E38 08090CFA */ j .L802433E8 +/* EE17FC 80242E3C 00000000 */ nop +.L80242E40: +/* EE1800 80242E40 240200C8 */ addiu $v0, $zero, 0xc8 +/* EE1804 80242E44 10620166 */ beq $v1, $v0, .L802433E0 +/* EE1808 80242E48 00000000 */ nop +/* EE180C 80242E4C 08090CFA */ j .L802433E8 +/* EE1810 80242E50 00000000 */ nop +.L80242E54: +/* EE1814 80242E54 0260282D */ daddu $a1, $s3, $zero +/* EE1818 80242E58 0C013670 */ jal func_8004D9C0 +/* EE181C 80242E5C 0280302D */ daddu $a2, $s4, $zero +/* EE1820 80242E60 96420086 */ lhu $v0, 0x86($s2) +/* EE1824 80242E64 A62200A8 */ sh $v0, 0xa8($s1) +/* EE1828 80242E68 8E4200A0 */ lw $v0, 0xa0($s2) +/* EE182C 80242E6C 10400013 */ beqz $v0, .L80242EBC +/* EE1830 80242E70 02A0202D */ daddu $a0, $s5, $zero +/* EE1834 80242E74 C620003C */ lwc1 $f0, 0x3c($s1) +/* EE1838 80242E78 44801000 */ mtc1 $zero, $f2 +/* EE183C 80242E7C 44801800 */ mtc1 $zero, $f3 +/* EE1840 80242E80 46000021 */ cvt.d.s $f0, $f0 +/* EE1844 80242E84 4622003E */ c.le.d $f0, $f2 +/* EE1848 80242E88 00000000 */ nop +/* EE184C 80242E8C 45000005 */ bc1f .L80242EA4 +/* EE1850 80242E90 2403FDFF */ addiu $v1, $zero, -0x201 +/* EE1854 80242E94 8E220000 */ lw $v0, ($s1) +/* EE1858 80242E98 00431024 */ and $v0, $v0, $v1 +/* EE185C 80242E9C 08090BAD */ j .L80242EB4 +/* EE1860 80242EA0 34420008 */ ori $v0, $v0, 8 +.L80242EA4: +/* EE1864 80242EA4 8E220000 */ lw $v0, ($s1) +/* EE1868 80242EA8 2403FFF7 */ addiu $v1, $zero, -9 +/* EE186C 80242EAC 34420200 */ ori $v0, $v0, 0x200 +/* EE1870 80242EB0 00431024 */ and $v0, $v0, $v1 +.L80242EB4: +/* EE1874 80242EB4 AE220000 */ sw $v0, ($s1) +.L80242EB8: +/* EE1878 80242EB8 02A0202D */ daddu $a0, $s5, $zero +.L80242EBC: +/* EE187C 80242EBC 0260282D */ daddu $a1, $s3, $zero +/* EE1880 80242EC0 0C0136B6 */ jal func_8004DAD8 +/* EE1884 80242EC4 0280302D */ daddu $a2, $s4, $zero +/* EE1888 80242EC8 08090CFA */ j .L802433E8 +/* EE188C 80242ECC 00000000 */ nop +.L80242ED0: +/* EE1890 80242ED0 0260282D */ daddu $a1, $s3, $zero +/* EE1894 80242ED4 0C0137D9 */ jal func_8004DF64 +/* EE1898 80242ED8 0280302D */ daddu $a2, $s4, $zero +.L80242EDC: +/* EE189C 80242EDC 02A0202D */ daddu $a0, $s5, $zero +/* EE18A0 80242EE0 0260282D */ daddu $a1, $s3, $zero +/* EE18A4 80242EE4 0C013809 */ jal func_8004E024 +/* EE18A8 80242EE8 0280302D */ daddu $a2, $s4, $zero +/* EE18AC 80242EEC 08090CFA */ j .L802433E8 +/* EE18B0 80242EF0 00000000 */ nop +.L80242EF4: +/* EE18B4 80242EF4 0260282D */ daddu $a1, $s3, $zero +/* EE18B8 80242EF8 0C0908BC */ jal func_802422F0_EE0CB0 +/* EE18BC 80242EFC 0280302D */ daddu $a2, $s4, $zero +.L80242F00: +/* EE18C0 80242F00 02A0202D */ daddu $a0, $s5, $zero +/* EE18C4 80242F04 0260282D */ daddu $a1, $s3, $zero +/* EE18C8 80242F08 0C0908DB */ jal func_8024236C_EE0D2C +/* EE18CC 80242F0C 0280302D */ daddu $a2, $s4, $zero +/* EE18D0 80242F10 96420086 */ lhu $v0, 0x86($s2) +/* EE18D4 80242F14 08090CFA */ j .L802433E8 +/* EE18D8 80242F18 A62200A8 */ sh $v0, 0xa8($s1) +.L80242F1C: +/* EE18DC 80242F1C 02A0202D */ daddu $a0, $s5, $zero +/* EE18E0 80242F20 0260282D */ daddu $a1, $s3, $zero +/* EE18E4 80242F24 0C090928 */ jal func_802424A0_EE0E60 +/* EE18E8 80242F28 0280302D */ daddu $a2, $s4, $zero +/* EE18EC 80242F2C 08090CFA */ j .L802433E8 +/* EE18F0 80242F30 00000000 */ nop +.L80242F34: +/* EE18F4 80242F34 02A0202D */ daddu $a0, $s5, $zero +/* EE18F8 80242F38 0260282D */ daddu $a1, $s3, $zero +/* EE18FC 80242F3C 0C090981 */ jal func_80242604_EE0FC4 +/* EE1900 80242F40 0280302D */ daddu $a2, $s4, $zero +/* EE1904 80242F44 08090CFA */ j .L802433E8 +/* EE1908 80242F48 00000000 */ nop +.L80242F4C: +/* EE190C 80242F4C 8E430094 */ lw $v1, 0x94($s2) +/* EE1910 80242F50 14620125 */ bne $v1, $v0, .L802433E8 +/* EE1914 80242F54 00000000 */ nop +/* EE1918 80242F58 0C010ABD */ jal func_80042AF4 +/* EE191C 80242F5C 8E440098 */ lw $a0, 0x98($s2) +/* EE1920 80242F60 0C00F92F */ jal func_8003E4BC +/* EE1924 80242F64 84440008 */ lh $a0, 8($v0) +/* EE1928 80242F68 C440000C */ lwc1 $f0, 0xc($v0) +/* EE192C 80242F6C 3C018024 */ lui $at, %hi(D_80247BB0) +/* EE1930 80242F70 D4227BB0 */ ldc1 $f2, %lo(D_80247BB0)($at) +/* EE1934 80242F74 46000021 */ cvt.d.s $f0, $f0 +/* EE1938 80242F78 4622003C */ c.lt.d $f0, $f2 +/* EE193C 80242F7C 00000000 */ nop +/* EE1940 80242F80 45000008 */ bc1f .L80242FA4 +/* EE1944 80242F84 00000000 */ nop +/* EE1948 80242F88 C4400038 */ lwc1 $f0, 0x38($v0) +/* EE194C 80242F8C 3C014028 */ lui $at, 0x4028 +/* EE1950 80242F90 44811800 */ mtc1 $at, $f3 +/* EE1954 80242F94 44801000 */ mtc1 $zero, $f2 +/* EE1958 80242F98 46000021 */ cvt.d.s $f0, $f0 +/* EE195C 80242F9C 08090BEF */ j .L80242FBC +/* EE1960 80242FA0 46220000 */ add.d $f0, $f0, $f2 +.L80242FA4: +/* EE1964 80242FA4 C4400038 */ lwc1 $f0, 0x38($v0) +/* EE1968 80242FA8 3C014028 */ lui $at, 0x4028 +/* EE196C 80242FAC 44811800 */ mtc1 $at, $f3 +/* EE1970 80242FB0 44801000 */ mtc1 $zero, $f2 +/* EE1974 80242FB4 46000021 */ cvt.d.s $f0, $f0 +/* EE1978 80242FB8 46220001 */ sub.d $f0, $f0, $f2 +.L80242FBC: +/* EE197C 80242FBC 46200020 */ cvt.s.d $f0, $f0 +/* EE1980 80242FC0 E6200038 */ swc1 $f0, 0x38($s1) +/* EE1984 80242FC4 3C04004A */ lui $a0, 0x4a +/* EE1988 80242FC8 C440003C */ lwc1 $f0, 0x3c($v0) +/* EE198C 80242FCC 3C014039 */ lui $at, 0x4039 +/* EE1990 80242FD0 44811800 */ mtc1 $at, $f3 +/* EE1994 80242FD4 44801000 */ mtc1 $zero, $f2 +/* EE1998 80242FD8 46000021 */ cvt.d.s $f0, $f0 +/* EE199C 80242FDC 46220000 */ add.d $f0, $f0, $f2 +/* EE19A0 80242FE0 34840018 */ ori $a0, $a0, 0x18 +/* EE19A4 80242FE4 3C013FF0 */ lui $at, 0x3ff0 +/* EE19A8 80242FE8 44811800 */ mtc1 $at, $f3 +/* EE19AC 80242FEC 44801000 */ mtc1 $zero, $f2 +/* EE19B0 80242FF0 46200020 */ cvt.s.d $f0, $f0 +/* EE19B4 80242FF4 E620003C */ swc1 $f0, 0x3c($s1) +/* EE19B8 80242FF8 C4400040 */ lwc1 $f0, 0x40($v0) +/* EE19BC 80242FFC 8E220000 */ lw $v0, ($s1) +/* EE19C0 80243000 2403FFFD */ addiu $v1, $zero, -3 +/* EE19C4 80243004 AE200048 */ sw $zero, 0x48($s1) +/* EE19C8 80243008 AE200034 */ sw $zero, 0x34($s1) +/* EE19CC 8024300C AE240028 */ sw $a0, 0x28($s1) +/* EE19D0 80243010 34420008 */ ori $v0, $v0, 8 +/* EE19D4 80243014 00431024 */ and $v0, $v0, $v1 +/* EE19D8 80243018 2403FDFF */ addiu $v1, $zero, -0x201 +/* EE19DC 8024301C 00431024 */ and $v0, $v0, $v1 +/* EE19E0 80243020 46000021 */ cvt.d.s $f0, $f0 +/* EE19E4 80243024 46220000 */ add.d $f0, $f0, $f2 +/* EE19E8 80243028 AE220000 */ sw $v0, ($s1) +/* EE19EC 8024302C 24020065 */ addiu $v0, $zero, 0x65 +/* EE19F0 80243030 46200020 */ cvt.s.d $f0, $f0 +/* EE19F4 80243034 E6200040 */ swc1 $f0, 0x40($s1) +/* EE19F8 80243038 AEA20070 */ sw $v0, 0x70($s5) +.L8024303C: +/* EE19FC 8024303C 8E430094 */ lw $v1, 0x94($s2) +/* EE1A00 80243040 24020003 */ addiu $v0, $zero, 3 +/* EE1A04 80243044 146200E8 */ bne $v1, $v0, .L802433E8 +/* EE1A08 80243048 24020004 */ addiu $v0, $zero, 4 +/* EE1A0C 8024304C AE420094 */ sw $v0, 0x94($s2) +/* EE1A10 80243050 C62C0038 */ lwc1 $f12, 0x38($s1) +/* EE1A14 80243054 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EE1A18 80243058 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EE1A1C 8024305C C62E0040 */ lwc1 $f14, 0x40($s1) +/* EE1A20 80243060 8C460028 */ lw $a2, 0x28($v0) +/* EE1A24 80243064 0C00ABDC */ jal fio_validate_header_checksums +/* EE1A28 80243068 8C470030 */ lw $a3, 0x30($v0) +/* EE1A2C 8024306C 3C014020 */ lui $at, 0x4020 +/* EE1A30 80243070 44811000 */ mtc1 $at, $f2 +/* EE1A34 80243074 3C014100 */ lui $at, 0x4100 +/* EE1A38 80243078 44812000 */ mtc1 $at, $f4 +/* EE1A3C 8024307C 3C013F4C */ lui $at, 0x3f4c +/* EE1A40 80243080 3421CCCD */ ori $at, $at, 0xcccd +/* EE1A44 80243084 44813000 */ mtc1 $at, $f6 +/* EE1A48 80243088 8E220000 */ lw $v0, ($s1) +/* EE1A4C 8024308C E620000C */ swc1 $f0, 0xc($s1) +/* EE1A50 80243090 34420800 */ ori $v0, $v0, 0x800 +/* EE1A54 80243094 AE220000 */ sw $v0, ($s1) +/* EE1A58 80243098 24020066 */ addiu $v0, $zero, 0x66 +/* EE1A5C 8024309C E6220018 */ swc1 $f2, 0x18($s1) +/* EE1A60 802430A0 E624001C */ swc1 $f4, 0x1c($s1) +/* EE1A64 802430A4 E6260014 */ swc1 $f6, 0x14($s1) +/* EE1A68 802430A8 AEA20070 */ sw $v0, 0x70($s5) +.L802430AC: +/* EE1A6C 802430AC C6200018 */ lwc1 $f0, 0x18($s1) +/* EE1A70 802430B0 44801000 */ mtc1 $zero, $f2 +/* EE1A74 802430B4 44801800 */ mtc1 $zero, $f3 +/* EE1A78 802430B8 46000021 */ cvt.d.s $f0, $f0 +/* EE1A7C 802430BC 4620103C */ c.lt.d $f2, $f0 +/* EE1A80 802430C0 00000000 */ nop +/* EE1A84 802430C4 4500001F */ bc1f .L80243144 +/* EE1A88 802430C8 27A50058 */ addiu $a1, $sp, 0x58 +/* EE1A8C 802430CC C6200038 */ lwc1 $f0, 0x38($s1) +/* EE1A90 802430D0 C622003C */ lwc1 $f2, 0x3c($s1) +/* EE1A94 802430D4 C6240040 */ lwc1 $f4, 0x40($s1) +/* EE1A98 802430D8 C6260018 */ lwc1 $f6, 0x18($s1) +/* EE1A9C 802430DC E7A00058 */ swc1 $f0, 0x58($sp) +/* EE1AA0 802430E0 E7A2005C */ swc1 $f2, 0x5c($sp) +/* EE1AA4 802430E4 E7A40060 */ swc1 $f4, 0x60($sp) +/* EE1AA8 802430E8 E7A60010 */ swc1 $f6, 0x10($sp) +/* EE1AAC 802430EC C620000C */ lwc1 $f0, 0xc($s1) +/* EE1AB0 802430F0 E7A00014 */ swc1 $f0, 0x14($sp) +/* EE1AB4 802430F4 862200A8 */ lh $v0, 0xa8($s1) +/* EE1AB8 802430F8 44820000 */ mtc1 $v0, $f0 +/* EE1ABC 802430FC 00000000 */ nop +/* EE1AC0 80243100 46800020 */ cvt.s.w $f0, $f0 +/* EE1AC4 80243104 E7A00018 */ swc1 $f0, 0x18($sp) +/* EE1AC8 80243108 862200A6 */ lh $v0, 0xa6($s1) +/* EE1ACC 8024310C 27A6005C */ addiu $a2, $sp, 0x5c +/* EE1AD0 80243110 44820000 */ mtc1 $v0, $f0 +/* EE1AD4 80243114 00000000 */ nop +/* EE1AD8 80243118 46800020 */ cvt.s.w $f0, $f0 +/* EE1ADC 8024311C E7A0001C */ swc1 $f0, 0x1c($sp) +/* EE1AE0 80243120 8E240080 */ lw $a0, 0x80($s1) +/* EE1AE4 80243124 0C0394C1 */ jal func_800E5304 +/* EE1AE8 80243128 27A70060 */ addiu $a3, $sp, 0x60 +/* EE1AEC 8024312C 54400005 */ bnel $v0, $zero, .L80243144 +/* EE1AF0 80243130 AE200018 */ sw $zero, 0x18($s1) +/* EE1AF4 80243134 8E250018 */ lw $a1, 0x18($s1) +/* EE1AF8 80243138 8E26000C */ lw $a2, 0xc($s1) +/* EE1AFC 8024313C 0C00F909 */ jal func_8003E424 +/* EE1B00 80243140 0220202D */ daddu $a0, $s1, $zero +.L80243144: +/* EE1B04 80243144 C620001C */ lwc1 $f0, 0x1c($s1) +/* EE1B08 80243148 4480B000 */ mtc1 $zero, $f22 +/* EE1B0C 8024314C 4480B800 */ mtc1 $zero, $f23 +/* EE1B10 80243150 46000021 */ cvt.d.s $f0, $f0 +/* EE1B14 80243154 4636003C */ c.lt.d $f0, $f22 +/* EE1B18 80243158 00000000 */ nop +/* EE1B1C 8024315C 45000074 */ bc1f .L80243330 +/* EE1B20 80243160 27A50058 */ addiu $a1, $sp, 0x58 +/* EE1B24 80243164 27A6005C */ addiu $a2, $sp, 0x5c +/* EE1B28 80243168 27A20064 */ addiu $v0, $sp, 0x64 +/* EE1B2C 8024316C C622003C */ lwc1 $f2, 0x3c($s1) +/* EE1B30 80243170 C6260038 */ lwc1 $f6, 0x38($s1) +/* EE1B34 80243174 3C01402A */ lui $at, 0x402a +/* EE1B38 80243178 4481A800 */ mtc1 $at, $f21 +/* EE1B3C 8024317C 4480A000 */ mtc1 $zero, $f20 +/* EE1B40 80243180 460010A1 */ cvt.d.s $f2, $f2 +/* EE1B44 80243184 46341080 */ add.d $f2, $f2, $f20 +/* EE1B48 80243188 C620001C */ lwc1 $f0, 0x1c($s1) +/* EE1B4C 8024318C C6240040 */ lwc1 $f4, 0x40($s1) +/* EE1B50 80243190 46000005 */ abs.s $f0, $f0 +/* EE1B54 80243194 E7A40060 */ swc1 $f4, 0x60($sp) +/* EE1B58 80243198 3C014030 */ lui $at, 0x4030 +/* EE1B5C 8024319C 44812800 */ mtc1 $at, $f5 +/* EE1B60 802431A0 44802000 */ mtc1 $zero, $f4 +/* EE1B64 802431A4 46000021 */ cvt.d.s $f0, $f0 +/* EE1B68 802431A8 E7A60058 */ swc1 $f6, 0x58($sp) +/* EE1B6C 802431AC 46240000 */ add.d $f0, $f0, $f4 +/* EE1B70 802431B0 462010A0 */ cvt.s.d $f2, $f2 +/* EE1B74 802431B4 E7A2005C */ swc1 $f2, 0x5c($sp) +/* EE1B78 802431B8 46200020 */ cvt.s.d $f0, $f0 +/* EE1B7C 802431BC E7A00064 */ swc1 $f0, 0x64($sp) +/* EE1B80 802431C0 AFA20010 */ sw $v0, 0x10($sp) +/* EE1B84 802431C4 8E240080 */ lw $a0, 0x80($s1) +/* EE1B88 802431C8 0C03908F */ jal func_800E423C +/* EE1B8C 802431CC 27A70060 */ addiu $a3, $sp, 0x60 +/* EE1B90 802431D0 10400057 */ beqz $v0, .L80243330 +/* EE1B94 802431D4 00000000 */ nop +/* EE1B98 802431D8 C620001C */ lwc1 $f0, 0x1c($s1) +/* EE1B9C 802431DC C7A20064 */ lwc1 $f2, 0x64($sp) +/* EE1BA0 802431E0 46000005 */ abs.s $f0, $f0 +/* EE1BA4 802431E4 46000021 */ cvt.d.s $f0, $f0 +/* EE1BA8 802431E8 46340000 */ add.d $f0, $f0, $f20 +/* EE1BAC 802431EC 460010A1 */ cvt.d.s $f2, $f2 +/* EE1BB0 802431F0 4620103E */ c.le.d $f2, $f0 +/* EE1BB4 802431F4 00000000 */ nop +/* EE1BB8 802431F8 4500004D */ bc1f .L80243330 +/* EE1BBC 802431FC 00000000 */ nop +/* EE1BC0 80243200 C7A0005C */ lwc1 $f0, 0x5c($sp) +/* EE1BC4 80243204 E620003C */ swc1 $f0, 0x3c($s1) +/* EE1BC8 80243208 8E4200D0 */ lw $v0, 0xd0($s2) +/* EE1BCC 8024320C C6200038 */ lwc1 $f0, 0x38($s1) +/* EE1BD0 80243210 4600020D */ trunc.w.s $f8, $f0 +/* EE1BD4 80243214 E4480000 */ swc1 $f8, ($v0) +/* EE1BD8 80243218 8E4200D0 */ lw $v0, 0xd0($s2) +/* EE1BDC 8024321C C620003C */ lwc1 $f0, 0x3c($s1) +/* EE1BE0 80243220 4600020D */ trunc.w.s $f8, $f0 +/* EE1BE4 80243224 E4480004 */ swc1 $f8, 4($v0) +/* EE1BE8 80243228 8E4200D0 */ lw $v0, 0xd0($s2) +/* EE1BEC 8024322C C6200040 */ lwc1 $f0, 0x40($s1) +/* EE1BF0 80243230 4600020D */ trunc.w.s $f8, $f0 +/* EE1BF4 80243234 E4480008 */ swc1 $f8, 8($v0) +/* EE1BF8 80243238 8E4200D0 */ lw $v0, 0xd0($s2) +/* EE1BFC 8024323C C6200038 */ lwc1 $f0, 0x38($s1) +/* EE1C00 80243240 4600020D */ trunc.w.s $f8, $f0 +/* EE1C04 80243244 E448001C */ swc1 $f8, 0x1c($v0) +/* EE1C08 80243248 8E4200D0 */ lw $v0, 0xd0($s2) +/* EE1C0C 8024324C C620003C */ lwc1 $f0, 0x3c($s1) +/* EE1C10 80243250 4600020D */ trunc.w.s $f8, $f0 +/* EE1C14 80243254 E4480020 */ swc1 $f8, 0x20($v0) +/* EE1C18 80243258 8E4200D0 */ lw $v0, 0xd0($s2) +/* EE1C1C 8024325C C6200040 */ lwc1 $f0, 0x40($s1) +/* EE1C20 80243260 4600020D */ trunc.w.s $f8, $f0 +/* EE1C24 80243264 E4480024 */ swc1 $f8, 0x24($v0) +/* EE1C28 80243268 8E4300A0 */ lw $v1, 0xa0($s2) +/* EE1C2C 8024326C 24020005 */ addiu $v0, $zero, 5 +/* EE1C30 80243270 1060000B */ beqz $v1, .L802432A0 +/* EE1C34 80243274 AE420094 */ sw $v0, 0x94($s2) +/* EE1C38 80243278 C620003C */ lwc1 $f0, 0x3c($s1) +/* EE1C3C 8024327C 46000021 */ cvt.d.s $f0, $f0 +/* EE1C40 80243280 4636003E */ c.le.d $f0, $f22 +/* EE1C44 80243284 00000000 */ nop +/* EE1C48 80243288 4501000D */ bc1t .L802432C0 +/* EE1C4C 8024328C 2403FFF7 */ addiu $v1, $zero, -9 +/* EE1C50 80243290 8E220000 */ lw $v0, ($s1) +/* EE1C54 80243294 34420200 */ ori $v0, $v0, 0x200 +/* EE1C58 80243298 08090CB4 */ j .L802432D0 +/* EE1C5C 8024329C 00431024 */ and $v0, $v0, $v1 +.L802432A0: +/* EE1C60 802432A0 8E4200D0 */ lw $v0, 0xd0($s2) +/* EE1C64 802432A4 8C420034 */ lw $v0, 0x34($v0) +/* EE1C68 802432A8 14400005 */ bnez $v0, .L802432C0 +/* EE1C6C 802432AC 2403FFF7 */ addiu $v1, $zero, -9 +/* EE1C70 802432B0 8E220000 */ lw $v0, ($s1) +/* EE1C74 802432B4 34420200 */ ori $v0, $v0, 0x200 +/* EE1C78 802432B8 08090CB4 */ j .L802432D0 +/* EE1C7C 802432BC 00431024 */ and $v0, $v0, $v1 +.L802432C0: +/* EE1C80 802432C0 8E220000 */ lw $v0, ($s1) +/* EE1C84 802432C4 2403FDFF */ addiu $v1, $zero, -0x201 +/* EE1C88 802432C8 00431024 */ and $v0, $v0, $v1 +/* EE1C8C 802432CC 34420008 */ ori $v0, $v0, 8 +.L802432D0: +/* EE1C90 802432D0 AE220000 */ sw $v0, ($s1) +/* EE1C94 802432D4 C62C0038 */ lwc1 $f12, 0x38($s1) +/* EE1C98 802432D8 C62E0040 */ lwc1 $f14, 0x40($s1) +/* EE1C9C 802432DC 8E220000 */ lw $v0, ($s1) +/* EE1CA0 802432E0 3C048010 */ lui $a0, %hi(D_800FFC90) +/* EE1CA4 802432E4 8C84FC90 */ lw $a0, %lo(D_800FFC90)($a0) +/* EE1CA8 802432E8 3C030004 */ lui $v1, 4 +/* EE1CAC 802432EC AE20001C */ sw $zero, 0x1c($s1) +/* EE1CB0 802432F0 00431025 */ or $v0, $v0, $v1 +/* EE1CB4 802432F4 2403F7FF */ addiu $v1, $zero, -0x801 +/* EE1CB8 802432F8 00431024 */ and $v0, $v0, $v1 +/* EE1CBC 802432FC AE220000 */ sw $v0, ($s1) +/* EE1CC0 80243300 8C860028 */ lw $a2, 0x28($a0) +/* EE1CC4 80243304 0C00ABDC */ jal fio_validate_header_checksums +/* EE1CC8 80243308 8C870030 */ lw $a3, 0x30($a0) +/* EE1CCC 8024330C 3C02004A */ lui $v0, 0x4a +/* EE1CD0 80243310 3442001A */ ori $v0, $v0, 0x1a +/* EE1CD4 80243314 AE220028 */ sw $v0, 0x28($s1) +/* EE1CD8 80243318 24020003 */ addiu $v0, $zero, 3 +/* EE1CDC 8024331C A622008E */ sh $v0, 0x8e($s1) +/* EE1CE0 80243320 24020067 */ addiu $v0, $zero, 0x67 +/* EE1CE4 80243324 E620000C */ swc1 $f0, 0xc($s1) +/* EE1CE8 80243328 08090CFA */ j .L802433E8 +/* EE1CEC 8024332C AEA20070 */ sw $v0, 0x70($s5) +.L80243330: +/* EE1CF0 80243330 C624003C */ lwc1 $f4, 0x3c($s1) +/* EE1CF4 80243334 C620001C */ lwc1 $f0, 0x1c($s1) +/* EE1CF8 80243338 46002100 */ add.s $f4, $f4, $f0 +/* EE1CFC 8024333C C6220014 */ lwc1 $f2, 0x14($s1) +/* EE1D00 80243340 46020001 */ sub.s $f0, $f0, $f2 +/* EE1D04 80243344 E624003C */ swc1 $f4, 0x3c($s1) +/* EE1D08 80243348 08090CFA */ j .L802433E8 +/* EE1D0C 8024334C E620001C */ swc1 $f0, 0x1c($s1) +.L80243350: +/* EE1D10 80243350 9622008E */ lhu $v0, 0x8e($s1) +/* EE1D14 80243354 2442FFFF */ addiu $v0, $v0, -1 +/* EE1D18 80243358 A622008E */ sh $v0, 0x8e($s1) +/* EE1D1C 8024335C 00021400 */ sll $v0, $v0, 0x10 +/* EE1D20 80243360 1C400021 */ bgtz $v0, .L802433E8 +/* EE1D24 80243364 3C03004A */ lui $v1, 0x4a +/* EE1D28 80243368 3C04FFFB */ lui $a0, 0xfffb +/* EE1D2C 8024336C 3484FFFF */ ori $a0, $a0, 0xffff +/* EE1D30 80243370 8E220000 */ lw $v0, ($s1) +/* EE1D34 80243374 34630001 */ ori $v1, $v1, 1 +/* EE1D38 80243378 AE230028 */ sw $v1, 0x28($s1) +/* EE1D3C 8024337C 00441024 */ and $v0, $v0, $a0 +/* EE1D40 80243380 AE220000 */ sw $v0, ($s1) +/* EE1D44 80243384 08090CFA */ j .L802433E8 +/* EE1D48 80243388 AEA00070 */ sw $zero, 0x70($s5) +.L8024338C: +/* EE1D4C 8024338C 3C01C47A */ lui $at, 0xc47a +/* EE1D50 80243390 44810000 */ mtc1 $at, $f0 +/* EE1D54 80243394 8E230000 */ lw $v1, ($s1) +/* EE1D58 80243398 A622008E */ sh $v0, 0x8e($s1) +/* EE1D5C 8024339C 2402FDFF */ addiu $v0, $zero, -0x201 +/* EE1D60 802433A0 AE200038 */ sw $zero, 0x38($s1) +/* EE1D64 802433A4 AE200040 */ sw $zero, 0x40($s1) +/* EE1D68 802433A8 3463000A */ ori $v1, $v1, 0xa +/* EE1D6C 802433AC 00621824 */ and $v1, $v1, $v0 +/* EE1D70 802433B0 E620003C */ swc1 $f0, 0x3c($s1) +/* EE1D74 802433B4 AE230000 */ sw $v1, ($s1) +/* EE1D78 802433B8 AEA40070 */ sw $a0, 0x70($s5) +.L802433BC: +/* EE1D7C 802433BC 9622008E */ lhu $v0, 0x8e($s1) +/* EE1D80 802433C0 2442FFFF */ addiu $v0, $v0, -1 +/* EE1D84 802433C4 A622008E */ sh $v0, 0x8e($s1) +/* EE1D88 802433C8 00021400 */ sll $v0, $v0, 0x10 +/* EE1D8C 802433CC 1C400006 */ bgtz $v0, .L802433E8 +/* EE1D90 802433D0 24020064 */ addiu $v0, $zero, 0x64 +/* EE1D94 802433D4 AE400094 */ sw $zero, 0x94($s2) +/* EE1D98 802433D8 08090CFA */ j .L802433E8 +/* EE1D9C 802433DC AEA20070 */ sw $v0, 0x70($s5) +.L802433E0: +/* EE1DA0 802433E0 0C013AE3 */ jal func_8004EB8C +/* EE1DA4 802433E4 02A0202D */ daddu $a0, $s5, $zero +.L802433E8: +/* EE1DA8 802433E8 8FBF0080 */ lw $ra, 0x80($sp) +/* EE1DAC 802433EC 8FB5007C */ lw $s5, 0x7c($sp) +/* EE1DB0 802433F0 8FB40078 */ lw $s4, 0x78($sp) +/* EE1DB4 802433F4 8FB30074 */ lw $s3, 0x74($sp) +/* EE1DB8 802433F8 8FB20070 */ lw $s2, 0x70($sp) +/* EE1DBC 802433FC 8FB1006C */ lw $s1, 0x6c($sp) +/* EE1DC0 80243400 8FB00068 */ lw $s0, 0x68($sp) +/* EE1DC4 80243404 D7B60090 */ ldc1 $f22, 0x90($sp) +/* EE1DC8 80243408 D7B40088 */ ldc1 $f20, 0x88($sp) +/* EE1DCC 8024340C 0000102D */ daddu $v0, $zero, $zero +/* EE1DD0 80243410 03E00008 */ jr $ra +/* EE1DD4 80243414 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/asm/nonmatchings/code_EDEA00/func_80243470_EE1E30.s b/asm/nonmatchings/code_EDEA00/func_80243470_EE1E30.s new file mode 100644 index 0000000000..6174becb15 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80243470_EE1E30.s @@ -0,0 +1,75 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243470_EE1E30 +/* EE1E30 80243470 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EE1E34 80243474 AFB3002C */ sw $s3, 0x2c($sp) +/* EE1E38 80243478 0080982D */ daddu $s3, $a0, $zero +/* EE1E3C 8024347C AFB00020 */ sw $s0, 0x20($sp) +/* EE1E40 80243480 00A0802D */ daddu $s0, $a1, $zero +/* EE1E44 80243484 24040001 */ addiu $a0, $zero, 1 +/* EE1E48 80243488 AFBF0030 */ sw $ra, 0x30($sp) +/* EE1E4C 8024348C AFB20028 */ sw $s2, 0x28($sp) +/* EE1E50 80243490 0C00F92F */ jal func_8003E4BC +/* EE1E54 80243494 AFB10024 */ sw $s1, 0x24($sp) +/* EE1E58 80243498 8E63000C */ lw $v1, 0xc($s3) +/* EE1E5C 8024349C 0260202D */ daddu $a0, $s3, $zero +/* EE1E60 802434A0 8C650000 */ lw $a1, ($v1) +/* EE1E64 802434A4 0C0B53A3 */ jal func_802D4E8C +/* EE1E68 802434A8 0040902D */ daddu $s2, $v0, $zero +/* EE1E6C 802434AC 12000002 */ beqz $s0, .L802434B8 +/* EE1E70 802434B0 AE620074 */ sw $v0, 0x74($s3) +/* EE1E74 802434B4 AE600070 */ sw $zero, 0x70($s3) +.L802434B8: +/* EE1E78 802434B8 3C026666 */ lui $v0, 0x6666 +/* EE1E7C 802434BC 8E640070 */ lw $a0, 0x70($s3) +/* EE1E80 802434C0 34426667 */ ori $v0, $v0, 0x6667 +/* EE1E84 802434C4 00820018 */ mult $a0, $v0 +/* EE1E88 802434C8 000417C3 */ sra $v0, $a0, 0x1f +/* EE1E8C 802434CC 00004010 */ mfhi $t0 +/* EE1E90 802434D0 00081843 */ sra $v1, $t0, 1 +/* EE1E94 802434D4 00621823 */ subu $v1, $v1, $v0 +/* EE1E98 802434D8 00031080 */ sll $v0, $v1, 2 +/* EE1E9C 802434DC 00431021 */ addu $v0, $v0, $v1 +/* EE1EA0 802434E0 1482001B */ bne $a0, $v0, .L80243550 +/* EE1EA4 802434E4 3C020020 */ lui $v0, 0x20 +/* EE1EA8 802434E8 34420002 */ ori $v0, $v0, 2 +/* EE1EAC 802434EC 27B1001A */ addiu $s1, $sp, 0x1a +/* EE1EB0 802434F0 27B00018 */ addiu $s0, $sp, 0x18 +/* EE1EB4 802434F4 AFB10010 */ sw $s1, 0x10($sp) +/* EE1EB8 802434F8 AFA20014 */ sw $v0, 0x14($sp) +/* EE1EBC 802434FC 8E460040 */ lw $a2, 0x40($s2) +/* EE1EC0 80243500 C64C0038 */ lwc1 $f12, 0x38($s2) +/* EE1EC4 80243504 C64E003C */ lwc1 $f14, 0x3c($s2) +/* EE1EC8 80243508 0C055D37 */ jal func_801574DC +/* EE1ECC 8024350C 0200382D */ daddu $a3, $s0, $zero +/* EE1ED0 80243510 3C0543FA */ lui $a1, 0x43fa +/* EE1ED4 80243514 8E620074 */ lw $v0, 0x74($s3) +/* EE1ED8 80243518 0000202D */ daddu $a0, $zero, $zero +/* EE1EDC 8024351C AFA20010 */ sw $v0, 0x10($sp) +/* EE1EE0 80243520 8E670070 */ lw $a3, 0x70($s3) +/* EE1EE4 80243524 0C00ADA9 */ jal func_8002B6A4 +/* EE1EE8 80243528 0000302D */ daddu $a2, $zero, $zero +/* EE1EEC 8024352C 24040295 */ addiu $a0, $zero, 0x295 +/* EE1EF0 80243530 4600008D */ trunc.w.s $f2, $f0 +/* EE1EF4 80243534 44071000 */ mfc1 $a3, $f2 +/* EE1EF8 80243538 00000000 */ nop +/* EE1EFC 8024353C 00073C00 */ sll $a3, $a3, 0x10 +/* EE1F00 80243540 92050001 */ lbu $a1, 1($s0) +/* EE1F04 80243544 92260001 */ lbu $a2, 1($s1) +/* EE1F08 80243548 0C055C46 */ jal func_80157118 +/* EE1F0C 8024354C 00073C03 */ sra $a3, $a3, 0x10 +.L80243550: +/* EE1F10 80243550 8E630070 */ lw $v1, 0x70($s3) +/* EE1F14 80243554 8E620074 */ lw $v0, 0x74($s3) +/* EE1F18 80243558 24630001 */ addiu $v1, $v1, 1 +/* EE1F1C 8024355C 0043102A */ slt $v0, $v0, $v1 +/* EE1F20 80243560 AE630070 */ sw $v1, 0x70($s3) +/* EE1F24 80243564 8FBF0030 */ lw $ra, 0x30($sp) +/* EE1F28 80243568 8FB3002C */ lw $s3, 0x2c($sp) +/* EE1F2C 8024356C 8FB20028 */ lw $s2, 0x28($sp) +/* EE1F30 80243570 8FB10024 */ lw $s1, 0x24($sp) +/* EE1F34 80243574 8FB00020 */ lw $s0, 0x20($sp) +/* EE1F38 80243578 00021040 */ sll $v0, $v0, 1 +/* EE1F3C 8024357C 03E00008 */ jr $ra +/* EE1F40 80243580 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EDEA00/func_80243584_EE1F44.s b/asm/nonmatchings/code_EDEA00/func_80243584_EE1F44.s new file mode 100644 index 0000000000..221644b943 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/func_80243584_EE1F44.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243584_EE1F44 +/* EE1F44 80243584 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EE1F48 80243588 AFB20028 */ sw $s2, 0x28($sp) +/* EE1F4C 8024358C 0080902D */ daddu $s2, $a0, $zero +/* EE1F50 80243590 AFB00020 */ sw $s0, 0x20($sp) +/* EE1F54 80243594 00A0802D */ daddu $s0, $a1, $zero +/* EE1F58 80243598 0000202D */ daddu $a0, $zero, $zero +/* EE1F5C 8024359C AFBF002C */ sw $ra, 0x2c($sp) +/* EE1F60 802435A0 0C00F92F */ jal func_8003E4BC +/* EE1F64 802435A4 AFB10024 */ sw $s1, 0x24($sp) +/* EE1F68 802435A8 12000002 */ beqz $s0, .L802435B4 +/* EE1F6C 802435AC 0040282D */ daddu $a1, $v0, $zero +/* EE1F70 802435B0 AE400070 */ sw $zero, 0x70($s2) +.L802435B4: +/* EE1F74 802435B4 3C026666 */ lui $v0, 0x6666 +/* EE1F78 802435B8 8E440070 */ lw $a0, 0x70($s2) +/* EE1F7C 802435BC 34426667 */ ori $v0, $v0, 0x6667 +/* EE1F80 802435C0 00820018 */ mult $a0, $v0 +/* EE1F84 802435C4 000417C3 */ sra $v0, $a0, 0x1f +/* EE1F88 802435C8 00004010 */ mfhi $t0 +/* EE1F8C 802435CC 00081843 */ sra $v1, $t0, 1 +/* EE1F90 802435D0 00621823 */ subu $v1, $v1, $v0 +/* EE1F94 802435D4 00031080 */ sll $v0, $v1, 2 +/* EE1F98 802435D8 00431021 */ addu $v0, $v0, $v1 +/* EE1F9C 802435DC 1482001B */ bne $a0, $v0, .L8024364C +/* EE1FA0 802435E0 3C020020 */ lui $v0, 0x20 +/* EE1FA4 802435E4 34420002 */ ori $v0, $v0, 2 +/* EE1FA8 802435E8 27B1001A */ addiu $s1, $sp, 0x1a +/* EE1FAC 802435EC 27B00018 */ addiu $s0, $sp, 0x18 +/* EE1FB0 802435F0 AFB10010 */ sw $s1, 0x10($sp) +/* EE1FB4 802435F4 AFA20014 */ sw $v0, 0x14($sp) +/* EE1FB8 802435F8 8CA60040 */ lw $a2, 0x40($a1) +/* EE1FBC 802435FC C4AC0038 */ lwc1 $f12, 0x38($a1) +/* EE1FC0 80243600 C4AE003C */ lwc1 $f14, 0x3c($a1) +/* EE1FC4 80243604 0C055D37 */ jal func_801574DC +/* EE1FC8 80243608 0200382D */ daddu $a3, $s0, $zero +/* EE1FCC 8024360C 0000202D */ daddu $a0, $zero, $zero +/* EE1FD0 80243610 3C0543FA */ lui $a1, 0x43fa +/* EE1FD4 80243614 24020050 */ addiu $v0, $zero, 0x50 +/* EE1FD8 80243618 AFA20010 */ sw $v0, 0x10($sp) +/* EE1FDC 8024361C 8E470070 */ lw $a3, 0x70($s2) +/* EE1FE0 80243620 0C00ADA9 */ jal func_8002B6A4 +/* EE1FE4 80243624 0000302D */ daddu $a2, $zero, $zero +/* EE1FE8 80243628 24040295 */ addiu $a0, $zero, 0x295 +/* EE1FEC 8024362C 4600008D */ trunc.w.s $f2, $f0 +/* EE1FF0 80243630 44071000 */ mfc1 $a3, $f2 +/* EE1FF4 80243634 00000000 */ nop +/* EE1FF8 80243638 00073C00 */ sll $a3, $a3, 0x10 +/* EE1FFC 8024363C 92050001 */ lbu $a1, 1($s0) +/* EE2000 80243640 92260001 */ lbu $a2, 1($s1) +/* EE2004 80243644 0C055C46 */ jal func_80157118 +/* EE2008 80243648 00073C03 */ sra $a3, $a3, 0x10 +.L8024364C: +/* EE200C 8024364C 8E430070 */ lw $v1, 0x70($s2) +/* EE2010 80243650 24630001 */ addiu $v1, $v1, 1 +/* EE2014 80243654 28620051 */ slti $v0, $v1, 0x51 +/* EE2018 80243658 38420001 */ xori $v0, $v0, 1 +/* EE201C 8024365C AE430070 */ sw $v1, 0x70($s2) +/* EE2020 80243660 8FBF002C */ lw $ra, 0x2c($sp) +/* EE2024 80243664 8FB20028 */ lw $s2, 0x28($sp) +/* EE2028 80243668 8FB10024 */ lw $s1, 0x24($sp) +/* EE202C 8024366C 8FB00020 */ lw $s0, 0x20($sp) +/* EE2030 80243670 00021040 */ sll $v0, $v0, 1 +/* EE2034 80243674 03E00008 */ jr $ra +/* EE2038 80243678 27BD0030 */ addiu $sp, $sp, 0x30 +/* EE203C 8024367C 00000000 */ nop diff --git a/asm/nonmatchings/code_EDEA00/pause_interp_text_scroll_EE1DD8.s b/asm/nonmatchings/code_EDEA00/pause_interp_text_scroll_EE1DD8.s new file mode 100644 index 0000000000..cf559e9562 --- /dev/null +++ b/asm/nonmatchings/code_EDEA00/pause_interp_text_scroll_EE1DD8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel pause_interp_text_scroll_EE1DD8 +/* EE1DD8 80243418 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE1DDC 8024341C AFB00010 */ sw $s0, 0x10($sp) +/* EE1DE0 80243420 0080802D */ daddu $s0, $a0, $zero +/* EE1DE4 80243424 AFBF0014 */ sw $ra, 0x14($sp) +/* EE1DE8 80243428 C60C0084 */ lwc1 $f12, 0x84($s0) +/* EE1DEC 8024342C 46806320 */ cvt.s.w $f12, $f12 +/* EE1DF0 80243430 C6020090 */ lwc1 $f2, 0x90($s0) +/* EE1DF4 80243434 468010A0 */ cvt.s.w $f2, $f2 +/* EE1DF8 80243438 44061000 */ mfc1 $a2, $f2 +/* EE1DFC 8024343C C6020098 */ lwc1 $f2, 0x98($s0) +/* EE1E00 80243440 468010A0 */ cvt.s.w $f2, $f2 +/* EE1E04 80243444 44071000 */ mfc1 $a3, $f2 +/* EE1E08 80243448 C60E008C */ lwc1 $f14, 0x8c($s0) +/* EE1E0C 8024344C 0C00ABDC */ jal fio_validate_header_checksums +/* EE1E10 80243450 468073A0 */ cvt.s.w $f14, $f14 +/* EE1E14 80243454 4600008D */ trunc.w.s $f2, $f0 +/* EE1E18 80243458 E60200AC */ swc1 $f2, 0xac($s0) +/* EE1E1C 8024345C 8FBF0014 */ lw $ra, 0x14($sp) +/* EE1E20 80243460 8FB00010 */ lw $s0, 0x10($sp) +/* EE1E24 80243464 24020002 */ addiu $v0, $zero, 2 +/* EE1E28 80243468 03E00008 */ jr $ra +/* EE1E2C 8024346C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EE2040/func_80243680_EE2040.s b/asm/nonmatchings/code_EE2040/func_80243680_EE2040.s new file mode 100644 index 0000000000..7f08a150f3 --- /dev/null +++ b/asm/nonmatchings/code_EE2040/func_80243680_EE2040.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243680_EE2040 +/* EE2040 80243680 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EE2044 80243684 3C048024 */ lui $a0, %hi(D_80247BE0) +/* EE2048 80243688 24847BE0 */ addiu $a0, $a0, %lo(D_80247BE0) +/* EE204C 8024368C 27A50010 */ addiu $a1, $sp, 0x10 +/* EE2050 80243690 AFBF0020 */ sw $ra, 0x20($sp) +/* EE2054 80243694 AFB1001C */ sw $s1, 0x1c($sp) +/* EE2058 80243698 0C017C8E */ jal func_8005F238 +/* EE205C 8024369C AFB00018 */ sw $s0, 0x18($sp) +/* EE2060 802436A0 0040802D */ daddu $s0, $v0, $zero +/* EE2064 802436A4 0200202D */ daddu $a0, $s0, $zero +/* EE2068 802436A8 3C118024 */ lui $s1, %hi(D_80247BF0) +/* EE206C 802436AC 26317BF0 */ addiu $s1, $s1, %lo(D_80247BF0) +/* EE2070 802436B0 0C01D01C */ jal func_80074070 +/* EE2074 802436B4 0220282D */ daddu $a1, $s1, $zero +/* EE2078 802436B8 0C00AFDA */ jal func_8002BF68 +/* EE207C 802436BC 0200202D */ daddu $a0, $s0, $zero +/* EE2080 802436C0 3C048025 */ lui $a0, %hi(D_8024BB80) +/* EE2084 802436C4 2484BB80 */ addiu $a0, $a0, %lo(D_8024BB80) +/* EE2088 802436C8 3C028024 */ lui $v0, %hi(D_80247DF0) +/* EE208C 802436CC 24427DF0 */ addiu $v0, $v0, %lo(D_80247DF0) +/* EE2090 802436D0 AC820000 */ sw $v0, ($a0) +/* EE2094 802436D4 24020096 */ addiu $v0, $zero, 0x96 +/* EE2098 802436D8 A4820008 */ sh $v0, 8($a0) +/* EE209C 802436DC 24020069 */ addiu $v0, $zero, 0x69 +/* EE20A0 802436E0 A482000A */ sh $v0, 0xa($a0) +/* EE20A4 802436E4 24020002 */ addiu $v0, $zero, 2 +/* EE20A8 802436E8 AC82000C */ sw $v0, 0xc($a0) +/* EE20AC 802436EC 24020001 */ addiu $v0, $zero, 1 +/* EE20B0 802436F0 AC910004 */ sw $s1, 4($a0) +/* EE20B4 802436F4 0C04C319 */ jal func_80130C64 +/* EE20B8 802436F8 AC820010 */ sw $v0, 0x10($a0) +/* EE20BC 802436FC 8FBF0020 */ lw $ra, 0x20($sp) +/* EE20C0 80243700 8FB1001C */ lw $s1, 0x1c($sp) +/* EE20C4 80243704 8FB00018 */ lw $s0, 0x18($sp) +/* EE20C8 80243708 24020002 */ addiu $v0, $zero, 2 +/* EE20CC 8024370C 03E00008 */ jr $ra +/* EE20D0 80243710 27BD0028 */ addiu $sp, $sp, 0x28 +/* EE20D4 80243714 00000000 */ nop +/* EE20D8 80243718 00000000 */ nop +/* EE20DC 8024371C 00000000 */ nop diff --git a/asm/nonmatchings/code_EE65B0/func_80240000_EE65B0.s b/asm/nonmatchings/code_EE65B0/func_80240000_EE65B0.s new file mode 100644 index 0000000000..09f339beca --- /dev/null +++ b/asm/nonmatchings/code_EE65B0/func_80240000_EE65B0.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EE65B0 +/* EE65B0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE65B4 80240004 AFB00010 */ sw $s0, 0x10($sp) +/* EE65B8 80240008 0080802D */ daddu $s0, $a0, $zero +/* EE65BC 8024000C AFBF0014 */ sw $ra, 0x14($sp) +/* EE65C0 80240010 8E0300A8 */ lw $v1, 0xa8($s0) +/* EE65C4 80240014 8E020088 */ lw $v0, 0x88($s0) +/* EE65C8 80240018 00621821 */ addu $v1, $v1, $v0 +/* EE65CC 8024001C 04610004 */ bgez $v1, .L80240030 +/* EE65D0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) +/* EE65D4 80240024 3C020002 */ lui $v0, 2 +/* EE65D8 80240028 08090010 */ j .L80240040 +/* EE65DC 8024002C 00621021 */ addu $v0, $v1, $v0 +.L80240030: +/* EE65E0 80240030 3C040002 */ lui $a0, 2 +/* EE65E4 80240034 0083102A */ slt $v0, $a0, $v1 +/* EE65E8 80240038 10400002 */ beqz $v0, .L80240044 +/* EE65EC 8024003C 00641023 */ subu $v0, $v1, $a0 +.L80240040: +/* EE65F0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240044: +/* EE65F4 80240044 8E0300AC */ lw $v1, 0xac($s0) +/* EE65F8 80240048 8E02008C */ lw $v0, 0x8c($s0) +/* EE65FC 8024004C 00621821 */ addu $v1, $v1, $v0 +/* EE6600 80240050 04610004 */ bgez $v1, .L80240064 +/* EE6604 80240054 AE0300AC */ sw $v1, 0xac($s0) +/* EE6608 80240058 3C020002 */ lui $v0, 2 +/* EE660C 8024005C 0809001D */ j .L80240074 +/* EE6610 80240060 00621021 */ addu $v0, $v1, $v0 +.L80240064: +/* EE6614 80240064 3C040002 */ lui $a0, 2 +/* EE6618 80240068 0083102A */ slt $v0, $a0, $v1 +/* EE661C 8024006C 10400002 */ beqz $v0, .L80240078 +/* EE6620 80240070 00641023 */ subu $v0, $v1, $a0 +.L80240074: +/* EE6624 80240074 AE0200AC */ sw $v0, 0xac($s0) +.L80240078: +/* EE6628 80240078 8E0300B0 */ lw $v1, 0xb0($s0) +/* EE662C 8024007C 8E020090 */ lw $v0, 0x90($s0) +/* EE6630 80240080 00621821 */ addu $v1, $v1, $v0 +/* EE6634 80240084 04610004 */ bgez $v1, .L80240098 +/* EE6638 80240088 AE0300B0 */ sw $v1, 0xb0($s0) +/* EE663C 8024008C 3C020002 */ lui $v0, 2 +/* EE6640 80240090 0809002A */ j .L802400A8 +/* EE6644 80240094 00621021 */ addu $v0, $v1, $v0 +.L80240098: +/* EE6648 80240098 3C040002 */ lui $a0, 2 +/* EE664C 8024009C 0083102A */ slt $v0, $a0, $v1 +/* EE6650 802400A0 10400002 */ beqz $v0, .L802400AC +/* EE6654 802400A4 00641023 */ subu $v0, $v1, $a0 +.L802400A8: +/* EE6658 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802400AC: +/* EE665C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) +/* EE6660 802400B0 8E020094 */ lw $v0, 0x94($s0) +/* EE6664 802400B4 00621821 */ addu $v1, $v1, $v0 +/* EE6668 802400B8 04610004 */ bgez $v1, .L802400CC +/* EE666C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) +/* EE6670 802400C0 3C020002 */ lui $v0, 2 +/* EE6674 802400C4 08090037 */ j .L802400DC +/* EE6678 802400C8 00621021 */ addu $v0, $v1, $v0 +.L802400CC: +/* EE667C 802400CC 3C040002 */ lui $a0, 2 +/* EE6680 802400D0 0083102A */ slt $v0, $a0, $v1 +/* EE6684 802400D4 10400002 */ beqz $v0, .L802400E0 +/* EE6688 802400D8 00641023 */ subu $v0, $v1, $a0 +.L802400DC: +/* EE668C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) +.L802400E0: +/* EE6690 802400E0 8E040084 */ lw $a0, 0x84($s0) +/* EE6694 802400E4 0C049819 */ jal func_80126064 +/* EE6698 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) +/* EE669C 802400EC 8E040084 */ lw $a0, 0x84($s0) +/* EE66A0 802400F0 0C04981F */ jal func_8012607C +/* EE66A4 802400F4 8E0500AC */ lw $a1, 0xac($s0) +/* EE66A8 802400F8 8E040084 */ lw $a0, 0x84($s0) +/* EE66AC 802400FC 0C049825 */ jal func_80126094 +/* EE66B0 80240100 8E0500B0 */ lw $a1, 0xb0($s0) +/* EE66B4 80240104 8E040084 */ lw $a0, 0x84($s0) +/* EE66B8 80240108 0C04982B */ jal func_801260AC +/* EE66BC 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) +/* EE66C0 80240110 8FBF0014 */ lw $ra, 0x14($sp) +/* EE66C4 80240114 8FB00010 */ lw $s0, 0x10($sp) +/* EE66C8 80240118 0000102D */ daddu $v0, $zero, $zero +/* EE66CC 8024011C 03E00008 */ jr $ra +/* EE66D0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EE65B0/func_80240124_EE66D4.s b/asm/nonmatchings/code_EE65B0/func_80240124_EE66D4.s new file mode 100644 index 0000000000..e5ccb29932 --- /dev/null +++ b/asm/nonmatchings/code_EE65B0/func_80240124_EE66D4.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240124_EE66D4 +/* EE66D4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE66D8 80240128 AFB00010 */ sw $s0, 0x10($sp) +/* EE66DC 8024012C 0080802D */ daddu $s0, $a0, $zero +/* EE66E0 80240130 10A00005 */ beqz $a1, .L80240148 +/* EE66E4 80240134 AFBF0014 */ sw $ra, 0x14($sp) +/* EE66E8 80240138 AE000070 */ sw $zero, 0x70($s0) +/* EE66EC 8024013C AE000074 */ sw $zero, 0x74($s0) +/* EE66F0 80240140 AE000078 */ sw $zero, 0x78($s0) +/* EE66F4 80240144 AE00007C */ sw $zero, 0x7c($s0) +.L80240148: +/* EE66F8 80240148 8E020070 */ lw $v0, 0x70($s0) +/* EE66FC 8024014C 1440000E */ bnez $v0, .L80240188 +/* EE6700 80240150 00000000 */ nop +/* EE6704 80240154 8E0300A8 */ lw $v1, 0xa8($s0) +/* EE6708 80240158 8E020088 */ lw $v0, 0x88($s0) +/* EE670C 8024015C 00621821 */ addu $v1, $v1, $v0 +/* EE6710 80240160 04610004 */ bgez $v1, .L80240174 +/* EE6714 80240164 AE0300A8 */ sw $v1, 0xa8($s0) +/* EE6718 80240168 3C020002 */ lui $v0, 2 +/* EE671C 8024016C 08090061 */ j .L80240184 +/* EE6720 80240170 00621021 */ addu $v0, $v1, $v0 +.L80240174: +/* EE6724 80240174 3C040002 */ lui $a0, 2 +/* EE6728 80240178 0083102A */ slt $v0, $a0, $v1 +/* EE672C 8024017C 10400002 */ beqz $v0, .L80240188 +/* EE6730 80240180 00641023 */ subu $v0, $v1, $a0 +.L80240184: +/* EE6734 80240184 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240188: +/* EE6738 80240188 8E020074 */ lw $v0, 0x74($s0) +/* EE673C 8024018C 1440000E */ bnez $v0, .L802401C8 +/* EE6740 80240190 00000000 */ nop +/* EE6744 80240194 8E0300AC */ lw $v1, 0xac($s0) +/* EE6748 80240198 8E02008C */ lw $v0, 0x8c($s0) +/* EE674C 8024019C 00621821 */ addu $v1, $v1, $v0 +/* EE6750 802401A0 04610004 */ bgez $v1, .L802401B4 +/* EE6754 802401A4 AE0300AC */ sw $v1, 0xac($s0) +/* EE6758 802401A8 3C020002 */ lui $v0, 2 +/* EE675C 802401AC 08090071 */ j .L802401C4 +/* EE6760 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* EE6764 802401B4 3C040002 */ lui $a0, 2 +/* EE6768 802401B8 0083102A */ slt $v0, $a0, $v1 +/* EE676C 802401BC 10400002 */ beqz $v0, .L802401C8 +/* EE6770 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* EE6774 802401C4 AE0200AC */ sw $v0, 0xac($s0) +.L802401C8: +/* EE6778 802401C8 8E020078 */ lw $v0, 0x78($s0) +/* EE677C 802401CC 1440000E */ bnez $v0, .L80240208 +/* EE6780 802401D0 00000000 */ nop +/* EE6784 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) +/* EE6788 802401D8 8E020090 */ lw $v0, 0x90($s0) +/* EE678C 802401DC 00621821 */ addu $v1, $v1, $v0 +/* EE6790 802401E0 04610004 */ bgez $v1, .L802401F4 +/* EE6794 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) +/* EE6798 802401E8 3C020002 */ lui $v0, 2 +/* EE679C 802401EC 08090081 */ j .L80240204 +/* EE67A0 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* EE67A4 802401F4 3C040002 */ lui $a0, 2 +/* EE67A8 802401F8 0083102A */ slt $v0, $a0, $v1 +/* EE67AC 802401FC 10400002 */ beqz $v0, .L80240208 +/* EE67B0 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* EE67B4 80240204 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240208: +/* EE67B8 80240208 8E02007C */ lw $v0, 0x7c($s0) +/* EE67BC 8024020C 1440000E */ bnez $v0, .L80240248 +/* EE67C0 80240210 00000000 */ nop +/* EE67C4 80240214 8E0300B4 */ lw $v1, 0xb4($s0) +/* EE67C8 80240218 8E020094 */ lw $v0, 0x94($s0) +/* EE67CC 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EE67D0 80240220 04610004 */ bgez $v1, .L80240234 +/* EE67D4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) +/* EE67D8 80240228 3C020002 */ lui $v0, 2 +/* EE67DC 8024022C 08090091 */ j .L80240244 +/* EE67E0 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* EE67E4 80240234 3C040002 */ lui $a0, 2 +/* EE67E8 80240238 0083102A */ slt $v0, $a0, $v1 +/* EE67EC 8024023C 10400002 */ beqz $v0, .L80240248 +/* EE67F0 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* EE67F4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240248: +/* EE67F8 80240248 8E040084 */ lw $a0, 0x84($s0) +/* EE67FC 8024024C 0C049819 */ jal func_80126064 +/* EE6800 80240250 8E0500A8 */ lw $a1, 0xa8($s0) +/* EE6804 80240254 8E040084 */ lw $a0, 0x84($s0) +/* EE6808 80240258 0C04981F */ jal func_8012607C +/* EE680C 8024025C 8E0500AC */ lw $a1, 0xac($s0) +/* EE6810 80240260 8E040084 */ lw $a0, 0x84($s0) +/* EE6814 80240264 0C049825 */ jal func_80126094 +/* EE6818 80240268 8E0500B0 */ lw $a1, 0xb0($s0) +/* EE681C 8024026C 8E040084 */ lw $a0, 0x84($s0) +/* EE6820 80240270 0C04982B */ jal func_801260AC +/* EE6824 80240274 8E0500B4 */ lw $a1, 0xb4($s0) +/* EE6828 80240278 8E020070 */ lw $v0, 0x70($s0) +/* EE682C 8024027C 8E030078 */ lw $v1, 0x78($s0) +/* EE6830 80240280 8E040098 */ lw $a0, 0x98($s0) +/* EE6834 80240284 24420001 */ addiu $v0, $v0, 1 +/* EE6838 80240288 AE020070 */ sw $v0, 0x70($s0) +/* EE683C 8024028C 8E020074 */ lw $v0, 0x74($s0) +/* EE6840 80240290 24630001 */ addiu $v1, $v1, 1 +/* EE6844 80240294 AE030078 */ sw $v1, 0x78($s0) +/* EE6848 80240298 8E030070 */ lw $v1, 0x70($s0) +/* EE684C 8024029C 24420001 */ addiu $v0, $v0, 1 +/* EE6850 802402A0 AE020074 */ sw $v0, 0x74($s0) +/* EE6854 802402A4 8E02007C */ lw $v0, 0x7c($s0) +/* EE6858 802402A8 0064182A */ slt $v1, $v1, $a0 +/* EE685C 802402AC 24420001 */ addiu $v0, $v0, 1 +/* EE6860 802402B0 14600002 */ bnez $v1, .L802402BC +/* EE6864 802402B4 AE02007C */ sw $v0, 0x7c($s0) +/* EE6868 802402B8 AE000070 */ sw $zero, 0x70($s0) +.L802402BC: +/* EE686C 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* EE6870 802402C0 8E03009C */ lw $v1, 0x9c($s0) +/* EE6874 802402C4 0043102A */ slt $v0, $v0, $v1 +/* EE6878 802402C8 50400001 */ beql $v0, $zero, .L802402D0 +/* EE687C 802402CC AE000074 */ sw $zero, 0x74($s0) +.L802402D0: +/* EE6880 802402D0 8E020078 */ lw $v0, 0x78($s0) +/* EE6884 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) +/* EE6888 802402D8 0043102A */ slt $v0, $v0, $v1 +/* EE688C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* EE6890 802402E0 AE000078 */ sw $zero, 0x78($s0) +.L802402E4: +/* EE6894 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* EE6898 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) +/* EE689C 802402EC 0043102A */ slt $v0, $v0, $v1 +/* EE68A0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 +/* EE68A4 802402F4 AE00007C */ sw $zero, 0x7c($s0) +.L802402F8: +/* EE68A8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) +/* EE68AC 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* EE68B0 80240300 0000102D */ daddu $v0, $zero, $zero +/* EE68B4 80240304 03E00008 */ jr $ra +/* EE68B8 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EE65B0/func_8024030C_EE68BC.s b/asm/nonmatchings/code_EE65B0/func_8024030C_EE68BC.s new file mode 100644 index 0000000000..510a4f1881 --- /dev/null +++ b/asm/nonmatchings/code_EE65B0/func_8024030C_EE68BC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024030C_EE68BC +/* EE68BC 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EE68C0 80240310 0000202D */ daddu $a0, $zero, $zero +/* EE68C4 80240314 0080282D */ daddu $a1, $a0, $zero +/* EE68C8 80240318 0080302D */ daddu $a2, $a0, $zero +/* EE68CC 8024031C 0080382D */ daddu $a3, $a0, $zero +/* EE68D0 80240320 AFBF0018 */ sw $ra, 0x18($sp) +/* EE68D4 80240324 AFA00010 */ sw $zero, 0x10($sp) +/* EE68D8 80240328 0C01DEF4 */ jal func_80077BD0 +/* EE68DC 8024032C AFA00014 */ sw $zero, 0x14($sp) +/* EE68E0 80240330 8FBF0018 */ lw $ra, 0x18($sp) +/* EE68E4 80240334 24020002 */ addiu $v0, $zero, 2 +/* EE68E8 80240338 03E00008 */ jr $ra +/* EE68EC 8024033C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EE65B0/func_80240340_EE68F0.s b/asm/nonmatchings/code_EE65B0/func_80240340_EE68F0.s new file mode 100644 index 0000000000..37b0bd056d --- /dev/null +++ b/asm/nonmatchings/code_EE65B0/func_80240340_EE68F0.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240340_EE68F0 +/* EE68F0 80240340 8C820084 */ lw $v0, 0x84($a0) +/* EE68F4 80240344 8C830090 */ lw $v1, 0x90($a0) +/* EE68F8 80240348 00431023 */ subu $v0, $v0, $v1 +/* EE68FC 8024034C 44821000 */ mtc1 $v0, $f2 +/* EE6900 80240350 00000000 */ nop +/* EE6904 80240354 468010A0 */ cvt.s.w $f2, $f2 +/* EE6908 80240358 8C820088 */ lw $v0, 0x88($a0) +/* EE690C 8024035C 8C830094 */ lw $v1, 0x94($a0) +/* EE6910 80240360 46021082 */ mul.s $f2, $f2, $f2 +/* EE6914 80240364 00000000 */ nop +/* EE6918 80240368 00431023 */ subu $v0, $v0, $v1 +/* EE691C 8024036C 44822000 */ mtc1 $v0, $f4 +/* EE6920 80240370 00000000 */ nop +/* EE6924 80240374 46802120 */ cvt.s.w $f4, $f4 +/* EE6928 80240378 8C82008C */ lw $v0, 0x8c($a0) +/* EE692C 8024037C 46042102 */ mul.s $f4, $f4, $f4 +/* EE6930 80240380 00000000 */ nop +/* EE6934 80240384 8C830098 */ lw $v1, 0x98($a0) +/* EE6938 80240388 00431023 */ subu $v0, $v0, $v1 +/* EE693C 8024038C 44820000 */ mtc1 $v0, $f0 +/* EE6940 80240390 00000000 */ nop +/* EE6944 80240394 46800020 */ cvt.s.w $f0, $f0 +/* EE6948 80240398 46000002 */ mul.s $f0, $f0, $f0 +/* EE694C 8024039C 00000000 */ nop +/* EE6950 802403A0 46041080 */ add.s $f2, $f2, $f4 +/* EE6954 802403A4 46001080 */ add.s $f2, $f2, $f0 +/* EE6958 802403A8 3C014561 */ lui $at, 0x4561 +/* EE695C 802403AC 44810000 */ mtc1 $at, $f0 +/* EE6960 802403B0 00000000 */ nop +/* EE6964 802403B4 4600103C */ c.lt.s $f2, $f0 +/* EE6968 802403B8 00000000 */ nop +/* EE696C 802403BC 45010002 */ bc1t .L802403C8 +/* EE6970 802403C0 24020001 */ addiu $v0, $zero, 1 +/* EE6974 802403C4 0000102D */ daddu $v0, $zero, $zero +.L802403C8: +/* EE6978 802403C8 AC820084 */ sw $v0, 0x84($a0) +/* EE697C 802403CC 03E00008 */ jr $ra +/* EE6980 802403D0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EE65B0/func_802403D4_EE6984.s b/asm/nonmatchings/code_EE65B0/func_802403D4_EE6984.s new file mode 100644 index 0000000000..b2337eb7ee --- /dev/null +++ b/asm/nonmatchings/code_EE65B0/func_802403D4_EE6984.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403D4_EE6984 +/* EE6984 802403D4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE6988 802403D8 3C028011 */ lui $v0, %hi(D_80117852) +/* EE698C 802403DC 80427852 */ lb $v0, %lo(D_80117852)($v0) +/* EE6990 802403E0 0080182D */ daddu $v1, $a0, $zero +/* EE6994 802403E4 1040000C */ beqz $v0, .L80240418 +/* EE6998 802403E8 AFBF0010 */ sw $ra, 0x10($sp) +/* EE699C 802403EC 2404FFFC */ addiu $a0, $zero, -4 +/* EE69A0 802403F0 24020001 */ addiu $v0, $zero, 1 +/* EE69A4 802403F4 0C00F92F */ jal func_8003E4BC +/* EE69A8 802403F8 AC6200BC */ sw $v0, 0xbc($v1) +/* EE69AC 802403FC 0000202D */ daddu $a0, $zero, $zero +/* EE69B0 80240400 3C05FD05 */ lui $a1, 0xfd05 +/* EE69B4 80240404 8C460000 */ lw $a2, ($v0) +/* EE69B8 80240408 0C0B551A */ jal func_802D5468 +/* EE69BC 8024040C 34A50F80 */ ori $a1, $a1, 0xf80 +/* EE69C0 80240410 08090108 */ j .L80240420 +/* EE69C4 80240414 24020002 */ addiu $v0, $zero, 2 +.L80240418: +/* EE69C8 80240418 AC6000BC */ sw $zero, 0xbc($v1) +/* EE69CC 8024041C 24020002 */ addiu $v0, $zero, 2 +.L80240420: +/* EE69D0 80240420 8FBF0010 */ lw $ra, 0x10($sp) +/* EE69D4 80240424 03E00008 */ jr $ra +/* EE69D8 80240428 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EE65B0/func_8024042C_EE69DC.s b/asm/nonmatchings/code_EE65B0/func_8024042C_EE69DC.s new file mode 100644 index 0000000000..ca2e41841a --- /dev/null +++ b/asm/nonmatchings/code_EE65B0/func_8024042C_EE69DC.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024042C_EE69DC +/* EE69DC 8024042C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE69E0 80240430 2404FFFC */ addiu $a0, $zero, -4 +/* EE69E4 80240434 AFBF0014 */ sw $ra, 0x14($sp) +/* EE69E8 80240438 0C00F92F */ jal func_8003E4BC +/* EE69EC 8024043C AFB00010 */ sw $s0, 0x10($sp) +/* EE69F0 80240440 0000202D */ daddu $a0, $zero, $zero +/* EE69F4 80240444 3C05FD05 */ lui $a1, 0xfd05 +/* EE69F8 80240448 34A50F80 */ ori $a1, $a1, 0xf80 +/* EE69FC 8024044C 0C0B53A3 */ jal func_802D4E8C +/* EE6A00 80240450 0040802D */ daddu $s0, $v0, $zero +/* EE6A04 80240454 AE020000 */ sw $v0, ($s0) +/* EE6A08 80240458 8FBF0014 */ lw $ra, 0x14($sp) +/* EE6A0C 8024045C 8FB00010 */ lw $s0, 0x10($sp) +/* EE6A10 80240460 24020002 */ addiu $v0, $zero, 2 +/* EE6A14 80240464 03E00008 */ jr $ra +/* EE6A18 80240468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EE65B0/func_8024046C_EE6A1C.s b/asm/nonmatchings/code_EE65B0/func_8024046C_EE6A1C.s new file mode 100644 index 0000000000..3fd222a0e4 --- /dev/null +++ b/asm/nonmatchings/code_EE65B0/func_8024046C_EE6A1C.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024046C_EE6A1C +/* EE6A1C 8024046C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EE6A20 80240470 AFB1001C */ sw $s1, 0x1c($sp) +/* EE6A24 80240474 0080882D */ daddu $s1, $a0, $zero +/* EE6A28 80240478 AFBF0020 */ sw $ra, 0x20($sp) +/* EE6A2C 8024047C AFB00018 */ sw $s0, 0x18($sp) +/* EE6A30 80240480 8E30000C */ lw $s0, 0xc($s1) +/* EE6A34 80240484 8E050000 */ lw $a1, ($s0) +/* EE6A38 80240488 0C0B53A3 */ jal func_802D4E8C +/* EE6A3C 8024048C 26100004 */ addiu $s0, $s0, 4 +/* EE6A40 80240490 AE220070 */ sw $v0, 0x70($s1) +/* EE6A44 80240494 8E050000 */ lw $a1, ($s0) +/* EE6A48 80240498 26100004 */ addiu $s0, $s0, 4 +/* EE6A4C 8024049C 0C0B53A3 */ jal func_802D4E8C +/* EE6A50 802404A0 0220202D */ daddu $a0, $s1, $zero +/* EE6A54 802404A4 AE220074 */ sw $v0, 0x74($s1) +/* EE6A58 802404A8 8E050000 */ lw $a1, ($s0) +/* EE6A5C 802404AC 0C0B53A3 */ jal func_802D4E8C +/* EE6A60 802404B0 0220202D */ daddu $a0, $s1, $zero +/* EE6A64 802404B4 24040194 */ addiu $a0, $zero, 0x194 +/* EE6A68 802404B8 0000282D */ daddu $a1, $zero, $zero +/* EE6A6C 802404BC C6200070 */ lwc1 $f0, 0x70($s1) +/* EE6A70 802404C0 46800020 */ cvt.s.w $f0, $f0 +/* EE6A74 802404C4 C6220074 */ lwc1 $f2, 0x74($s1) +/* EE6A78 802404C8 468010A0 */ cvt.s.w $f2, $f2 +/* EE6A7C 802404CC 44060000 */ mfc1 $a2, $f0 +/* EE6A80 802404D0 44071000 */ mfc1 $a3, $f2 +/* EE6A84 802404D4 44820000 */ mtc1 $v0, $f0 +/* EE6A88 802404D8 00000000 */ nop +/* EE6A8C 802404DC 46800020 */ cvt.s.w $f0, $f0 +/* EE6A90 802404E0 AE220078 */ sw $v0, 0x78($s1) +/* EE6A94 802404E4 0C055C13 */ jal func_8015704C +/* EE6A98 802404E8 E7A00010 */ swc1 $f0, 0x10($sp) +/* EE6A9C 802404EC 8FBF0020 */ lw $ra, 0x20($sp) +/* EE6AA0 802404F0 8FB1001C */ lw $s1, 0x1c($sp) +/* EE6AA4 802404F4 8FB00018 */ lw $s0, 0x18($sp) +/* EE6AA8 802404F8 24020002 */ addiu $v0, $zero, 2 +/* EE6AAC 802404FC 03E00008 */ jr $ra +/* EE6AB0 80240500 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EE65B0/func_80240504_EE6AB4.s b/asm/nonmatchings/code_EE65B0/func_80240504_EE6AB4.s new file mode 100644 index 0000000000..b0ddf08272 --- /dev/null +++ b/asm/nonmatchings/code_EE65B0/func_80240504_EE6AB4.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240504_EE6AB4 +/* EE6AB4 80240504 27BDFF88 */ addiu $sp, $sp, -0x78 +/* EE6AB8 80240508 AFBF0064 */ sw $ra, 0x64($sp) +/* EE6ABC 8024050C AFB00060 */ sw $s0, 0x60($sp) +/* EE6AC0 80240510 F7B60070 */ sdc1 $f22, 0x70($sp) +/* EE6AC4 80240514 F7B40068 */ sdc1 $f20, 0x68($sp) +/* EE6AC8 80240518 0C01B198 */ jal osGetCause +/* EE6ACC 8024051C 27A40010 */ addiu $a0, $sp, 0x10 +/* EE6AD0 80240520 3C108024 */ lui $s0, %hi(func_80243B44_C74FC4) +/* EE6AD4 80240524 26103B44 */ addiu $s0, $s0, %lo(func_80243B44_C74FC4) +/* EE6AD8 80240528 C6000000 */ lwc1 $f0, ($s0) +/* EE6ADC 8024052C 3C014130 */ lui $at, 0x4130 +/* EE6AE0 80240530 44816000 */ mtc1 $at, $f12 +/* EE6AE4 80240534 0C00AD17 */ jal func_8002B45C +/* EE6AE8 80240538 460C0303 */ div.s $f12, $f0, $f12 +/* EE6AEC 8024053C 3C018024 */ lui $at, %hi(D_80245350) +/* EE6AF0 80240540 D4345350 */ ldc1 $f20, %lo(D_80245350)($at) +/* EE6AF4 80240544 46000021 */ cvt.d.s $f0, $f0 +/* EE6AF8 80240548 46340002 */ mul.d $f0, $f0, $f20 +/* EE6AFC 8024054C 00000000 */ nop +/* EE6B00 80240550 3C018024 */ lui $at, %hi(D_80245358) +/* EE6B04 80240554 D4365358 */ ldc1 $f22, %lo(D_80245358)($at) +/* EE6B08 80240558 C6020000 */ lwc1 $f2, ($s0) +/* EE6B0C 8024055C 3C014140 */ lui $at, 0x4140 +/* EE6B10 80240560 44816000 */ mtc1 $at, $f12 +/* EE6B14 80240564 46360000 */ add.d $f0, $f0, $f22 +/* EE6B18 80240568 460C1303 */ div.s $f12, $f2, $f12 +/* EE6B1C 8024056C 46200020 */ cvt.s.d $f0, $f0 +/* EE6B20 80240570 0C00AD17 */ jal func_8002B45C +/* EE6B24 80240574 E7A00010 */ swc1 $f0, 0x10($sp) +/* EE6B28 80240578 46000021 */ cvt.d.s $f0, $f0 +/* EE6B2C 8024057C 46340002 */ mul.d $f0, $f0, $f20 +/* EE6B30 80240580 00000000 */ nop +/* EE6B34 80240584 C6020000 */ lwc1 $f2, ($s0) +/* EE6B38 80240588 3C014150 */ lui $at, 0x4150 +/* EE6B3C 8024058C 44816000 */ mtc1 $at, $f12 +/* EE6B40 80240590 00000000 */ nop +/* EE6B44 80240594 460C1303 */ div.s $f12, $f2, $f12 +/* EE6B48 80240598 46200020 */ cvt.s.d $f0, $f0 +/* EE6B4C 8024059C 0C00AD30 */ jal func_8002B4C0 +/* EE6B50 802405A0 E7A00014 */ swc1 $f0, 0x14($sp) +/* EE6B54 802405A4 46000021 */ cvt.d.s $f0, $f0 +/* EE6B58 802405A8 46340002 */ mul.d $f0, $f0, $f20 +/* EE6B5C 802405AC 00000000 */ nop +/* EE6B60 802405B0 C60C0000 */ lwc1 $f12, ($s0) +/* EE6B64 802405B4 3C0140E0 */ lui $at, 0x40e0 +/* EE6B68 802405B8 44811000 */ mtc1 $at, $f2 +/* EE6B6C 802405BC 3C013F80 */ lui $at, 0x3f80 +/* EE6B70 802405C0 44812000 */ mtc1 $at, $f4 +/* EE6B74 802405C4 46026303 */ div.s $f12, $f12, $f2 +/* EE6B78 802405C8 46046300 */ add.s $f12, $f12, $f4 +/* EE6B7C 802405CC 46200020 */ cvt.s.d $f0, $f0 +/* EE6B80 802405D0 0C00AD17 */ jal func_8002B45C +/* EE6B84 802405D4 E7A00018 */ swc1 $f0, 0x18($sp) +/* EE6B88 802405D8 46000021 */ cvt.d.s $f0, $f0 +/* EE6B8C 802405DC 46340002 */ mul.d $f0, $f0, $f20 +/* EE6B90 802405E0 00000000 */ nop +/* EE6B94 802405E4 C6020000 */ lwc1 $f2, ($s0) +/* EE6B98 802405E8 3C014160 */ lui $at, 0x4160 +/* EE6B9C 802405EC 44816000 */ mtc1 $at, $f12 +/* EE6BA0 802405F0 46360000 */ add.d $f0, $f0, $f22 +/* EE6BA4 802405F4 460C1303 */ div.s $f12, $f2, $f12 +/* EE6BA8 802405F8 46200020 */ cvt.s.d $f0, $f0 +/* EE6BAC 802405FC 0C00AD17 */ jal func_8002B45C +/* EE6BB0 80240600 E7A00024 */ swc1 $f0, 0x24($sp) +/* EE6BB4 80240604 46000021 */ cvt.d.s $f0, $f0 +/* EE6BB8 80240608 46340002 */ mul.d $f0, $f0, $f20 +/* EE6BBC 8024060C 00000000 */ nop +/* EE6BC0 80240610 C6020000 */ lwc1 $f2, ($s0) +/* EE6BC4 80240614 3C014170 */ lui $at, 0x4170 +/* EE6BC8 80240618 44816000 */ mtc1 $at, $f12 +/* EE6BCC 8024061C 00000000 */ nop +/* EE6BD0 80240620 460C1303 */ div.s $f12, $f2, $f12 +/* EE6BD4 80240624 46200020 */ cvt.s.d $f0, $f0 +/* EE6BD8 80240628 0C00AD30 */ jal func_8002B4C0 +/* EE6BDC 8024062C E7A00020 */ swc1 $f0, 0x20($sp) +/* EE6BE0 80240630 46000021 */ cvt.d.s $f0, $f0 +/* EE6BE4 80240634 46340002 */ mul.d $f0, $f0, $f20 +/* EE6BE8 80240638 00000000 */ nop +/* EE6BEC 8024063C C60C0000 */ lwc1 $f12, ($s0) +/* EE6BF0 80240640 3C013E80 */ lui $at, 0x3e80 +/* EE6BF4 80240644 44811000 */ mtc1 $at, $f2 +/* EE6BF8 80240648 00000000 */ nop +/* EE6BFC 8024064C 46026302 */ mul.s $f12, $f12, $f2 +/* EE6C00 80240650 00000000 */ nop +/* EE6C04 80240654 3C014000 */ lui $at, 0x4000 +/* EE6C08 80240658 44811000 */ mtc1 $at, $f2 +/* EE6C0C 8024065C 00000000 */ nop +/* EE6C10 80240660 46026300 */ add.s $f12, $f12, $f2 +/* EE6C14 80240664 46200020 */ cvt.s.d $f0, $f0 +/* EE6C18 80240668 0C00AD17 */ jal func_8002B45C +/* EE6C1C 8024066C E7A00028 */ swc1 $f0, 0x28($sp) +/* EE6C20 80240670 46000021 */ cvt.d.s $f0, $f0 +/* EE6C24 80240674 46340002 */ mul.d $f0, $f0, $f20 +/* EE6C28 80240678 00000000 */ nop +/* EE6C2C 8024067C C6020000 */ lwc1 $f2, ($s0) +/* EE6C30 80240680 3C013D80 */ lui $at, 0x3d80 +/* EE6C34 80240684 44816000 */ mtc1 $at, $f12 +/* EE6C38 80240688 00000000 */ nop +/* EE6C3C 8024068C 460C1302 */ mul.s $f12, $f2, $f12 +/* EE6C40 80240690 00000000 */ nop +/* EE6C44 80240694 46360000 */ add.d $f0, $f0, $f22 +/* EE6C48 80240698 46200020 */ cvt.s.d $f0, $f0 +/* EE6C4C 8024069C 0C00AD17 */ jal func_8002B45C +/* EE6C50 802406A0 E7A00038 */ swc1 $f0, 0x38($sp) +/* EE6C54 802406A4 46000021 */ cvt.d.s $f0, $f0 +/* EE6C58 802406A8 46340002 */ mul.d $f0, $f0, $f20 +/* EE6C5C 802406AC 00000000 */ nop +/* EE6C60 802406B0 C6020000 */ lwc1 $f2, ($s0) +/* EE6C64 802406B4 3C014188 */ lui $at, 0x4188 +/* EE6C68 802406B8 44816000 */ mtc1 $at, $f12 +/* EE6C6C 802406BC 00000000 */ nop +/* EE6C70 802406C0 460C1303 */ div.s $f12, $f2, $f12 +/* EE6C74 802406C4 46200020 */ cvt.s.d $f0, $f0 +/* EE6C78 802406C8 0C00AD30 */ jal func_8002B4C0 +/* EE6C7C 802406CC E7A00030 */ swc1 $f0, 0x30($sp) +/* EE6C80 802406D0 3C030001 */ lui $v1, 1 +/* EE6C84 802406D4 46000021 */ cvt.d.s $f0, $f0 +/* EE6C88 802406D8 46340002 */ mul.d $f0, $f0, $f20 +/* EE6C8C 802406DC 00000000 */ nop +/* EE6C90 802406E0 34631630 */ ori $v1, $v1, 0x1630 +/* EE6C94 802406E4 27A40010 */ addiu $a0, $sp, 0x10 +/* EE6C98 802406E8 3C058008 */ lui $a1, %hi(D_80079540) +/* EE6C9C 802406EC 94A59540 */ lhu $a1, %lo(D_80079540)($a1) +/* EE6CA0 802406F0 3C02800A */ lui $v0, %hi(D_800A15CC) +/* EE6CA4 802406F4 8C4215CC */ lw $v0, %lo(D_800A15CC)($v0) +/* EE6CA8 802406F8 00052980 */ sll $a1, $a1, 6 +/* EE6CAC 802406FC 00A32821 */ addu $a1, $a1, $v1 +/* EE6CB0 80240700 00452821 */ addu $a1, $v0, $a1 +/* EE6CB4 80240704 46200020 */ cvt.s.d $f0, $f0 +/* EE6CB8 80240708 0C01B1B0 */ jal osSpDeviceBusy +/* EE6CBC 8024070C E7A00034 */ swc1 $f0, 0x34($sp) +/* EE6CC0 80240710 0000202D */ daddu $a0, $zero, $zero +/* EE6CC4 80240714 27A50050 */ addiu $a1, $sp, 0x50 +/* EE6CC8 80240718 27A60054 */ addiu $a2, $sp, 0x54 +/* EE6CCC 8024071C 0C0499BE */ jal func_801266F8 +/* EE6CD0 80240720 27A70058 */ addiu $a3, $sp, 0x58 +/* EE6CD4 80240724 3C03DA38 */ lui $v1, 0xda38 +/* EE6CD8 80240728 34630001 */ ori $v1, $v1, 1 +/* EE6CDC 8024072C 3C080001 */ lui $t0, 1 +/* EE6CE0 80240730 35081630 */ ori $t0, $t0, 0x1630 +/* EE6CE4 80240734 3C06800A */ lui $a2, %hi(D_800A15C4) +/* EE6CE8 80240738 24C615C4 */ addiu $a2, $a2, %lo(D_800A15C4) +/* EE6CEC 8024073C 0000202D */ daddu $a0, $zero, $zero +/* EE6CF0 80240740 3C058008 */ lui $a1, %hi(D_80079540) +/* EE6CF4 80240744 24A59540 */ addiu $a1, $a1, %lo(D_80079540) +/* EE6CF8 80240748 8CD00000 */ lw $s0, ($a2) +/* EE6CFC 8024074C 94A20000 */ lhu $v0, ($a1) +/* EE6D00 80240750 0200382D */ daddu $a3, $s0, $zero +/* EE6D04 80240754 26100008 */ addiu $s0, $s0, 8 +/* EE6D08 80240758 ACD00000 */ sw $s0, ($a2) +/* EE6D0C 8024075C ACE30000 */ sw $v1, ($a3) +/* EE6D10 80240760 24430001 */ addiu $v1, $v0, 1 +/* EE6D14 80240764 3042FFFF */ andi $v0, $v0, 0xffff +/* EE6D18 80240768 00021180 */ sll $v0, $v0, 6 +/* EE6D1C 8024076C A4A30000 */ sh $v1, ($a1) +/* EE6D20 80240770 3C03800A */ lui $v1, %hi(D_800A15CC) +/* EE6D24 80240774 8C6315CC */ lw $v1, %lo(D_800A15CC)($v1) +/* EE6D28 80240778 00481021 */ addu $v0, $v0, $t0 +/* EE6D2C 8024077C 00621821 */ addu $v1, $v1, $v0 +/* EE6D30 80240780 26020008 */ addiu $v0, $s0, 8 +/* EE6D34 80240784 ACE30004 */ sw $v1, 4($a3) +/* EE6D38 80240788 ACC20000 */ sw $v0, ($a2) +/* EE6D3C 8024078C 3C02DE00 */ lui $v0, 0xde00 +/* EE6D40 80240790 0C0499CD */ jal func_80126734 +/* EE6D44 80240794 AE020000 */ sw $v0, ($s0) +/* EE6D48 80240798 3C038024 */ lui $v1, %hi(func_80243B44_C74FC4) +/* EE6D4C 8024079C 24633B44 */ addiu $v1, $v1, %lo(func_80243B44_C74FC4) +/* EE6D50 802407A0 C4600000 */ lwc1 $f0, ($v1) +/* EE6D54 802407A4 3C013F80 */ lui $at, 0x3f80 +/* EE6D58 802407A8 44811000 */ mtc1 $at, $f2 +/* EE6D5C 802407AC 00000000 */ nop +/* EE6D60 802407B0 46020000 */ add.s $f0, $f0, $f2 +/* EE6D64 802407B4 AE020004 */ sw $v0, 4($s0) +/* EE6D68 802407B8 E4600000 */ swc1 $f0, ($v1) +/* EE6D6C 802407BC 8FBF0064 */ lw $ra, 0x64($sp) +/* EE6D70 802407C0 8FB00060 */ lw $s0, 0x60($sp) +/* EE6D74 802407C4 D7B60070 */ ldc1 $f22, 0x70($sp) +/* EE6D78 802407C8 D7B40068 */ ldc1 $f20, 0x68($sp) +/* EE6D7C 802407CC 03E00008 */ jr $ra +/* EE6D80 802407D0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/code_EE65B0/func_802407D4_EE6D84.s b/asm/nonmatchings/code_EE65B0/func_802407D4_EE6D84.s new file mode 100644 index 0000000000..7a3d2f82ae --- /dev/null +++ b/asm/nonmatchings/code_EE65B0/func_802407D4_EE6D84.s @@ -0,0 +1,221 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407D4_EE6D84 +/* EE6D84 802407D4 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* EE6D88 802407D8 24040001 */ addiu $a0, $zero, 1 +/* EE6D8C 802407DC 27A50010 */ addiu $a1, $sp, 0x10 +/* EE6D90 802407E0 27A60014 */ addiu $a2, $sp, 0x14 +/* EE6D94 802407E4 AFBF0030 */ sw $ra, 0x30($sp) +/* EE6D98 802407E8 AFB3002C */ sw $s3, 0x2c($sp) +/* EE6D9C 802407EC AFB20028 */ sw $s2, 0x28($sp) +/* EE6DA0 802407F0 AFB10024 */ sw $s1, 0x24($sp) +/* EE6DA4 802407F4 AFB00020 */ sw $s0, 0x20($sp) +/* EE6DA8 802407F8 F7BA0050 */ sdc1 $f26, 0x50($sp) +/* EE6DAC 802407FC F7B80048 */ sdc1 $f24, 0x48($sp) +/* EE6DB0 80240800 F7B60040 */ sdc1 $f22, 0x40($sp) +/* EE6DB4 80240804 F7B40038 */ sdc1 $f20, 0x38($sp) +/* EE6DB8 80240808 0C0499BE */ jal func_801266F8 +/* EE6DBC 8024080C 27A70018 */ addiu $a3, $sp, 0x18 +/* EE6DC0 80240810 8FA20018 */ lw $v0, 0x18($sp) +/* EE6DC4 80240814 18400072 */ blez $v0, .L802409E0 +/* EE6DC8 80240818 0000902D */ daddu $s2, $zero, $zero +/* EE6DCC 8024081C 3C138024 */ lui $s3, %hi(D_80243B48) +/* EE6DD0 80240820 26733B48 */ addiu $s3, $s3, %lo(D_80243B48) +/* EE6DD4 80240824 3C014334 */ lui $at, 0x4334 +/* EE6DD8 80240828 4481D000 */ mtc1 $at, $f26 +/* EE6DDC 8024082C 3C018024 */ lui $at, %hi(D_80245360) +/* EE6DE0 80240830 D4385360 */ ldc1 $f24, %lo(D_80245360)($at) +/* EE6DE4 80240834 3C018024 */ lui $at, %hi(D_80245368) +/* EE6DE8 80240838 D4365368 */ ldc1 $f22, %lo(D_80245368)($at) +/* EE6DEC 8024083C 00122100 */ sll $a0, $s2, 4 +.L80240840: +/* EE6DF0 80240840 8FA20010 */ lw $v0, 0x10($sp) +/* EE6DF4 80240844 8FA30014 */ lw $v1, 0x14($sp) +/* EE6DF8 80240848 00448021 */ addu $s0, $v0, $a0 +/* EE6DFC 8024084C 86020000 */ lh $v0, ($s0) +/* EE6E00 80240850 28420259 */ slti $v0, $v0, 0x259 +/* EE6E04 80240854 1040005D */ beqz $v0, .L802409CC +/* EE6E08 80240858 00648821 */ addu $s1, $v1, $a0 +/* EE6E0C 8024085C C66C0000 */ lwc1 $f12, ($s3) +/* EE6E10 80240860 46806320 */ cvt.s.w $f12, $f12 +/* EE6E14 80240864 461A6303 */ div.s $f12, $f12, $f26 +/* EE6E18 80240868 46006321 */ cvt.d.s $f12, $f12 +/* EE6E1C 8024086C 46386302 */ mul.d $f12, $f12, $f24 +/* EE6E20 80240870 00000000 */ nop +/* EE6E24 80240874 0C00AD17 */ jal func_8002B45C +/* EE6E28 80240878 46206320 */ cvt.s.d $f12, $f12 +/* EE6E2C 8024087C C66C0000 */ lwc1 $f12, ($s3) +/* EE6E30 80240880 46806320 */ cvt.s.w $f12, $f12 +/* EE6E34 80240884 461A6303 */ div.s $f12, $f12, $f26 +/* EE6E38 80240888 46006321 */ cvt.d.s $f12, $f12 +/* EE6E3C 8024088C 46386302 */ mul.d $f12, $f12, $f24 +/* EE6E40 80240890 00000000 */ nop +/* EE6E44 80240894 3C018024 */ lui $at, %hi(D_80245370) +/* EE6E48 80240898 D4225370 */ ldc1 $f2, %lo(D_80245370)($at) +/* EE6E4C 8024089C 46000521 */ cvt.d.s $f20, $f0 +/* EE6E50 802408A0 4622A502 */ mul.d $f20, $f20, $f2 +/* EE6E54 802408A4 00000000 */ nop +/* EE6E58 802408A8 3C018024 */ lui $at, %hi(D_80245378) +/* EE6E5C 802408AC D4205378 */ ldc1 $f0, %lo(D_80245378)($at) +/* EE6E60 802408B0 4620A500 */ add.d $f20, $f20, $f0 +/* EE6E64 802408B4 46206320 */ cvt.s.d $f12, $f12 +/* EE6E68 802408B8 0C00AD17 */ jal func_8002B45C +/* EE6E6C 802408BC 4620A520 */ cvt.s.d $f20, $f20 +/* EE6E70 802408C0 46000021 */ cvt.d.s $f0, $f0 +/* EE6E74 802408C4 46360002 */ mul.d $f0, $f0, $f22 +/* EE6E78 802408C8 00000000 */ nop +/* EE6E7C 802408CC 86020000 */ lh $v0, ($s0) +/* EE6E80 802408D0 2442FD98 */ addiu $v0, $v0, -0x268 +/* EE6E84 802408D4 44822000 */ mtc1 $v0, $f4 +/* EE6E88 802408D8 00000000 */ nop +/* EE6E8C 802408DC 46802120 */ cvt.s.w $f4, $f4 +/* EE6E90 802408E0 46142102 */ mul.s $f4, $f4, $f20 +/* EE6E94 802408E4 00000000 */ nop +/* EE6E98 802408E8 4620B001 */ sub.d $f0, $f22, $f0 +/* EE6E9C 802408EC 3C01C240 */ lui $at, 0xc240 +/* EE6EA0 802408F0 44813000 */ mtc1 $at, $f6 +/* EE6EA4 802408F4 46200020 */ cvt.s.d $f0, $f0 +/* EE6EA8 802408F8 46060182 */ mul.s $f6, $f0, $f6 +/* EE6EAC 802408FC 00000000 */ nop +/* EE6EB0 80240900 3C01441A */ lui $at, 0x441a +/* EE6EB4 80240904 44811000 */ mtc1 $at, $f2 +/* EE6EB8 80240908 00000000 */ nop +/* EE6EBC 8024090C 46022100 */ add.s $f4, $f4, $f2 +/* EE6EC0 80240910 46062100 */ add.s $f4, $f4, $f6 +/* EE6EC4 80240914 3C0141C8 */ lui $at, 0x41c8 +/* EE6EC8 80240918 44813000 */ mtc1 $at, $f6 +/* EE6ECC 8024091C 00000000 */ nop +/* EE6ED0 80240920 46060182 */ mul.s $f6, $f0, $f6 +/* EE6ED4 80240924 00000000 */ nop +/* EE6ED8 80240928 4600220D */ trunc.w.s $f8, $f4 +/* EE6EDC 8024092C 44024000 */ mfc1 $v0, $f8 +/* EE6EE0 80240930 00000000 */ nop +/* EE6EE4 80240934 A6220000 */ sh $v0, ($s1) +/* EE6EE8 80240938 86020002 */ lh $v0, 2($s0) +/* EE6EEC 8024093C 2442FFD4 */ addiu $v0, $v0, -0x2c +/* EE6EF0 80240940 44821000 */ mtc1 $v0, $f2 +/* EE6EF4 80240944 00000000 */ nop +/* EE6EF8 80240948 468010A0 */ cvt.s.w $f2, $f2 +/* EE6EFC 8024094C 46141082 */ mul.s $f2, $f2, $f20 +/* EE6F00 80240950 00000000 */ nop +/* EE6F04 80240954 3C014230 */ lui $at, 0x4230 +/* EE6F08 80240958 44812000 */ mtc1 $at, $f4 +/* EE6F0C 8024095C 00000000 */ nop +/* EE6F10 80240960 46041080 */ add.s $f2, $f2, $f4 +/* EE6F14 80240964 46061080 */ add.s $f2, $f2, $f6 +/* EE6F18 80240968 3C01C2AE */ lui $at, 0xc2ae +/* EE6F1C 8024096C 44812000 */ mtc1 $at, $f4 +/* EE6F20 80240970 00000000 */ nop +/* EE6F24 80240974 46040002 */ mul.s $f0, $f0, $f4 +/* EE6F28 80240978 00000000 */ nop +/* EE6F2C 8024097C 4600120D */ trunc.w.s $f8, $f2 +/* EE6F30 80240980 44024000 */ mfc1 $v0, $f8 +/* EE6F34 80240984 00000000 */ nop +/* EE6F38 80240988 A6220002 */ sh $v0, 2($s1) +/* EE6F3C 8024098C 86020004 */ lh $v0, 4($s0) +/* EE6F40 80240990 2442FF8F */ addiu $v0, $v0, -0x71 +/* EE6F44 80240994 44821000 */ mtc1 $v0, $f2 +/* EE6F48 80240998 00000000 */ nop +/* EE6F4C 8024099C 468010A0 */ cvt.s.w $f2, $f2 +/* EE6F50 802409A0 46141082 */ mul.s $f2, $f2, $f20 +/* EE6F54 802409A4 00000000 */ nop +/* EE6F58 802409A8 3C0142E2 */ lui $at, 0x42e2 +/* EE6F5C 802409AC 44812000 */ mtc1 $at, $f4 +/* EE6F60 802409B0 00000000 */ nop +/* EE6F64 802409B4 46041080 */ add.s $f2, $f2, $f4 +/* EE6F68 802409B8 46001080 */ add.s $f2, $f2, $f0 +/* EE6F6C 802409BC 4600120D */ trunc.w.s $f8, $f2 +/* EE6F70 802409C0 44024000 */ mfc1 $v0, $f8 +/* EE6F74 802409C4 00000000 */ nop +/* EE6F78 802409C8 A6220004 */ sh $v0, 4($s1) +.L802409CC: +/* EE6F7C 802409CC 8FA20018 */ lw $v0, 0x18($sp) +/* EE6F80 802409D0 26520001 */ addiu $s2, $s2, 1 +/* EE6F84 802409D4 0242102A */ slt $v0, $s2, $v0 +/* EE6F88 802409D8 1440FF99 */ bnez $v0, .L80240840 +/* EE6F8C 802409DC 00122100 */ sll $a0, $s2, 4 +.L802409E0: +/* EE6F90 802409E0 3C03800A */ lui $v1, %hi(D_800A15C4) +/* EE6F94 802409E4 246315C4 */ addiu $v1, $v1, %lo(D_800A15C4) +/* EE6F98 802409E8 8C620000 */ lw $v0, ($v1) +/* EE6F9C 802409EC 24040001 */ addiu $a0, $zero, 1 +/* EE6FA0 802409F0 0040802D */ daddu $s0, $v0, $zero +/* EE6FA4 802409F4 24420008 */ addiu $v0, $v0, 8 +/* EE6FA8 802409F8 AC620000 */ sw $v0, ($v1) +/* EE6FAC 802409FC 3C02DE00 */ lui $v0, 0xde00 +/* EE6FB0 80240A00 0C0499CD */ jal func_80126734 +/* EE6FB4 80240A04 AE020000 */ sw $v0, ($s0) +/* EE6FB8 80240A08 0000202D */ daddu $a0, $zero, $zero +/* EE6FBC 80240A0C 3C05F971 */ lui $a1, 0xf971 +/* EE6FC0 80240A10 34A588A4 */ ori $a1, $a1, 0x88a4 +/* EE6FC4 80240A14 0C0B53A3 */ jal func_802D4E8C +/* EE6FC8 80240A18 AE020004 */ sw $v0, 4($s0) +/* EE6FCC 80240A1C 10400017 */ beqz $v0, .L80240A7C +/* EE6FD0 80240A20 00000000 */ nop +/* EE6FD4 80240A24 3C048024 */ lui $a0, %hi(D_80243B48) +/* EE6FD8 80240A28 24843B48 */ addiu $a0, $a0, %lo(D_80243B48) +/* EE6FDC 80240A2C 8C830000 */ lw $v1, ($a0) +/* EE6FE0 80240A30 2862005B */ slti $v0, $v1, 0x5b +/* EE6FE4 80240A34 14400005 */ bnez $v0, .L80240A4C +/* EE6FE8 80240A38 2862FFA6 */ slti $v0, $v1, -0x5a +/* EE6FEC 80240A3C 2462FE98 */ addiu $v0, $v1, -0x168 +/* EE6FF0 80240A40 AC820000 */ sw $v0, ($a0) +/* EE6FF4 80240A44 8C830000 */ lw $v1, ($a0) +/* EE6FF8 80240A48 2862FFA6 */ slti $v0, $v1, -0x5a +.L80240A4C: +/* EE6FFC 80240A4C 14400002 */ bnez $v0, .L80240A58 +/* EE7000 80240A50 24620014 */ addiu $v0, $v1, 0x14 +/* EE7004 80240A54 24620005 */ addiu $v0, $v1, 5 +.L80240A58: +/* EE7008 80240A58 AC820000 */ sw $v0, ($a0) +/* EE700C 80240A5C 3C038024 */ lui $v1, %hi(D_80243B48) +/* EE7010 80240A60 24633B48 */ addiu $v1, $v1, %lo(D_80243B48) +/* EE7014 80240A64 8C620000 */ lw $v0, ($v1) +/* EE7018 80240A68 2842005A */ slti $v0, $v0, 0x5a +/* EE701C 80240A6C 14400013 */ bnez $v0, .L80240ABC +/* EE7020 80240A70 2402005A */ addiu $v0, $zero, 0x5a +/* EE7024 80240A74 080902AF */ j .L80240ABC +/* EE7028 80240A78 AC620000 */ sw $v0, ($v1) +.L80240A7C: +/* EE702C 80240A7C 3C028024 */ lui $v0, %hi(D_80243B48) +/* EE7030 80240A80 8C423B48 */ lw $v0, %lo(D_80243B48)($v0) +/* EE7034 80240A84 2442FF73 */ addiu $v0, $v0, -0x8d +/* EE7038 80240A88 2C420077 */ sltiu $v0, $v0, 0x77 +/* EE703C 80240A8C 10400004 */ beqz $v0, .L80240AA0 +/* EE7040 80240A90 24020001 */ addiu $v0, $zero, 1 +/* EE7044 80240A94 3C018024 */ lui $at, %hi(func_802431FC_95E3FC) +/* EE7048 80240A98 080902AA */ j .L80240AA8 +/* EE704C 80240A9C AC2231FC */ sw $v0, %lo(func_802431FC_95E3FC)($at) +.L80240AA0: +/* EE7050 80240AA0 3C018024 */ lui $at, %hi(func_802431FC_95E3FC) +/* EE7054 80240AA4 AC2031FC */ sw $zero, %lo(func_802431FC_95E3FC)($at) +.L80240AA8: +/* EE7058 80240AA8 3C038024 */ lui $v1, %hi(D_80243B48) +/* EE705C 80240AAC 24633B48 */ addiu $v1, $v1, %lo(D_80243B48) +/* EE7060 80240AB0 8C620000 */ lw $v0, ($v1) +/* EE7064 80240AB4 24420005 */ addiu $v0, $v0, 5 +/* EE7068 80240AB8 AC620000 */ sw $v0, ($v1) +.L80240ABC: +/* EE706C 80240ABC 3C048024 */ lui $a0, %hi(D_80243B48) +/* EE7070 80240AC0 24843B48 */ addiu $a0, $a0, %lo(D_80243B48) +/* EE7074 80240AC4 8C830000 */ lw $v1, ($a0) +/* EE7078 80240AC8 28620168 */ slti $v0, $v1, 0x168 +/* EE707C 80240ACC 14400002 */ bnez $v0, .L80240AD8 +/* EE7080 80240AD0 2462FE98 */ addiu $v0, $v1, -0x168 +/* EE7084 80240AD4 AC820000 */ sw $v0, ($a0) +.L80240AD8: +/* EE7088 80240AD8 8FBF0030 */ lw $ra, 0x30($sp) +/* EE708C 80240ADC 8FB3002C */ lw $s3, 0x2c($sp) +/* EE7090 80240AE0 8FB20028 */ lw $s2, 0x28($sp) +/* EE7094 80240AE4 8FB10024 */ lw $s1, 0x24($sp) +/* EE7098 80240AE8 8FB00020 */ lw $s0, 0x20($sp) +/* EE709C 80240AEC D7BA0050 */ ldc1 $f26, 0x50($sp) +/* EE70A0 80240AF0 D7B80048 */ ldc1 $f24, 0x48($sp) +/* EE70A4 80240AF4 D7B60040 */ ldc1 $f22, 0x40($sp) +/* EE70A8 80240AF8 D7B40038 */ ldc1 $f20, 0x38($sp) +/* EE70AC 80240AFC 03E00008 */ jr $ra +/* EE70B0 80240B00 27BD0058 */ addiu $sp, $sp, 0x58 +/* EE70B4 80240B04 00000000 */ nop +/* EE70B8 80240B08 00000000 */ nop +/* EE70BC 80240B0C 00000000 */ nop diff --git a/asm/nonmatchings/code_EE70C0/func_80240B10_EE70C0.s b/asm/nonmatchings/code_EE70C0/func_80240B10_EE70C0.s new file mode 100644 index 0000000000..36827b215b --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_80240B10_EE70C0.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B10_EE70C0 +/* EE70C0 80240B10 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EE70C4 80240B14 AFB3002C */ sw $s3, 0x2c($sp) +/* EE70C8 80240B18 0080982D */ daddu $s3, $a0, $zero +/* EE70CC 80240B1C AFBF0030 */ sw $ra, 0x30($sp) +/* EE70D0 80240B20 AFB20028 */ sw $s2, 0x28($sp) +/* EE70D4 80240B24 AFB10024 */ sw $s1, 0x24($sp) +/* EE70D8 80240B28 AFB00020 */ sw $s0, 0x20($sp) +/* EE70DC 80240B2C 8E710148 */ lw $s1, 0x148($s3) +/* EE70E0 80240B30 86240008 */ lh $a0, 8($s1) +/* EE70E4 80240B34 0C00F92F */ jal func_8003E4BC +/* EE70E8 80240B38 00A0902D */ daddu $s2, $a1, $zero +/* EE70EC 80240B3C 8E440004 */ lw $a0, 4($s2) +/* EE70F0 80240B40 0040802D */ daddu $s0, $v0, $zero +/* EE70F4 80240B44 00041FC2 */ srl $v1, $a0, 0x1f +/* EE70F8 80240B48 00832021 */ addu $a0, $a0, $v1 +/* EE70FC 80240B4C 00042043 */ sra $a0, $a0, 1 +/* EE7100 80240B50 0C00AB3B */ jal func_8002ACEC +/* EE7104 80240B54 24840001 */ addiu $a0, $a0, 1 +/* EE7108 80240B58 8E430004 */ lw $v1, 4($s2) +/* EE710C 80240B5C 000327C2 */ srl $a0, $v1, 0x1f +/* EE7110 80240B60 00641821 */ addu $v1, $v1, $a0 +/* EE7114 80240B64 00031843 */ sra $v1, $v1, 1 +/* EE7118 80240B68 00621821 */ addu $v1, $v1, $v0 +/* EE711C 80240B6C A603008E */ sh $v1, 0x8e($s0) +/* EE7120 80240B70 8E2300D0 */ lw $v1, 0xd0($s1) +/* EE7124 80240B74 C6000040 */ lwc1 $f0, 0x40($s0) +/* EE7128 80240B78 C4640000 */ lwc1 $f4, ($v1) +/* EE712C 80240B7C 46802120 */ cvt.s.w $f4, $f4 +/* EE7130 80240B80 C4620008 */ lwc1 $f2, 8($v1) +/* EE7134 80240B84 468010A0 */ cvt.s.w $f2, $f2 +/* EE7138 80240B88 E7A00010 */ swc1 $f0, 0x10($sp) +/* EE713C 80240B8C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE7140 80240B90 44061000 */ mfc1 $a2, $f2 +/* EE7144 80240B94 C440000C */ lwc1 $f0, 0xc($v0) +/* EE7148 80240B98 46800020 */ cvt.s.w $f0, $f0 +/* EE714C 80240B9C E7A00014 */ swc1 $f0, 0x14($sp) +/* EE7150 80240BA0 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE7154 80240BA4 44052000 */ mfc1 $a1, $f4 +/* EE7158 80240BA8 C4400010 */ lwc1 $f0, 0x10($v0) +/* EE715C 80240BAC 46800020 */ cvt.s.w $f0, $f0 +/* EE7160 80240BB0 E7A00018 */ swc1 $f0, 0x18($sp) +/* EE7164 80240BB4 8C640018 */ lw $a0, 0x18($v1) +/* EE7168 80240BB8 0C013431 */ jal func_8004D0C4 +/* EE716C 80240BBC 8E070038 */ lw $a3, 0x38($s0) +/* EE7170 80240BC0 1040000E */ beqz $v0, .L80240BFC +/* EE7174 80240BC4 00000000 */ nop +/* EE7178 80240BC8 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE717C 80240BCC C60C0038 */ lwc1 $f12, 0x38($s0) +/* EE7180 80240BD0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EE7184 80240BD4 C4460000 */ lwc1 $f6, ($v0) +/* EE7188 80240BD8 468031A0 */ cvt.s.w $f6, $f6 +/* EE718C 80240BDC 44063000 */ mfc1 $a2, $f6 +/* EE7190 80240BE0 C4460008 */ lwc1 $f6, 8($v0) +/* EE7194 80240BE4 468031A0 */ cvt.s.w $f6, $f6 +/* EE7198 80240BE8 44073000 */ mfc1 $a3, $f6 +/* EE719C 80240BEC 0C00ABDC */ jal fio_validate_header_checksums +/* EE71A0 80240BF0 00000000 */ nop +/* EE71A4 80240BF4 0809030B */ j .L80240C2C +/* EE71A8 80240BF8 E600000C */ swc1 $f0, 0xc($s0) +.L80240BFC: +/* EE71AC 80240BFC 0C00AB3B */ jal func_8002ACEC +/* EE71B0 80240C00 2404003C */ addiu $a0, $zero, 0x3c +/* EE71B4 80240C04 C60C000C */ lwc1 $f12, 0xc($s0) +/* EE71B8 80240C08 44820000 */ mtc1 $v0, $f0 +/* EE71BC 80240C0C 00000000 */ nop +/* EE71C0 80240C10 46800020 */ cvt.s.w $f0, $f0 +/* EE71C4 80240C14 46006300 */ add.s $f12, $f12, $f0 +/* EE71C8 80240C18 3C0141F0 */ lui $at, 0x41f0 +/* EE71CC 80240C1C 44810000 */ mtc1 $at, $f0 +/* EE71D0 80240C20 0C00AB85 */ jal func_8002AE14 +/* EE71D4 80240C24 46006301 */ sub.s $f12, $f12, $f0 +/* EE71D8 80240C28 E600000C */ swc1 $f0, 0xc($s0) +.L80240C2C: +/* EE71DC 80240C2C 8E2200CC */ lw $v0, 0xcc($s1) +/* EE71E0 80240C30 8C420004 */ lw $v0, 4($v0) +/* EE71E4 80240C34 AE020028 */ sw $v0, 0x28($s0) +/* EE71E8 80240C38 AE600074 */ sw $zero, 0x74($s3) +/* EE71EC 80240C3C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE71F0 80240C40 8C420014 */ lw $v0, 0x14($v0) +/* EE71F4 80240C44 04410004 */ bgez $v0, .L80240C58 +/* EE71F8 80240C48 00000000 */ nop +/* EE71FC 80240C4C C6400000 */ lwc1 $f0, ($s2) +/* EE7200 80240C50 0809031E */ j .L80240C78 +/* EE7204 80240C54 E6000018 */ swc1 $f0, 0x18($s0) +.L80240C58: +/* EE7208 80240C58 3C018024 */ lui $at, %hi(D_80245380) +/* EE720C 80240C5C D4225380 */ ldc1 $f2, %lo(D_80245380)($at) +/* EE7210 80240C60 44820000 */ mtc1 $v0, $f0 +/* EE7214 80240C64 00000000 */ nop +/* EE7218 80240C68 46800021 */ cvt.d.w $f0, $f0 +/* EE721C 80240C6C 46220003 */ div.d $f0, $f0, $f2 +/* EE7220 80240C70 46200020 */ cvt.s.d $f0, $f0 +/* EE7224 80240C74 E6000018 */ swc1 $f0, 0x18($s0) +.L80240C78: +/* EE7228 80240C78 C600003C */ lwc1 $f0, 0x3c($s0) +/* EE722C 80240C7C 3C014059 */ lui $at, 0x4059 +/* EE7230 80240C80 44811800 */ mtc1 $at, $f3 +/* EE7234 80240C84 44801000 */ mtc1 $zero, $f2 +/* EE7238 80240C88 46000021 */ cvt.d.s $f0, $f0 +/* EE723C 80240C8C 46220002 */ mul.d $f0, $f0, $f2 +/* EE7240 80240C90 00000000 */ nop +/* EE7244 80240C94 24020001 */ addiu $v0, $zero, 1 +/* EE7248 80240C98 4620018D */ trunc.w.d $f6, $f0 +/* EE724C 80240C9C E626007C */ swc1 $f6, 0x7c($s1) +/* EE7250 80240CA0 AE620070 */ sw $v0, 0x70($s3) +/* EE7254 80240CA4 8FBF0030 */ lw $ra, 0x30($sp) +/* EE7258 80240CA8 8FB3002C */ lw $s3, 0x2c($sp) +/* EE725C 80240CAC 8FB20028 */ lw $s2, 0x28($sp) +/* EE7260 80240CB0 8FB10024 */ lw $s1, 0x24($sp) +/* EE7264 80240CB4 8FB00020 */ lw $s0, 0x20($sp) +/* EE7268 80240CB8 03E00008 */ jr $ra +/* EE726C 80240CBC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EE70C0/func_80240CC0_EE7270.s b/asm/nonmatchings/code_EE70C0/func_80240CC0_EE7270.s new file mode 100644 index 0000000000..a08e03f9f0 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_80240CC0_EE7270.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CC0_EE7270 +/* EE7270 80240CC0 27BDFF80 */ addiu $sp, $sp, -0x80 +/* EE7274 80240CC4 AFB3004C */ sw $s3, 0x4c($sp) +/* EE7278 80240CC8 0080982D */ daddu $s3, $a0, $zero +/* EE727C 80240CCC AFBF0058 */ sw $ra, 0x58($sp) +/* EE7280 80240CD0 AFB50054 */ sw $s5, 0x54($sp) +/* EE7284 80240CD4 AFB40050 */ sw $s4, 0x50($sp) +/* EE7288 80240CD8 AFB20048 */ sw $s2, 0x48($sp) +/* EE728C 80240CDC AFB10044 */ sw $s1, 0x44($sp) +/* EE7290 80240CE0 AFB00040 */ sw $s0, 0x40($sp) +/* EE7294 80240CE4 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* EE7298 80240CE8 F7B80070 */ sdc1 $f24, 0x70($sp) +/* EE729C 80240CEC F7B60068 */ sdc1 $f22, 0x68($sp) +/* EE72A0 80240CF0 F7B40060 */ sdc1 $f20, 0x60($sp) +/* EE72A4 80240CF4 8E710148 */ lw $s1, 0x148($s3) +/* EE72A8 80240CF8 00A0902D */ daddu $s2, $a1, $zero +/* EE72AC 80240CFC 86240008 */ lh $a0, 8($s1) +/* EE72B0 80240D00 0C00F92F */ jal func_8003E4BC +/* EE72B4 80240D04 00C0A82D */ daddu $s5, $a2, $zero +/* EE72B8 80240D08 0040802D */ daddu $s0, $v0, $zero +/* EE72BC 80240D0C 0000A02D */ daddu $s4, $zero, $zero +/* EE72C0 80240D10 C624007C */ lwc1 $f4, 0x7c($s1) +/* EE72C4 80240D14 46802120 */ cvt.s.w $f4, $f4 +/* EE72C8 80240D18 C6220088 */ lwc1 $f2, 0x88($s1) +/* EE72CC 80240D1C 468010A0 */ cvt.s.w $f2, $f2 +/* EE72D0 80240D20 460010A1 */ cvt.d.s $f2, $f2 +/* EE72D4 80240D24 46002121 */ cvt.d.s $f4, $f4 +/* EE72D8 80240D28 C600003C */ lwc1 $f0, 0x3c($s0) +/* EE72DC 80240D2C 3C014059 */ lui $at, 0x4059 +/* EE72E0 80240D30 44813800 */ mtc1 $at, $f7 +/* EE72E4 80240D34 44803000 */ mtc1 $zero, $f6 +/* EE72E8 80240D38 46000021 */ cvt.d.s $f0, $f0 +/* EE72EC 80240D3C 46260002 */ mul.d $f0, $f0, $f6 +/* EE72F0 80240D40 00000000 */ nop +/* EE72F4 80240D44 24020001 */ addiu $v0, $zero, 1 +/* EE72F8 80240D48 8E24006C */ lw $a0, 0x6c($s1) +/* EE72FC 80240D4C 46261083 */ div.d $f2, $f2, $f6 +/* EE7300 80240D50 462010A0 */ cvt.s.d $f2, $f2 +/* EE7304 80240D54 46262103 */ div.d $f4, $f4, $f6 +/* EE7308 80240D58 46202520 */ cvt.s.d $f20, $f4 +/* EE730C 80240D5C 30830011 */ andi $v1, $a0, 0x11 +/* EE7310 80240D60 4620020D */ trunc.w.d $f8, $f0 +/* EE7314 80240D64 E628007C */ swc1 $f8, 0x7c($s1) +/* EE7318 80240D68 C6200078 */ lwc1 $f0, 0x78($s1) +/* EE731C 80240D6C 46800020 */ cvt.s.w $f0, $f0 +/* EE7320 80240D70 46000021 */ cvt.d.s $f0, $f0 +/* EE7324 80240D74 46260003 */ div.d $f0, $f0, $f6 +/* EE7328 80240D78 462006A0 */ cvt.s.d $f26, $f0 +/* EE732C 80240D7C C6200070 */ lwc1 $f0, 0x70($s1) +/* EE7330 80240D80 46800020 */ cvt.s.w $f0, $f0 +/* EE7334 80240D84 46000021 */ cvt.d.s $f0, $f0 +/* EE7338 80240D88 46260003 */ div.d $f0, $f0, $f6 +/* EE733C 80240D8C 462005A0 */ cvt.s.d $f22, $f0 +/* EE7340 80240D90 14620025 */ bne $v1, $v0, .L80240E28 +/* EE7344 80240D94 4602D600 */ add.s $f24, $f26, $f2 +/* EE7348 80240D98 8E020000 */ lw $v0, ($s0) +/* EE734C 80240D9C 30420008 */ andi $v0, $v0, 8 +/* EE7350 80240DA0 10400009 */ beqz $v0, .L80240DC8 +/* EE7354 80240DA4 27A50028 */ addiu $a1, $sp, 0x28 +/* EE7358 80240DA8 C600003C */ lwc1 $f0, 0x3c($s0) +/* EE735C 80240DAC 4600C001 */ sub.s $f0, $f24, $f0 +/* EE7360 80240DB0 4600B03C */ c.lt.s $f22, $f0 +/* EE7364 80240DB4 00000000 */ nop +/* EE7368 80240DB8 4500001B */ bc1f .L80240E28 +/* EE736C 80240DBC 34820010 */ ori $v0, $a0, 0x10 +/* EE7370 80240DC0 0809038A */ j .L80240E28 +/* EE7374 80240DC4 AE22006C */ sw $v0, 0x6c($s1) +.L80240DC8: +/* EE7378 80240DC8 27A6002C */ addiu $a2, $sp, 0x2c +/* EE737C 80240DCC C6000038 */ lwc1 $f0, 0x38($s0) +/* EE7380 80240DD0 C602003C */ lwc1 $f2, 0x3c($s0) +/* EE7384 80240DD4 C6040040 */ lwc1 $f4, 0x40($s0) +/* EE7388 80240DD8 3C01447A */ lui $at, 0x447a +/* EE738C 80240DDC 44813000 */ mtc1 $at, $f6 +/* EE7390 80240DE0 27A20034 */ addiu $v0, $sp, 0x34 +/* EE7394 80240DE4 E7A00028 */ swc1 $f0, 0x28($sp) +/* EE7398 80240DE8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EE739C 80240DEC E7A40030 */ swc1 $f4, 0x30($sp) +/* EE73A0 80240DF0 E7A60034 */ swc1 $f6, 0x34($sp) +/* EE73A4 80240DF4 AFA20010 */ sw $v0, 0x10($sp) +/* EE73A8 80240DF8 8E040080 */ lw $a0, 0x80($s0) +/* EE73AC 80240DFC 0C03908F */ jal func_800E423C +/* EE73B0 80240E00 27A70030 */ addiu $a3, $sp, 0x30 +/* EE73B4 80240E04 C7A00034 */ lwc1 $f0, 0x34($sp) +/* EE73B8 80240E08 4600D001 */ sub.s $f0, $f26, $f0 +/* EE73BC 80240E0C 4600B03C */ c.lt.s $f22, $f0 +/* EE73C0 80240E10 00000000 */ nop +/* EE73C4 80240E14 45000004 */ bc1f .L80240E28 +/* EE73C8 80240E18 00000000 */ nop +/* EE73CC 80240E1C 8E22006C */ lw $v0, 0x6c($s1) +/* EE73D0 80240E20 34420010 */ ori $v0, $v0, 0x10 +/* EE73D4 80240E24 AE22006C */ sw $v0, 0x6c($s1) +.L80240E28: +/* EE73D8 80240E28 8E22006C */ lw $v0, 0x6c($s1) +/* EE73DC 80240E2C 24030011 */ addiu $v1, $zero, 0x11 +/* EE73E0 80240E30 30420011 */ andi $v0, $v0, 0x11 +/* EE73E4 80240E34 14430039 */ bne $v0, $v1, .L80240F1C +/* EE73E8 80240E38 00000000 */ nop +/* EE73EC 80240E3C 8E020000 */ lw $v0, ($s0) +/* EE73F0 80240E40 30420008 */ andi $v0, $v0, 8 +/* EE73F4 80240E44 1040000A */ beqz $v0, .L80240E70 +/* EE73F8 80240E48 4600C106 */ mov.s $f4, $f24 +/* EE73FC 80240E4C 4614C081 */ sub.s $f2, $f24, $f20 +/* EE7400 80240E50 3C018024 */ lui $at, %hi(D_80245388) +/* EE7404 80240E54 D4205388 */ ldc1 $f0, %lo(D_80245388)($at) +/* EE7408 80240E58 460010A1 */ cvt.d.s $f2, $f2 +/* EE740C 80240E5C 46201082 */ mul.d $f2, $f2, $f0 +/* EE7410 80240E60 00000000 */ nop +/* EE7414 80240E64 4600A021 */ cvt.d.s $f0, $f20 +/* EE7418 80240E68 080903B5 */ j .L80240ED4 +/* EE741C 80240E6C 46220000 */ add.d $f0, $f0, $f2 +.L80240E70: +/* EE7420 80240E70 27A50028 */ addiu $a1, $sp, 0x28 +/* EE7424 80240E74 27A6002C */ addiu $a2, $sp, 0x2c +/* EE7428 80240E78 C6000038 */ lwc1 $f0, 0x38($s0) +/* EE742C 80240E7C C6020040 */ lwc1 $f2, 0x40($s0) +/* EE7430 80240E80 3C01447A */ lui $at, 0x447a +/* EE7434 80240E84 44812000 */ mtc1 $at, $f4 +/* EE7438 80240E88 27A20034 */ addiu $v0, $sp, 0x34 +/* EE743C 80240E8C E7B4002C */ swc1 $f20, 0x2c($sp) +/* EE7440 80240E90 E7A00028 */ swc1 $f0, 0x28($sp) +/* EE7444 80240E94 E7A20030 */ swc1 $f2, 0x30($sp) +/* EE7448 80240E98 E7A40034 */ swc1 $f4, 0x34($sp) +/* EE744C 80240E9C AFA20010 */ sw $v0, 0x10($sp) +/* EE7450 80240EA0 8E040080 */ lw $a0, 0x80($s0) +/* EE7454 80240EA4 0C03908F */ jal func_800E423C +/* EE7458 80240EA8 27A70030 */ addiu $a3, $sp, 0x30 +/* EE745C 80240EAC C7A4002C */ lwc1 $f4, 0x2c($sp) +/* EE7460 80240EB0 461A2100 */ add.s $f4, $f4, $f26 +/* EE7464 80240EB4 46142081 */ sub.s $f2, $f4, $f20 +/* EE7468 80240EB8 3C018024 */ lui $at, %hi(D_80245390) +/* EE746C 80240EBC D4205390 */ ldc1 $f0, %lo(D_80245390)($at) +/* EE7470 80240EC0 460010A1 */ cvt.d.s $f2, $f2 +/* EE7474 80240EC4 46201082 */ mul.d $f2, $f2, $f0 +/* EE7478 80240EC8 00000000 */ nop +/* EE747C 80240ECC 4600A021 */ cvt.d.s $f0, $f20 +/* EE7480 80240ED0 46220000 */ add.d $f0, $f0, $f2 +.L80240ED4: +/* EE7484 80240ED4 46200020 */ cvt.s.d $f0, $f0 +/* EE7488 80240ED8 E600003C */ swc1 $f0, 0x3c($s0) +/* EE748C 80240EDC C600003C */ lwc1 $f0, 0x3c($s0) +/* EE7490 80240EE0 46002001 */ sub.s $f0, $f4, $f0 +/* EE7494 80240EE4 3C013FF0 */ lui $at, 0x3ff0 +/* EE7498 80240EE8 44811800 */ mtc1 $at, $f3 +/* EE749C 80240EEC 44801000 */ mtc1 $zero, $f2 +/* EE74A0 80240EF0 46000005 */ abs.s $f0, $f0 +/* EE74A4 80240EF4 46000021 */ cvt.d.s $f0, $f0 +/* EE74A8 80240EF8 4622003C */ c.lt.d $f0, $f2 +/* EE74AC 80240EFC 00000000 */ nop +/* EE74B0 80240F00 45000036 */ bc1f .L80240FDC +/* EE74B4 80240F04 2403FFEF */ addiu $v1, $zero, -0x11 +/* EE74B8 80240F08 E604003C */ swc1 $f4, 0x3c($s0) +/* EE74BC 80240F0C 8E22006C */ lw $v0, 0x6c($s1) +/* EE74C0 80240F10 00431024 */ and $v0, $v0, $v1 +/* EE74C4 80240F14 080903F7 */ j .L80240FDC +/* EE74C8 80240F18 AE22006C */ sw $v0, 0x6c($s1) +.L80240F1C: +/* EE74CC 80240F1C 8E220070 */ lw $v0, 0x70($s1) +/* EE74D0 80240F20 1840002E */ blez $v0, .L80240FDC +/* EE74D4 80240F24 00000000 */ nop +/* EE74D8 80240F28 C62C0074 */ lwc1 $f12, 0x74($s1) +/* EE74DC 80240F2C 0C00AD77 */ jal func_8002B5DC +/* EE74E0 80240F30 46806320 */ cvt.s.w $f12, $f12 +/* EE74E4 80240F34 8E020000 */ lw $v0, ($s0) +/* EE74E8 80240F38 30420008 */ andi $v0, $v0, 8 +/* EE74EC 80240F3C 10400003 */ beqz $v0, .L80240F4C +/* EE74F0 80240F40 46000506 */ mov.s $f20, $f0 +/* EE74F4 80240F44 080903E3 */ j .L80240F8C +/* EE74F8 80240F48 0000102D */ daddu $v0, $zero, $zero +.L80240F4C: +/* EE74FC 80240F4C 27A50028 */ addiu $a1, $sp, 0x28 +/* EE7500 80240F50 27A6002C */ addiu $a2, $sp, 0x2c +/* EE7504 80240F54 C6000038 */ lwc1 $f0, 0x38($s0) +/* EE7508 80240F58 C602003C */ lwc1 $f2, 0x3c($s0) +/* EE750C 80240F5C C6040040 */ lwc1 $f4, 0x40($s0) +/* EE7510 80240F60 3C01447A */ lui $at, 0x447a +/* EE7514 80240F64 44813000 */ mtc1 $at, $f6 +/* EE7518 80240F68 27A20034 */ addiu $v0, $sp, 0x34 +/* EE751C 80240F6C E7A00028 */ swc1 $f0, 0x28($sp) +/* EE7520 80240F70 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EE7524 80240F74 E7A40030 */ swc1 $f4, 0x30($sp) +/* EE7528 80240F78 E7A60034 */ swc1 $f6, 0x34($sp) +/* EE752C 80240F7C AFA20010 */ sw $v0, 0x10($sp) +/* EE7530 80240F80 8E040080 */ lw $a0, 0x80($s0) +/* EE7534 80240F84 0C03908F */ jal func_800E423C +/* EE7538 80240F88 27A70030 */ addiu $a3, $sp, 0x30 +.L80240F8C: +/* EE753C 80240F8C 10400007 */ beqz $v0, .L80240FAC +/* EE7540 80240F90 00000000 */ nop +/* EE7544 80240F94 4616A082 */ mul.s $f2, $f20, $f22 +/* EE7548 80240F98 00000000 */ nop +/* EE754C 80240F9C C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EE7550 80240FA0 461A0000 */ add.s $f0, $f0, $f26 +/* EE7554 80240FA4 080903EE */ j .L80240FB8 +/* EE7558 80240FA8 46020000 */ add.s $f0, $f0, $f2 +.L80240FAC: +/* EE755C 80240FAC 4616A002 */ mul.s $f0, $f20, $f22 +/* EE7560 80240FB0 00000000 */ nop +/* EE7564 80240FB4 4600C000 */ add.s $f0, $f24, $f0 +.L80240FB8: +/* EE7568 80240FB8 E600003C */ swc1 $f0, 0x3c($s0) +/* EE756C 80240FBC 8E220074 */ lw $v0, 0x74($s1) +/* EE7570 80240FC0 2442000A */ addiu $v0, $v0, 0xa +/* EE7574 80240FC4 44826000 */ mtc1 $v0, $f12 +/* EE7578 80240FC8 00000000 */ nop +/* EE757C 80240FCC 0C00AB85 */ jal func_8002AE14 +/* EE7580 80240FD0 46806320 */ cvt.s.w $f12, $f12 +/* EE7584 80240FD4 4600020D */ trunc.w.s $f8, $f0 +/* EE7588 80240FD8 E6280074 */ swc1 $f8, 0x74($s1) +.L80240FDC: +/* EE758C 80240FDC 8E220090 */ lw $v0, 0x90($s1) +/* EE7590 80240FE0 1C40004A */ bgtz $v0, .L8024110C +/* EE7594 80240FE4 2442FFFF */ addiu $v0, $v0, -1 +/* EE7598 80240FE8 8E430014 */ lw $v1, 0x14($s2) +/* EE759C 80240FEC 04600048 */ bltz $v1, .L80241110 +/* EE75A0 80240FF0 00000000 */ nop +/* EE75A4 80240FF4 8E620074 */ lw $v0, 0x74($s3) +/* EE75A8 80240FF8 1C400042 */ bgtz $v0, .L80241104 +/* EE75AC 80240FFC 2442FFFF */ addiu $v0, $v0, -1 +/* EE75B0 80241000 AE630074 */ sw $v1, 0x74($s3) +/* EE75B4 80241004 860200A8 */ lh $v0, 0xa8($s0) +/* EE75B8 80241008 C602003C */ lwc1 $f2, 0x3c($s0) +/* EE75BC 8024100C 44820000 */ mtc1 $v0, $f0 +/* EE75C0 80241010 00000000 */ nop +/* EE75C4 80241014 46800020 */ cvt.s.w $f0, $f0 +/* EE75C8 80241018 46001080 */ add.s $f2, $f2, $f0 +/* EE75CC 8024101C 3C014024 */ lui $at, 0x4024 +/* EE75D0 80241020 44810800 */ mtc1 $at, $f1 +/* EE75D4 80241024 44800000 */ mtc1 $zero, $f0 +/* EE75D8 80241028 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EE75DC 8024102C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EE75E0 80241030 460010A1 */ cvt.d.s $f2, $f2 +/* EE75E4 80241034 46201080 */ add.d $f2, $f2, $f0 +/* EE75E8 80241038 C440002C */ lwc1 $f0, 0x2c($v0) +/* EE75EC 8024103C 46000021 */ cvt.d.s $f0, $f0 +/* EE75F0 80241040 4622003C */ c.lt.d $f0, $f2 +/* EE75F4 80241044 00000000 */ nop +/* EE75F8 80241048 4500002C */ bc1f .L802410FC +/* EE75FC 8024104C 02A0202D */ daddu $a0, $s5, $zero +/* EE7600 80241050 AFA00010 */ sw $zero, 0x10($sp) +/* EE7604 80241054 8E46000C */ lw $a2, 0xc($s2) +/* EE7608 80241058 8E470010 */ lw $a3, 0x10($s2) +/* EE760C 8024105C 0C013469 */ jal func_8004D1A4 +/* EE7610 80241060 0220282D */ daddu $a1, $s1, $zero +/* EE7614 80241064 10400025 */ beqz $v0, .L802410FC +/* EE7618 80241068 0000202D */ daddu $a0, $zero, $zero +/* EE761C 8024106C 0200282D */ daddu $a1, $s0, $zero +/* EE7620 80241070 0000302D */ daddu $a2, $zero, $zero +/* EE7624 80241074 2412000C */ addiu $s2, $zero, 0xc +/* EE7628 80241078 860300A8 */ lh $v1, 0xa8($s0) +/* EE762C 8024107C 3C013F80 */ lui $at, 0x3f80 +/* EE7630 80241080 44810000 */ mtc1 $at, $f0 +/* EE7634 80241084 3C014000 */ lui $at, 0x4000 +/* EE7638 80241088 44811000 */ mtc1 $at, $f2 +/* EE763C 8024108C 3C01C1A0 */ lui $at, 0xc1a0 +/* EE7640 80241090 44812000 */ mtc1 $at, $f4 +/* EE7644 80241094 44834000 */ mtc1 $v1, $f8 +/* EE7648 80241098 00000000 */ nop +/* EE764C 8024109C 46804220 */ cvt.s.w $f8, $f8 +/* EE7650 802410A0 44074000 */ mfc1 $a3, $f8 +/* EE7654 802410A4 27A20038 */ addiu $v0, $sp, 0x38 +/* EE7658 802410A8 AFB2001C */ sw $s2, 0x1c($sp) +/* EE765C 802410AC AFA20020 */ sw $v0, 0x20($sp) +/* EE7660 802410B0 E7A00010 */ swc1 $f0, 0x10($sp) +/* EE7664 802410B4 E7A20014 */ swc1 $f2, 0x14($sp) +/* EE7668 802410B8 0C01D444 */ jal func_80075110 +/* EE766C 802410BC E7A40018 */ swc1 $f4, 0x18($sp) +/* EE7670 802410C0 0200202D */ daddu $a0, $s0, $zero +/* EE7674 802410C4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EE7678 802410C8 C480003C */ lwc1 $f0, 0x3c($a0) +/* EE767C 802410CC 3C060020 */ lui $a2, 0x20 +/* EE7680 802410D0 0C013600 */ jal func_8004D800 +/* EE7684 802410D4 E4800064 */ swc1 $f0, 0x64($a0) +/* EE7688 802410D8 8E220018 */ lw $v0, 0x18($s1) +/* EE768C 802410DC 9442002A */ lhu $v0, 0x2a($v0) +/* EE7690 802410E0 30420001 */ andi $v0, $v0, 1 +/* EE7694 802410E4 10400003 */ beqz $v0, .L802410F4 +/* EE7698 802410E8 2402000A */ addiu $v0, $zero, 0xa +/* EE769C 802410EC 080904AD */ j .L802412B4 +/* EE76A0 802410F0 AE620070 */ sw $v0, 0x70($s3) +.L802410F4: +/* EE76A4 802410F4 080904AD */ j .L802412B4 +/* EE76A8 802410F8 AE720070 */ sw $s2, 0x70($s3) +.L802410FC: +/* EE76AC 802410FC 8E620074 */ lw $v0, 0x74($s3) +/* EE76B0 80241100 2442FFFF */ addiu $v0, $v0, -1 +.L80241104: +/* EE76B4 80241104 08090444 */ j .L80241110 +/* EE76B8 80241108 AE620074 */ sw $v0, 0x74($s3) +.L8024110C: +/* EE76BC 8024110C AE220090 */ sw $v0, 0x90($s1) +.L80241110: +/* EE76C0 80241110 8E2300D0 */ lw $v1, 0xd0($s1) +/* EE76C4 80241114 C6000040 */ lwc1 $f0, 0x40($s0) +/* EE76C8 80241118 C4620000 */ lwc1 $f2, ($v1) +/* EE76CC 8024111C 468010A0 */ cvt.s.w $f2, $f2 +/* EE76D0 80241120 C4640008 */ lwc1 $f4, 8($v1) +/* EE76D4 80241124 46802120 */ cvt.s.w $f4, $f4 +/* EE76D8 80241128 E7A00010 */ swc1 $f0, 0x10($sp) +/* EE76DC 8024112C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE76E0 80241130 44051000 */ mfc1 $a1, $f2 +/* EE76E4 80241134 C440000C */ lwc1 $f0, 0xc($v0) +/* EE76E8 80241138 46800020 */ cvt.s.w $f0, $f0 +/* EE76EC 8024113C E7A00014 */ swc1 $f0, 0x14($sp) +/* EE76F0 80241140 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE76F4 80241144 44062000 */ mfc1 $a2, $f4 +/* EE76F8 80241148 C4400010 */ lwc1 $f0, 0x10($v0) +/* EE76FC 8024114C 46800020 */ cvt.s.w $f0, $f0 +/* EE7700 80241150 E7A00018 */ swc1 $f0, 0x18($sp) +/* EE7704 80241154 8C640018 */ lw $a0, 0x18($v1) +/* EE7708 80241158 0C013431 */ jal func_8004D0C4 +/* EE770C 8024115C 8E070038 */ lw $a3, 0x38($s0) +/* EE7710 80241160 1040001A */ beqz $v0, .L802411CC +/* EE7714 80241164 00000000 */ nop +/* EE7718 80241168 8E060038 */ lw $a2, 0x38($s0) +/* EE771C 8024116C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE7720 80241170 8E070040 */ lw $a3, 0x40($s0) +/* EE7724 80241174 C44C0000 */ lwc1 $f12, ($v0) +/* EE7728 80241178 46806320 */ cvt.s.w $f12, $f12 +/* EE772C 8024117C C44E0008 */ lwc1 $f14, 8($v0) +/* EE7730 80241180 0C00AC71 */ jal func_8002B1C4 +/* EE7734 80241184 468073A0 */ cvt.s.w $f14, $f14 +/* EE7738 80241188 C6020018 */ lwc1 $f2, 0x18($s0) +/* EE773C 8024118C 4600103C */ c.lt.s $f2, $f0 +/* EE7740 80241190 00000000 */ nop +/* EE7744 80241194 4500000D */ bc1f .L802411CC +/* EE7748 80241198 E7A00034 */ swc1 $f0, 0x34($sp) +/* EE774C 8024119C C60C0038 */ lwc1 $f12, 0x38($s0) +/* EE7750 802411A0 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE7754 802411A4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EE7758 802411A8 C4480000 */ lwc1 $f8, ($v0) +/* EE775C 802411AC 46804220 */ cvt.s.w $f8, $f8 +/* EE7760 802411B0 44064000 */ mfc1 $a2, $f8 +/* EE7764 802411B4 C4480008 */ lwc1 $f8, 8($v0) +/* EE7768 802411B8 46804220 */ cvt.s.w $f8, $f8 +/* EE776C 802411BC 44074000 */ mfc1 $a3, $f8 +/* EE7770 802411C0 0C00ABDC */ jal fio_validate_header_checksums +/* EE7774 802411C4 24140001 */ addiu $s4, $zero, 1 +/* EE7778 802411C8 E600000C */ swc1 $f0, 0xc($s0) +.L802411CC: +/* EE777C 802411CC 8E2200D0 */ lw $v0, 0xd0($s1) +/* EE7780 802411D0 8C43000C */ lw $v1, 0xc($v0) +/* EE7784 802411D4 8C420010 */ lw $v0, 0x10($v0) +/* EE7788 802411D8 00621825 */ or $v1, $v1, $v0 +/* EE778C 802411DC 00741825 */ or $v1, $v1, $s4 +/* EE7790 802411E0 10600008 */ beqz $v1, .L80241204 +/* EE7794 802411E4 00000000 */ nop +/* EE7798 802411E8 8602008C */ lh $v0, 0x8c($s0) +/* EE779C 802411EC 14400031 */ bnez $v0, .L802412B4 +/* EE77A0 802411F0 00000000 */ nop +/* EE77A4 802411F4 8E050018 */ lw $a1, 0x18($s0) +/* EE77A8 802411F8 8E06000C */ lw $a2, 0xc($s0) +/* EE77AC 802411FC 0C00F909 */ jal func_8003E424 +/* EE77B0 80241200 0200202D */ daddu $a0, $s0, $zero +.L80241204: +/* EE77B4 80241204 C600003C */ lwc1 $f0, 0x3c($s0) +/* EE77B8 80241208 3C014059 */ lui $at, 0x4059 +/* EE77BC 8024120C 44811800 */ mtc1 $at, $f3 +/* EE77C0 80241210 44801000 */ mtc1 $zero, $f2 +/* EE77C4 80241214 46000021 */ cvt.d.s $f0, $f0 +/* EE77C8 80241218 46220002 */ mul.d $f0, $f0, $f2 +/* EE77CC 8024121C 00000000 */ nop +/* EE77D0 80241220 4620020D */ trunc.w.d $f8, $f0 +/* EE77D4 80241224 E628007C */ swc1 $f8, 0x7c($s1) +/* EE77D8 80241228 8E420004 */ lw $v0, 4($s2) +/* EE77DC 8024122C 18400021 */ blez $v0, .L802412B4 +/* EE77E0 80241230 00000000 */ nop +/* EE77E4 80241234 8602008E */ lh $v0, 0x8e($s0) +/* EE77E8 80241238 9603008E */ lhu $v1, 0x8e($s0) +/* EE77EC 8024123C 18400005 */ blez $v0, .L80241254 +/* EE77F0 80241240 2462FFFF */ addiu $v0, $v1, -1 +/* EE77F4 80241244 A602008E */ sh $v0, 0x8e($s0) +/* EE77F8 80241248 00021400 */ sll $v0, $v0, 0x10 +/* EE77FC 8024124C 1C400019 */ bgtz $v0, .L802412B4 +/* EE7800 80241250 00000000 */ nop +.L80241254: +/* EE7804 80241254 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EE7808 80241258 24020002 */ addiu $v0, $zero, 2 +/* EE780C 8024125C 0C00AB3B */ jal func_8002ACEC +/* EE7810 80241260 AE620070 */ sw $v0, 0x70($s3) +/* EE7814 80241264 3C035555 */ lui $v1, 0x5555 +/* EE7818 80241268 34635556 */ ori $v1, $v1, 0x5556 +/* EE781C 8024126C 00430018 */ mult $v0, $v1 +/* EE7820 80241270 000227C3 */ sra $a0, $v0, 0x1f +/* EE7824 80241274 00004010 */ mfhi $t0 +/* EE7828 80241278 01042023 */ subu $a0, $t0, $a0 +/* EE782C 8024127C 00041840 */ sll $v1, $a0, 1 +/* EE7830 80241280 00641821 */ addu $v1, $v1, $a0 +/* EE7834 80241284 00431023 */ subu $v0, $v0, $v1 +/* EE7838 80241288 24430002 */ addiu $v1, $v0, 2 +/* EE783C 8024128C AE630074 */ sw $v1, 0x74($s3) +/* EE7840 80241290 8E42002C */ lw $v0, 0x2c($s2) +/* EE7844 80241294 58400007 */ blezl $v0, .L802412B4 +/* EE7848 80241298 AE600070 */ sw $zero, 0x70($s3) +/* EE784C 8024129C 8E420008 */ lw $v0, 8($s2) +/* EE7850 802412A0 18400003 */ blez $v0, .L802412B0 +/* EE7854 802412A4 28620003 */ slti $v0, $v1, 3 +/* EE7858 802412A8 10400002 */ beqz $v0, .L802412B4 +/* EE785C 802412AC 00000000 */ nop +.L802412B0: +/* EE7860 802412B0 AE600070 */ sw $zero, 0x70($s3) +.L802412B4: +/* EE7864 802412B4 8FBF0058 */ lw $ra, 0x58($sp) +/* EE7868 802412B8 8FB50054 */ lw $s5, 0x54($sp) +/* EE786C 802412BC 8FB40050 */ lw $s4, 0x50($sp) +/* EE7870 802412C0 8FB3004C */ lw $s3, 0x4c($sp) +/* EE7874 802412C4 8FB20048 */ lw $s2, 0x48($sp) +/* EE7878 802412C8 8FB10044 */ lw $s1, 0x44($sp) +/* EE787C 802412CC 8FB00040 */ lw $s0, 0x40($sp) +/* EE7880 802412D0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* EE7884 802412D4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* EE7888 802412D8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* EE788C 802412DC D7B40060 */ ldc1 $f20, 0x60($sp) +/* EE7890 802412E0 03E00008 */ jr $ra +/* EE7894 802412E4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/code_EE70C0/func_802412E8_EE7898.s b/asm/nonmatchings/code_EE70C0/func_802412E8_EE7898.s new file mode 100644 index 0000000000..dfef72f411 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_802412E8_EE7898.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412E8_EE7898 +/* EE7898 802412E8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EE789C 802412EC AFB3001C */ sw $s3, 0x1c($sp) +/* EE78A0 802412F0 0080982D */ daddu $s3, $a0, $zero +/* EE78A4 802412F4 AFBF0020 */ sw $ra, 0x20($sp) +/* EE78A8 802412F8 AFB20018 */ sw $s2, 0x18($sp) +/* EE78AC 802412FC AFB10014 */ sw $s1, 0x14($sp) +/* EE78B0 80241300 AFB00010 */ sw $s0, 0x10($sp) +/* EE78B4 80241304 8E720148 */ lw $s2, 0x148($s3) +/* EE78B8 80241308 86440008 */ lh $a0, 8($s2) +/* EE78BC 8024130C 0C00F92F */ jal func_8003E4BC +/* EE78C0 80241310 00A0882D */ daddu $s1, $a1, $zero +/* EE78C4 80241314 8E240008 */ lw $a0, 8($s1) +/* EE78C8 80241318 0040802D */ daddu $s0, $v0, $zero +/* EE78CC 8024131C 00041FC2 */ srl $v1, $a0, 0x1f +/* EE78D0 80241320 00832021 */ addu $a0, $a0, $v1 +/* EE78D4 80241324 00042043 */ sra $a0, $a0, 1 +/* EE78D8 80241328 0C00AB3B */ jal func_8002ACEC +/* EE78DC 8024132C 24840001 */ addiu $a0, $a0, 1 +/* EE78E0 80241330 8E230008 */ lw $v1, 8($s1) +/* EE78E4 80241334 240400B4 */ addiu $a0, $zero, 0xb4 +/* EE78E8 80241338 00032FC2 */ srl $a1, $v1, 0x1f +/* EE78EC 8024133C 00651821 */ addu $v1, $v1, $a1 +/* EE78F0 80241340 00031843 */ sra $v1, $v1, 1 +/* EE78F4 80241344 00621821 */ addu $v1, $v1, $v0 +/* EE78F8 80241348 0C00AB3B */ jal func_8002ACEC +/* EE78FC 8024134C A603008E */ sh $v1, 0x8e($s0) +/* EE7900 80241350 C60C000C */ lwc1 $f12, 0xc($s0) +/* EE7904 80241354 44820000 */ mtc1 $v0, $f0 +/* EE7908 80241358 00000000 */ nop +/* EE790C 8024135C 46800020 */ cvt.s.w $f0, $f0 +/* EE7910 80241360 46006300 */ add.s $f12, $f12, $f0 +/* EE7914 80241364 3C0142B4 */ lui $at, 0x42b4 +/* EE7918 80241368 44810000 */ mtc1 $at, $f0 +/* EE791C 8024136C 0C00AB85 */ jal func_8002AE14 +/* EE7920 80241370 46006301 */ sub.s $f12, $f12, $f0 +/* EE7924 80241374 E600000C */ swc1 $f0, 0xc($s0) +/* EE7928 80241378 8E4200CC */ lw $v0, 0xcc($s2) +/* EE792C 8024137C 8C420000 */ lw $v0, ($v0) +/* EE7930 80241380 AE020028 */ sw $v0, 0x28($s0) +/* EE7934 80241384 24020003 */ addiu $v0, $zero, 3 +/* EE7938 80241388 AE620070 */ sw $v0, 0x70($s3) +/* EE793C 8024138C 8FBF0020 */ lw $ra, 0x20($sp) +/* EE7940 80241390 8FB3001C */ lw $s3, 0x1c($sp) +/* EE7944 80241394 8FB20018 */ lw $s2, 0x18($sp) +/* EE7948 80241398 8FB10014 */ lw $s1, 0x14($sp) +/* EE794C 8024139C 8FB00010 */ lw $s0, 0x10($sp) +/* EE7950 802413A0 03E00008 */ jr $ra +/* EE7954 802413A4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EE70C0/func_802413A8_EE7958.s b/asm/nonmatchings/code_EE70C0/func_802413A8_EE7958.s new file mode 100644 index 0000000000..6347e21df3 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_802413A8_EE7958.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413A8_EE7958 +/* EE7958 802413A8 27BDFF88 */ addiu $sp, $sp, -0x78 +/* EE795C 802413AC AFB3004C */ sw $s3, 0x4c($sp) +/* EE7960 802413B0 0080982D */ daddu $s3, $a0, $zero +/* EE7964 802413B4 AFBF0054 */ sw $ra, 0x54($sp) +/* EE7968 802413B8 AFB40050 */ sw $s4, 0x50($sp) +/* EE796C 802413BC AFB20048 */ sw $s2, 0x48($sp) +/* EE7970 802413C0 AFB10044 */ sw $s1, 0x44($sp) +/* EE7974 802413C4 AFB00040 */ sw $s0, 0x40($sp) +/* EE7978 802413C8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* EE797C 802413CC F7B80068 */ sdc1 $f24, 0x68($sp) +/* EE7980 802413D0 F7B60060 */ sdc1 $f22, 0x60($sp) +/* EE7984 802413D4 F7B40058 */ sdc1 $f20, 0x58($sp) +/* EE7988 802413D8 8E710148 */ lw $s1, 0x148($s3) +/* EE798C 802413DC 00A0902D */ daddu $s2, $a1, $zero +/* EE7990 802413E0 86240008 */ lh $a0, 8($s1) +/* EE7994 802413E4 0C00F92F */ jal func_8003E4BC +/* EE7998 802413E8 00C0A02D */ daddu $s4, $a2, $zero +/* EE799C 802413EC 0040802D */ daddu $s0, $v0, $zero +/* EE79A0 802413F0 C6200078 */ lwc1 $f0, 0x78($s1) +/* EE79A4 802413F4 46800020 */ cvt.s.w $f0, $f0 +/* EE79A8 802413F8 46000021 */ cvt.d.s $f0, $f0 +/* EE79AC 802413FC 3C014059 */ lui $at, 0x4059 +/* EE79B0 80241400 44811800 */ mtc1 $at, $f3 +/* EE79B4 80241404 44801000 */ mtc1 $zero, $f2 +/* EE79B8 80241408 8602008E */ lh $v0, 0x8e($s0) +/* EE79BC 8024140C 9603008E */ lhu $v1, 0x8e($s0) +/* EE79C0 80241410 46220003 */ div.d $f0, $f0, $f2 +/* EE79C4 80241414 46200620 */ cvt.s.d $f24, $f0 +/* EE79C8 80241418 C6200088 */ lwc1 $f0, 0x88($s1) +/* EE79CC 8024141C 46800020 */ cvt.s.w $f0, $f0 +/* EE79D0 80241420 46000021 */ cvt.d.s $f0, $f0 +/* EE79D4 80241424 46220003 */ div.d $f0, $f0, $f2 +/* EE79D8 80241428 46200020 */ cvt.s.d $f0, $f0 +/* EE79DC 8024142C 18400003 */ blez $v0, .L8024143C +/* EE79E0 80241430 4600C680 */ add.s $f26, $f24, $f0 +/* EE79E4 80241434 2462FFFF */ addiu $v0, $v1, -1 +/* EE79E8 80241438 A602008E */ sh $v0, 0x8e($s0) +.L8024143C: +/* EE79EC 8024143C 8E220070 */ lw $v0, 0x70($s1) +/* EE79F0 80241440 18400034 */ blez $v0, .L80241514 +/* EE79F4 80241444 00000000 */ nop +/* EE79F8 80241448 C62C0074 */ lwc1 $f12, 0x74($s1) +/* EE79FC 8024144C 46806320 */ cvt.s.w $f12, $f12 +/* EE7A00 80241450 44820000 */ mtc1 $v0, $f0 +/* EE7A04 80241454 00000000 */ nop +/* EE7A08 80241458 46800020 */ cvt.s.w $f0, $f0 +/* EE7A0C 8024145C 46000021 */ cvt.d.s $f0, $f0 +/* EE7A10 80241460 46220003 */ div.d $f0, $f0, $f2 +/* EE7A14 80241464 0C00AD77 */ jal func_8002B5DC +/* EE7A18 80241468 462005A0 */ cvt.s.d $f22, $f0 +/* EE7A1C 8024146C 8E020000 */ lw $v0, ($s0) +/* EE7A20 80241470 30420008 */ andi $v0, $v0, 8 +/* EE7A24 80241474 10400003 */ beqz $v0, .L80241484 +/* EE7A28 80241478 46000506 */ mov.s $f20, $f0 +/* EE7A2C 8024147C 08090531 */ j .L802414C4 +/* EE7A30 80241480 0000102D */ daddu $v0, $zero, $zero +.L80241484: +/* EE7A34 80241484 27A50028 */ addiu $a1, $sp, 0x28 +/* EE7A38 80241488 27A6002C */ addiu $a2, $sp, 0x2c +/* EE7A3C 8024148C C6000038 */ lwc1 $f0, 0x38($s0) +/* EE7A40 80241490 C602003C */ lwc1 $f2, 0x3c($s0) +/* EE7A44 80241494 C6040040 */ lwc1 $f4, 0x40($s0) +/* EE7A48 80241498 3C01447A */ lui $at, 0x447a +/* EE7A4C 8024149C 44813000 */ mtc1 $at, $f6 +/* EE7A50 802414A0 27A20034 */ addiu $v0, $sp, 0x34 +/* EE7A54 802414A4 E7A00028 */ swc1 $f0, 0x28($sp) +/* EE7A58 802414A8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EE7A5C 802414AC E7A40030 */ swc1 $f4, 0x30($sp) +/* EE7A60 802414B0 E7A60034 */ swc1 $f6, 0x34($sp) +/* EE7A64 802414B4 AFA20010 */ sw $v0, 0x10($sp) +/* EE7A68 802414B8 8E040080 */ lw $a0, 0x80($s0) +/* EE7A6C 802414BC 0C03908F */ jal func_800E423C +/* EE7A70 802414C0 27A70030 */ addiu $a3, $sp, 0x30 +.L802414C4: +/* EE7A74 802414C4 10400007 */ beqz $v0, .L802414E4 +/* EE7A78 802414C8 00000000 */ nop +/* EE7A7C 802414CC 4616A082 */ mul.s $f2, $f20, $f22 +/* EE7A80 802414D0 00000000 */ nop +/* EE7A84 802414D4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EE7A88 802414D8 46180000 */ add.s $f0, $f0, $f24 +/* EE7A8C 802414DC 0809053C */ j .L802414F0 +/* EE7A90 802414E0 46020000 */ add.s $f0, $f0, $f2 +.L802414E4: +/* EE7A94 802414E4 4616A002 */ mul.s $f0, $f20, $f22 +/* EE7A98 802414E8 00000000 */ nop +/* EE7A9C 802414EC 4600D000 */ add.s $f0, $f26, $f0 +.L802414F0: +/* EE7AA0 802414F0 E600003C */ swc1 $f0, 0x3c($s0) +/* EE7AA4 802414F4 8E220074 */ lw $v0, 0x74($s1) +/* EE7AA8 802414F8 2442000A */ addiu $v0, $v0, 0xa +/* EE7AAC 802414FC 44826000 */ mtc1 $v0, $f12 +/* EE7AB0 80241500 00000000 */ nop +/* EE7AB4 80241504 0C00AB85 */ jal func_8002AE14 +/* EE7AB8 80241508 46806320 */ cvt.s.w $f12, $f12 +/* EE7ABC 8024150C 4600020D */ trunc.w.s $f8, $f0 +/* EE7AC0 80241510 E6280074 */ swc1 $f8, 0x74($s1) +.L80241514: +/* EE7AC4 80241514 8E220090 */ lw $v0, 0x90($s1) +/* EE7AC8 80241518 1C400040 */ bgtz $v0, .L8024161C +/* EE7ACC 8024151C 2442FFFF */ addiu $v0, $v0, -1 +/* EE7AD0 80241520 860200A8 */ lh $v0, 0xa8($s0) +/* EE7AD4 80241524 C600003C */ lwc1 $f0, 0x3c($s0) +/* EE7AD8 80241528 44821000 */ mtc1 $v0, $f2 +/* EE7ADC 8024152C 00000000 */ nop +/* EE7AE0 80241530 468010A0 */ cvt.s.w $f2, $f2 +/* EE7AE4 80241534 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EE7AE8 80241538 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EE7AEC 8024153C 46020000 */ add.s $f0, $f0, $f2 +/* EE7AF0 80241540 3C014024 */ lui $at, 0x4024 +/* EE7AF4 80241544 44812800 */ mtc1 $at, $f5 +/* EE7AF8 80241548 44802000 */ mtc1 $zero, $f4 +/* EE7AFC 8024154C C442002C */ lwc1 $f2, 0x2c($v0) +/* EE7B00 80241550 46000021 */ cvt.d.s $f0, $f0 +/* EE7B04 80241554 46240000 */ add.d $f0, $f0, $f4 +/* EE7B08 80241558 460010A1 */ cvt.d.s $f2, $f2 +/* EE7B0C 8024155C 4620103C */ c.lt.d $f2, $f0 +/* EE7B10 80241560 00000000 */ nop +/* EE7B14 80241564 4500002E */ bc1f .L80241620 +/* EE7B18 80241568 0280202D */ daddu $a0, $s4, $zero +/* EE7B1C 8024156C 24020001 */ addiu $v0, $zero, 1 +/* EE7B20 80241570 AFA20010 */ sw $v0, 0x10($sp) +/* EE7B24 80241574 8E460024 */ lw $a2, 0x24($s2) +/* EE7B28 80241578 8E470028 */ lw $a3, 0x28($s2) +/* EE7B2C 8024157C 0C013469 */ jal func_8004D1A4 +/* EE7B30 80241580 0220282D */ daddu $a1, $s1, $zero +/* EE7B34 80241584 10400026 */ beqz $v0, .L80241620 +/* EE7B38 80241588 0000202D */ daddu $a0, $zero, $zero +/* EE7B3C 8024158C 0200282D */ daddu $a1, $s0, $zero +/* EE7B40 80241590 0000302D */ daddu $a2, $zero, $zero +/* EE7B44 80241594 2412000C */ addiu $s2, $zero, 0xc +/* EE7B48 80241598 860300A8 */ lh $v1, 0xa8($s0) +/* EE7B4C 8024159C 3C013F80 */ lui $at, 0x3f80 +/* EE7B50 802415A0 44810000 */ mtc1 $at, $f0 +/* EE7B54 802415A4 3C014000 */ lui $at, 0x4000 +/* EE7B58 802415A8 44811000 */ mtc1 $at, $f2 +/* EE7B5C 802415AC 3C01C1A0 */ lui $at, 0xc1a0 +/* EE7B60 802415B0 44812000 */ mtc1 $at, $f4 +/* EE7B64 802415B4 44834000 */ mtc1 $v1, $f8 +/* EE7B68 802415B8 00000000 */ nop +/* EE7B6C 802415BC 46804220 */ cvt.s.w $f8, $f8 +/* EE7B70 802415C0 44074000 */ mfc1 $a3, $f8 +/* EE7B74 802415C4 27A20038 */ addiu $v0, $sp, 0x38 +/* EE7B78 802415C8 AFB2001C */ sw $s2, 0x1c($sp) +/* EE7B7C 802415CC AFA20020 */ sw $v0, 0x20($sp) +/* EE7B80 802415D0 E7A00010 */ swc1 $f0, 0x10($sp) +/* EE7B84 802415D4 E7A20014 */ swc1 $f2, 0x14($sp) +/* EE7B88 802415D8 0C01D444 */ jal func_80075110 +/* EE7B8C 802415DC E7A40018 */ swc1 $f4, 0x18($sp) +/* EE7B90 802415E0 0200202D */ daddu $a0, $s0, $zero +/* EE7B94 802415E4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EE7B98 802415E8 C480003C */ lwc1 $f0, 0x3c($a0) +/* EE7B9C 802415EC 3C060020 */ lui $a2, 0x20 +/* EE7BA0 802415F0 0C013600 */ jal func_8004D800 +/* EE7BA4 802415F4 E4800064 */ swc1 $f0, 0x64($a0) +/* EE7BA8 802415F8 8E220018 */ lw $v0, 0x18($s1) +/* EE7BAC 802415FC 9442002A */ lhu $v0, 0x2a($v0) +/* EE7BB0 80241600 30420001 */ andi $v0, $v0, 1 +/* EE7BB4 80241604 10400003 */ beqz $v0, .L80241614 +/* EE7BB8 80241608 2402000A */ addiu $v0, $zero, 0xa +/* EE7BBC 8024160C 080905AF */ j .L802416BC +/* EE7BC0 80241610 AE620070 */ sw $v0, 0x70($s3) +.L80241614: +/* EE7BC4 80241614 080905AF */ j .L802416BC +/* EE7BC8 80241618 AE720070 */ sw $s2, 0x70($s3) +.L8024161C: +/* EE7BCC 8024161C AE220090 */ sw $v0, 0x90($s1) +.L80241620: +/* EE7BD0 80241620 8602008C */ lh $v0, 0x8c($s0) +/* EE7BD4 80241624 14400025 */ bnez $v0, .L802416BC +/* EE7BD8 80241628 00000000 */ nop +/* EE7BDC 8024162C 8602008E */ lh $v0, 0x8e($s0) +/* EE7BE0 80241630 1C400022 */ bgtz $v0, .L802416BC +/* EE7BE4 80241634 00000000 */ nop +/* EE7BE8 80241638 8E620074 */ lw $v0, 0x74($s3) +/* EE7BEC 8024163C 2442FFFF */ addiu $v0, $v0, -1 +/* EE7BF0 80241640 1840001D */ blez $v0, .L802416B8 +/* EE7BF4 80241644 AE620074 */ sw $v0, 0x74($s3) +/* EE7BF8 80241648 8E220018 */ lw $v0, 0x18($s1) +/* EE7BFC 8024164C 9442002A */ lhu $v0, 0x2a($v0) +/* EE7C00 80241650 30420010 */ andi $v0, $v0, 0x10 +/* EE7C04 80241654 14400007 */ bnez $v0, .L80241674 +/* EE7C08 80241658 00000000 */ nop +/* EE7C0C 8024165C C600000C */ lwc1 $f0, 0xc($s0) +/* EE7C10 80241660 3C014334 */ lui $at, 0x4334 +/* EE7C14 80241664 44816000 */ mtc1 $at, $f12 +/* EE7C18 80241668 0C00AB85 */ jal func_8002AE14 +/* EE7C1C 8024166C 460C0300 */ add.s $f12, $f0, $f12 +/* EE7C20 80241670 E600000C */ swc1 $f0, 0xc($s0) +.L80241674: +/* EE7C24 80241674 0C00AB3B */ jal func_8002ACEC +/* EE7C28 80241678 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EE7C2C 8024167C 3C032E8B */ lui $v1, 0x2e8b +/* EE7C30 80241680 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* EE7C34 80241684 00430018 */ mult $v0, $v1 +/* EE7C38 80241688 00021FC3 */ sra $v1, $v0, 0x1f +/* EE7C3C 8024168C 00004010 */ mfhi $t0 +/* EE7C40 80241690 00082043 */ sra $a0, $t0, 1 +/* EE7C44 80241694 00832023 */ subu $a0, $a0, $v1 +/* EE7C48 80241698 00041840 */ sll $v1, $a0, 1 +/* EE7C4C 8024169C 00641821 */ addu $v1, $v1, $a0 +/* EE7C50 802416A0 00031880 */ sll $v1, $v1, 2 +/* EE7C54 802416A4 00641823 */ subu $v1, $v1, $a0 +/* EE7C58 802416A8 00431023 */ subu $v0, $v0, $v1 +/* EE7C5C 802416AC 24420005 */ addiu $v0, $v0, 5 +/* EE7C60 802416B0 080905AF */ j .L802416BC +/* EE7C64 802416B4 A602008E */ sh $v0, 0x8e($s0) +.L802416B8: +/* EE7C68 802416B8 AE600070 */ sw $zero, 0x70($s3) +.L802416BC: +/* EE7C6C 802416BC 8FBF0054 */ lw $ra, 0x54($sp) +/* EE7C70 802416C0 8FB40050 */ lw $s4, 0x50($sp) +/* EE7C74 802416C4 8FB3004C */ lw $s3, 0x4c($sp) +/* EE7C78 802416C8 8FB20048 */ lw $s2, 0x48($sp) +/* EE7C7C 802416CC 8FB10044 */ lw $s1, 0x44($sp) +/* EE7C80 802416D0 8FB00040 */ lw $s0, 0x40($sp) +/* EE7C84 802416D4 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* EE7C88 802416D8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* EE7C8C 802416DC D7B60060 */ ldc1 $f22, 0x60($sp) +/* EE7C90 802416E0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* EE7C94 802416E4 03E00008 */ jr $ra +/* EE7C98 802416E8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/code_EE70C0/func_802416EC_EE7C9C.s b/asm/nonmatchings/code_EE70C0/func_802416EC_EE7C9C.s new file mode 100644 index 0000000000..123bc13533 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_802416EC_EE7C9C.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416EC_EE7C9C +/* EE7C9C 802416EC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EE7CA0 802416F0 AFB20018 */ sw $s2, 0x18($sp) +/* EE7CA4 802416F4 0080902D */ daddu $s2, $a0, $zero +/* EE7CA8 802416F8 AFBF001C */ sw $ra, 0x1c($sp) +/* EE7CAC 802416FC AFB10014 */ sw $s1, 0x14($sp) +/* EE7CB0 80241700 AFB00010 */ sw $s0, 0x10($sp) +/* EE7CB4 80241704 8E510148 */ lw $s1, 0x148($s2) +/* EE7CB8 80241708 0C00F92F */ jal func_8003E4BC +/* EE7CBC 8024170C 86240008 */ lh $a0, 8($s1) +/* EE7CC0 80241710 0040802D */ daddu $s0, $v0, $zero +/* EE7CC4 80241714 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EE7CC8 80241718 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EE7CCC 8024171C C60C0038 */ lwc1 $f12, 0x38($s0) +/* EE7CD0 80241720 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EE7CD4 80241724 A600008E */ sh $zero, 0x8e($s0) +/* EE7CD8 80241728 8C460028 */ lw $a2, 0x28($v0) +/* EE7CDC 8024172C 0C00ABDC */ jal fio_validate_header_checksums +/* EE7CE0 80241730 8C470030 */ lw $a3, 0x30($v0) +/* EE7CE4 80241734 E600000C */ swc1 $f0, 0xc($s0) +/* EE7CE8 80241738 8E2200CC */ lw $v0, 0xcc($s1) +/* EE7CEC 8024173C 8C420020 */ lw $v0, 0x20($v0) +/* EE7CF0 80241740 AE020028 */ sw $v0, 0x28($s0) +/* EE7CF4 80241744 2402000B */ addiu $v0, $zero, 0xb +/* EE7CF8 80241748 AE420070 */ sw $v0, 0x70($s2) +/* EE7CFC 8024174C 8FBF001C */ lw $ra, 0x1c($sp) +/* EE7D00 80241750 8FB20018 */ lw $s2, 0x18($sp) +/* EE7D04 80241754 8FB10014 */ lw $s1, 0x14($sp) +/* EE7D08 80241758 8FB00010 */ lw $s0, 0x10($sp) +/* EE7D0C 8024175C 03E00008 */ jr $ra +/* EE7D10 80241760 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EE70C0/func_80241764_EE7D14.s b/asm/nonmatchings/code_EE70C0/func_80241764_EE7D14.s new file mode 100644 index 0000000000..a2e07dc4f2 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_80241764_EE7D14.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241764_EE7D14 +/* EE7D14 80241764 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE7D18 80241768 AFB00010 */ sw $s0, 0x10($sp) +/* EE7D1C 8024176C 0080802D */ daddu $s0, $a0, $zero +/* EE7D20 80241770 AFBF0014 */ sw $ra, 0x14($sp) +/* EE7D24 80241774 8E020148 */ lw $v0, 0x148($s0) +/* EE7D28 80241778 0C00F92F */ jal func_8003E4BC +/* EE7D2C 8024177C 84440008 */ lh $a0, 8($v0) +/* EE7D30 80241780 9443008E */ lhu $v1, 0x8e($v0) +/* EE7D34 80241784 C440003C */ lwc1 $f0, 0x3c($v0) +/* EE7D38 80241788 24640001 */ addiu $a0, $v1, 1 +/* EE7D3C 8024178C 00031C00 */ sll $v1, $v1, 0x10 +/* EE7D40 80241790 00031B83 */ sra $v1, $v1, 0xe +/* EE7D44 80241794 A444008E */ sh $a0, 0x8e($v0) +/* EE7D48 80241798 3C018024 */ lui $at, %hi(D_802444F0) +/* EE7D4C 8024179C 00230821 */ addu $at, $at, $v1 +/* EE7D50 802417A0 C42244F0 */ lwc1 $f2, %lo(D_802444F0)($at) +/* EE7D54 802417A4 8443008E */ lh $v1, 0x8e($v0) +/* EE7D58 802417A8 46020000 */ add.s $f0, $f0, $f2 +/* EE7D5C 802417AC 28630005 */ slti $v1, $v1, 5 +/* EE7D60 802417B0 14600003 */ bnez $v1, .L802417C0 +/* EE7D64 802417B4 E440003C */ swc1 $f0, 0x3c($v0) +/* EE7D68 802417B8 2402000C */ addiu $v0, $zero, 0xc +/* EE7D6C 802417BC AE020070 */ sw $v0, 0x70($s0) +.L802417C0: +/* EE7D70 802417C0 8FBF0014 */ lw $ra, 0x14($sp) +/* EE7D74 802417C4 8FB00010 */ lw $s0, 0x10($sp) +/* EE7D78 802417C8 03E00008 */ jr $ra +/* EE7D7C 802417CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s b/asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s new file mode 100644 index 0000000000..693f9aa83f --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_802417D0_EE7D80.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417D0_EE7D80 +/* EE7D80 802417D0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EE7D84 802417D4 AFB3001C */ sw $s3, 0x1c($sp) +/* EE7D88 802417D8 0080982D */ daddu $s3, $a0, $zero +/* EE7D8C 802417DC AFBF0020 */ sw $ra, 0x20($sp) +/* EE7D90 802417E0 AFB20018 */ sw $s2, 0x18($sp) +/* EE7D94 802417E4 AFB10014 */ sw $s1, 0x14($sp) +/* EE7D98 802417E8 AFB00010 */ sw $s0, 0x10($sp) +/* EE7D9C 802417EC 8E720148 */ lw $s2, 0x148($s3) +/* EE7DA0 802417F0 86440008 */ lh $a0, 8($s2) +/* EE7DA4 802417F4 0C00F92F */ jal func_8003E4BC +/* EE7DA8 802417F8 00A0802D */ daddu $s0, $a1, $zero +/* EE7DAC 802417FC 0040882D */ daddu $s1, $v0, $zero +/* EE7DB0 80241800 C6420080 */ lwc1 $f2, 0x80($s2) +/* EE7DB4 80241804 468010A0 */ cvt.s.w $f2, $f2 +/* EE7DB8 80241808 460010A1 */ cvt.d.s $f2, $f2 +/* EE7DBC 8024180C C6400084 */ lwc1 $f0, 0x84($s2) +/* EE7DC0 80241810 46800020 */ cvt.s.w $f0, $f0 +/* EE7DC4 80241814 46000021 */ cvt.d.s $f0, $f0 +/* EE7DC8 80241818 3C014059 */ lui $at, 0x4059 +/* EE7DCC 8024181C 44812800 */ mtc1 $at, $f5 +/* EE7DD0 80241820 44802000 */ mtc1 $zero, $f4 +/* EE7DD4 80241824 8E4200CC */ lw $v0, 0xcc($s2) +/* EE7DD8 80241828 C62C0038 */ lwc1 $f12, 0x38($s1) +/* EE7DDC 8024182C C62E0040 */ lwc1 $f14, 0x40($s1) +/* EE7DE0 80241830 46241083 */ div.d $f2, $f2, $f4 +/* EE7DE4 80241834 462010A0 */ cvt.s.d $f2, $f2 +/* EE7DE8 80241838 46240003 */ div.d $f0, $f0, $f4 +/* EE7DEC 8024183C 8C420020 */ lw $v0, 0x20($v0) +/* EE7DF0 80241840 46200020 */ cvt.s.d $f0, $f0 +/* EE7DF4 80241844 E622001C */ swc1 $f2, 0x1c($s1) +/* EE7DF8 80241848 E6200014 */ swc1 $f0, 0x14($s1) +/* EE7DFC 8024184C AE220028 */ sw $v0, 0x28($s1) +/* EE7E00 80241850 C6000018 */ lwc1 $f0, 0x18($s0) +/* EE7E04 80241854 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EE7E08 80241858 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EE7E0C 8024185C E6200018 */ swc1 $f0, 0x18($s1) +/* EE7E10 80241860 8C460028 */ lw $a2, 0x28($v0) +/* EE7E14 80241864 0C00ABDC */ jal fio_validate_header_checksums +/* EE7E18 80241868 8C470030 */ lw $a3, 0x30($v0) +/* EE7E1C 8024186C E620000C */ swc1 $f0, 0xc($s1) +/* EE7E20 80241870 8E420018 */ lw $v0, 0x18($s2) +/* EE7E24 80241874 AE400074 */ sw $zero, 0x74($s2) +/* EE7E28 80241878 9442002A */ lhu $v0, 0x2a($v0) +/* EE7E2C 8024187C 30420002 */ andi $v0, $v0, 2 +/* EE7E30 80241880 10400005 */ beqz $v0, .L80241898 +/* EE7E34 80241884 24020003 */ addiu $v0, $zero, 3 +/* EE7E38 80241888 A622008E */ sh $v0, 0x8e($s1) +/* EE7E3C 8024188C 2402000D */ addiu $v0, $zero, 0xd +/* EE7E40 80241890 0809063A */ j .L802418E8 +/* EE7E44 80241894 AE620070 */ sw $v0, 0x70($s3) +.L80241898: +/* EE7E48 80241898 24030001 */ addiu $v1, $zero, 1 +/* EE7E4C 8024189C 2402000E */ addiu $v0, $zero, 0xe +/* EE7E50 802418A0 A623008E */ sh $v1, 0x8e($s1) +/* EE7E54 802418A4 AE620070 */ sw $v0, 0x70($s3) +/* EE7E58 802418A8 C6200038 */ lwc1 $f0, 0x38($s1) +/* EE7E5C 802418AC 4600018D */ trunc.w.s $f6, $f0 +/* EE7E60 802418B0 44023000 */ mfc1 $v0, $f6 +/* EE7E64 802418B4 00000000 */ nop +/* EE7E68 802418B8 A6420010 */ sh $v0, 0x10($s2) +/* EE7E6C 802418BC C620003C */ lwc1 $f0, 0x3c($s1) +/* EE7E70 802418C0 4600018D */ trunc.w.s $f6, $f0 +/* EE7E74 802418C4 44023000 */ mfc1 $v0, $f6 +/* EE7E78 802418C8 00000000 */ nop +/* EE7E7C 802418CC A6420012 */ sh $v0, 0x12($s2) +/* EE7E80 802418D0 C6200040 */ lwc1 $f0, 0x40($s1) +/* EE7E84 802418D4 A2430007 */ sb $v1, 7($s2) +/* EE7E88 802418D8 4600018D */ trunc.w.s $f6, $f0 +/* EE7E8C 802418DC 44023000 */ mfc1 $v0, $f6 +/* EE7E90 802418E0 00000000 */ nop +/* EE7E94 802418E4 A6420014 */ sh $v0, 0x14($s2) +.L802418E8: +/* EE7E98 802418E8 8FBF0020 */ lw $ra, 0x20($sp) +/* EE7E9C 802418EC 8FB3001C */ lw $s3, 0x1c($sp) +/* EE7EA0 802418F0 8FB20018 */ lw $s2, 0x18($sp) +/* EE7EA4 802418F4 8FB10014 */ lw $s1, 0x14($sp) +/* EE7EA8 802418F8 8FB00010 */ lw $s0, 0x10($sp) +/* EE7EAC 802418FC 03E00008 */ jr $ra +/* EE7EB0 80241900 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EE70C0/func_80241904_EE7EB4.s b/asm/nonmatchings/code_EE70C0/func_80241904_EE7EB4.s new file mode 100644 index 0000000000..da7b0a7ec7 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_80241904_EE7EB4.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241904_EE7EB4 +/* EE7EB4 80241904 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE7EB8 80241908 AFB00010 */ sw $s0, 0x10($sp) +/* EE7EBC 8024190C 0080802D */ daddu $s0, $a0, $zero +/* EE7EC0 80241910 AFBF0014 */ sw $ra, 0x14($sp) +/* EE7EC4 80241914 8E020148 */ lw $v0, 0x148($s0) +/* EE7EC8 80241918 0C00F92F */ jal func_8003E4BC +/* EE7ECC 8024191C 84440008 */ lh $a0, 8($v0) +/* EE7ED0 80241920 0040202D */ daddu $a0, $v0, $zero +/* EE7ED4 80241924 8482008E */ lh $v0, 0x8e($a0) +/* EE7ED8 80241928 9483008E */ lhu $v1, 0x8e($a0) +/* EE7EDC 8024192C 18400005 */ blez $v0, .L80241944 +/* EE7EE0 80241930 2462FFFF */ addiu $v0, $v1, -1 +/* EE7EE4 80241934 A482008E */ sh $v0, 0x8e($a0) +/* EE7EE8 80241938 00021400 */ sll $v0, $v0, 0x10 +/* EE7EEC 8024193C 1C400006 */ bgtz $v0, .L80241958 +/* EE7EF0 80241940 00000000 */ nop +.L80241944: +/* EE7EF4 80241944 8482008C */ lh $v0, 0x8c($a0) +/* EE7EF8 80241948 14400003 */ bnez $v0, .L80241958 +/* EE7EFC 8024194C 2402000E */ addiu $v0, $zero, 0xe +/* EE7F00 80241950 A480008E */ sh $zero, 0x8e($a0) +/* EE7F04 80241954 AE020070 */ sw $v0, 0x70($s0) +.L80241958: +/* EE7F08 80241958 8FBF0014 */ lw $ra, 0x14($sp) +/* EE7F0C 8024195C 8FB00010 */ lw $s0, 0x10($sp) +/* EE7F10 80241960 03E00008 */ jr $ra +/* EE7F14 80241964 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EE70C0/func_80241968_EE7F18.s b/asm/nonmatchings/code_EE70C0/func_80241968_EE7F18.s new file mode 100644 index 0000000000..776e674076 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_80241968_EE7F18.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241968_EE7F18 +/* EE7F18 80241968 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EE7F1C 8024196C AFB20030 */ sw $s2, 0x30($sp) +/* EE7F20 80241970 0080902D */ daddu $s2, $a0, $zero +/* EE7F24 80241974 AFBF0038 */ sw $ra, 0x38($sp) +/* EE7F28 80241978 AFB30034 */ sw $s3, 0x34($sp) +/* EE7F2C 8024197C AFB1002C */ sw $s1, 0x2c($sp) +/* EE7F30 80241980 AFB00028 */ sw $s0, 0x28($sp) +/* EE7F34 80241984 F7B60048 */ sdc1 $f22, 0x48($sp) +/* EE7F38 80241988 F7B40040 */ sdc1 $f20, 0x40($sp) +/* EE7F3C 8024198C 8E510148 */ lw $s1, 0x148($s2) +/* EE7F40 80241990 86240008 */ lh $a0, 8($s1) +/* EE7F44 80241994 0C00F92F */ jal func_8003E4BC +/* EE7F48 80241998 00A0982D */ daddu $s3, $a1, $zero +/* EE7F4C 8024199C 0040802D */ daddu $s0, $v0, $zero +/* EE7F50 802419A0 0200202D */ daddu $a0, $s0, $zero +/* EE7F54 802419A4 C6220088 */ lwc1 $f2, 0x88($s1) +/* EE7F58 802419A8 468010A0 */ cvt.s.w $f2, $f2 +/* EE7F5C 802419AC 460010A1 */ cvt.d.s $f2, $f2 +/* EE7F60 802419B0 C604001C */ lwc1 $f4, 0x1c($s0) +/* EE7F64 802419B4 C6000014 */ lwc1 $f0, 0x14($s0) +/* EE7F68 802419B8 8E050018 */ lw $a1, 0x18($s0) +/* EE7F6C 802419BC 46002100 */ add.s $f4, $f4, $f0 +/* EE7F70 802419C0 8E06000C */ lw $a2, 0xc($s0) +/* EE7F74 802419C4 C6200078 */ lwc1 $f0, 0x78($s1) +/* EE7F78 802419C8 46800020 */ cvt.s.w $f0, $f0 +/* EE7F7C 802419CC E604001C */ swc1 $f4, 0x1c($s0) +/* EE7F80 802419D0 3C014059 */ lui $at, 0x4059 +/* EE7F84 802419D4 44812800 */ mtc1 $at, $f5 +/* EE7F88 802419D8 44802000 */ mtc1 $zero, $f4 +/* EE7F8C 802419DC 46000021 */ cvt.d.s $f0, $f0 +/* EE7F90 802419E0 46240003 */ div.d $f0, $f0, $f4 +/* EE7F94 802419E4 46200520 */ cvt.s.d $f20, $f0 +/* EE7F98 802419E8 46241083 */ div.d $f2, $f2, $f4 +/* EE7F9C 802419EC 0C00F909 */ jal func_8003E424 +/* EE7FA0 802419F0 462015A0 */ cvt.s.d $f22, $f2 +/* EE7FA4 802419F4 C604001C */ lwc1 $f4, 0x1c($s0) +/* EE7FA8 802419F8 44801000 */ mtc1 $zero, $f2 +/* EE7FAC 802419FC 44801800 */ mtc1 $zero, $f3 +/* EE7FB0 80241A00 46002021 */ cvt.d.s $f0, $f4 +/* EE7FB4 80241A04 4620103E */ c.le.d $f2, $f0 +/* EE7FB8 80241A08 00000000 */ nop +/* EE7FBC 80241A0C 45000030 */ bc1f .L80241AD0 +/* EE7FC0 80241A10 00000000 */ nop +/* EE7FC4 80241A14 C600003C */ lwc1 $f0, 0x3c($s0) +/* EE7FC8 80241A18 46040000 */ add.s $f0, $f0, $f4 +/* EE7FCC 80241A1C E600003C */ swc1 $f0, 0x3c($s0) +/* EE7FD0 80241A20 8E2200CC */ lw $v0, 0xcc($s1) +/* EE7FD4 80241A24 8C420024 */ lw $v0, 0x24($v0) +/* EE7FD8 80241A28 AE020028 */ sw $v0, 0x28($s0) +/* EE7FDC 80241A2C A2200007 */ sb $zero, 7($s1) +/* EE7FE0 80241A30 8E020000 */ lw $v0, ($s0) +/* EE7FE4 80241A34 30420008 */ andi $v0, $v0, 8 +/* EE7FE8 80241A38 14400011 */ bnez $v0, .L80241A80 +/* EE7FEC 80241A3C 0000102D */ daddu $v0, $zero, $zero +/* EE7FF0 80241A40 27A50018 */ addiu $a1, $sp, 0x18 +/* EE7FF4 80241A44 27A6001C */ addiu $a2, $sp, 0x1c +/* EE7FF8 80241A48 C6000038 */ lwc1 $f0, 0x38($s0) +/* EE7FFC 80241A4C C602003C */ lwc1 $f2, 0x3c($s0) +/* EE8000 80241A50 C6040040 */ lwc1 $f4, 0x40($s0) +/* EE8004 80241A54 3C01447A */ lui $at, 0x447a +/* EE8008 80241A58 44813000 */ mtc1 $at, $f6 +/* EE800C 80241A5C 27A20024 */ addiu $v0, $sp, 0x24 +/* EE8010 80241A60 E7A00018 */ swc1 $f0, 0x18($sp) +/* EE8014 80241A64 E7A2001C */ swc1 $f2, 0x1c($sp) +/* EE8018 80241A68 E7A40020 */ swc1 $f4, 0x20($sp) +/* EE801C 80241A6C E7A60024 */ swc1 $f6, 0x24($sp) +/* EE8020 80241A70 AFA20010 */ sw $v0, 0x10($sp) +/* EE8024 80241A74 8E040080 */ lw $a0, 0x80($s0) +/* EE8028 80241A78 0C03908F */ jal func_800E423C +/* EE802C 80241A7C 27A70020 */ addiu $a3, $sp, 0x20 +.L80241A80: +/* EE8030 80241A80 1040000B */ beqz $v0, .L80241AB0 +/* EE8034 80241A84 00000000 */ nop +/* EE8038 80241A88 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EE803C 80241A8C 46140080 */ add.s $f2, $f0, $f20 +/* EE8040 80241A90 C600003C */ lwc1 $f0, 0x3c($s0) +/* EE8044 80241A94 4600103E */ c.le.s $f2, $f0 +/* EE8048 80241A98 00000000 */ nop +/* EE804C 80241A9C 4500008D */ bc1f .L80241CD4 +/* EE8050 80241AA0 00000000 */ nop +/* EE8054 80241AA4 E602003C */ swc1 $f2, 0x3c($s0) +/* EE8058 80241AA8 08090735 */ j .L80241CD4 +/* EE805C 80241AAC AE400070 */ sw $zero, 0x70($s2) +.L80241AB0: +/* EE8060 80241AB0 C602003C */ lwc1 $f2, 0x3c($s0) +/* EE8064 80241AB4 C6000064 */ lwc1 $f0, 0x64($s0) +/* EE8068 80241AB8 4602003E */ c.le.s $f0, $f2 +/* EE806C 80241ABC 00000000 */ nop +/* EE8070 80241AC0 45030084 */ bc1tl .L80241CD4 +/* EE8074 80241AC4 AE400070 */ sw $zero, 0x70($s2) +/* EE8078 80241AC8 08090735 */ j .L80241CD4 +/* EE807C 80241ACC 00000000 */ nop +.L80241AD0: +/* EE8080 80241AD0 4622003C */ c.lt.d $f0, $f2 +/* EE8084 80241AD4 00000000 */ nop +/* EE8088 80241AD8 4500007E */ bc1f .L80241CD4 +/* EE808C 80241ADC 00000000 */ nop +/* EE8090 80241AE0 9602008E */ lhu $v0, 0x8e($s0) +/* EE8094 80241AE4 24420001 */ addiu $v0, $v0, 1 +/* EE8098 80241AE8 A602008E */ sh $v0, 0x8e($s0) +/* EE809C 80241AEC 00021400 */ sll $v0, $v0, 0x10 +/* EE80A0 80241AF0 8E630020 */ lw $v1, 0x20($s3) +/* EE80A4 80241AF4 00021403 */ sra $v0, $v0, 0x10 +/* EE80A8 80241AF8 0043102A */ slt $v0, $v0, $v1 +/* EE80AC 80241AFC 14400026 */ bnez $v0, .L80241B98 +/* EE80B0 80241B00 00000000 */ nop +/* EE80B4 80241B04 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EE80B8 80241B08 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EE80BC 80241B0C 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EE80C0 80241B10 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EE80C4 80241B14 A600008E */ sh $zero, 0x8e($s0) +/* EE80C8 80241B18 8C460028 */ lw $a2, 0x28($v0) +/* EE80CC 80241B1C 0C00ABDC */ jal fio_validate_header_checksums +/* EE80D0 80241B20 8C470030 */ lw $a3, 0x30($v0) +/* EE80D4 80241B24 46000506 */ mov.s $f20, $f0 +/* EE80D8 80241B28 C60C000C */ lwc1 $f12, 0xc($s0) +/* EE80DC 80241B2C 0C00ABC6 */ jal func_8002AF18 +/* EE80E0 80241B30 4600A386 */ mov.s $f14, $f20 +/* EE80E4 80241B34 46000086 */ mov.s $f2, $f0 +/* EE80E8 80241B38 8E62001C */ lw $v0, 0x1c($s3) +/* EE80EC 80241B3C 46001005 */ abs.s $f0, $f2 +/* EE80F0 80241B40 44822000 */ mtc1 $v0, $f4 +/* EE80F4 80241B44 00000000 */ nop +/* EE80F8 80241B48 46802120 */ cvt.s.w $f4, $f4 +/* EE80FC 80241B4C 4600203C */ c.lt.s $f4, $f0 +/* EE8100 80241B50 00000000 */ nop +/* EE8104 80241B54 4500000D */ bc1f .L80241B8C +/* EE8108 80241B58 00000000 */ nop +/* EE810C 80241B5C 44800000 */ mtc1 $zero, $f0 +/* EE8110 80241B60 C614000C */ lwc1 $f20, 0xc($s0) +/* EE8114 80241B64 4600103C */ c.lt.s $f2, $f0 +/* EE8118 80241B68 00000000 */ nop +/* EE811C 80241B6C 45000006 */ bc1f .L80241B88 +/* EE8120 80241B70 00021023 */ negu $v0, $v0 +/* EE8124 80241B74 44820000 */ mtc1 $v0, $f0 +/* EE8128 80241B78 00000000 */ nop +/* EE812C 80241B7C 46800020 */ cvt.s.w $f0, $f0 +/* EE8130 80241B80 080906E3 */ j .L80241B8C +/* EE8134 80241B84 4600A500 */ add.s $f20, $f20, $f0 +.L80241B88: +/* EE8138 80241B88 4604A500 */ add.s $f20, $f20, $f4 +.L80241B8C: +/* EE813C 80241B8C 0C00AB85 */ jal func_8002AE14 +/* EE8140 80241B90 4600A306 */ mov.s $f12, $f20 +/* EE8144 80241B94 E600000C */ swc1 $f0, 0xc($s0) +.L80241B98: +/* EE8148 80241B98 8E020000 */ lw $v0, ($s0) +/* EE814C 80241B9C 30420008 */ andi $v0, $v0, 8 +/* EE8150 80241BA0 1040000A */ beqz $v0, .L80241BCC +/* EE8154 80241BA4 27A50018 */ addiu $a1, $sp, 0x18 +/* EE8158 80241BA8 C602003C */ lwc1 $f2, 0x3c($s0) +/* EE815C 80241BAC C600001C */ lwc1 $f0, 0x1c($s0) +/* EE8160 80241BB0 46001080 */ add.s $f2, $f2, $f0 +/* EE8164 80241BB4 4616103C */ c.lt.s $f2, $f22 +/* EE8168 80241BB8 00000000 */ nop +/* EE816C 80241BBC 45020045 */ bc1fl .L80241CD4 +/* EE8170 80241BC0 E602003C */ swc1 $f2, 0x3c($s0) +/* EE8174 80241BC4 08090734 */ j .L80241CD0 +/* EE8178 80241BC8 E616003C */ swc1 $f22, 0x3c($s0) +.L80241BCC: +/* EE817C 80241BCC C6000038 */ lwc1 $f0, 0x38($s0) +/* EE8180 80241BD0 27A6001C */ addiu $a2, $sp, 0x1c +/* EE8184 80241BD4 E7A00018 */ swc1 $f0, 0x18($sp) +/* EE8188 80241BD8 860200A8 */ lh $v0, 0xa8($s0) +/* EE818C 80241BDC C600001C */ lwc1 $f0, 0x1c($s0) +/* EE8190 80241BE0 C604003C */ lwc1 $f4, 0x3c($s0) +/* EE8194 80241BE4 44821000 */ mtc1 $v0, $f2 +/* EE8198 80241BE8 00000000 */ nop +/* EE819C 80241BEC 468010A0 */ cvt.s.w $f2, $f2 +/* EE81A0 80241BF0 46000005 */ abs.s $f0, $f0 +/* EE81A4 80241BF4 46020000 */ add.s $f0, $f0, $f2 +/* EE81A8 80241BF8 C6060040 */ lwc1 $f6, 0x40($s0) +/* EE81AC 80241BFC 27A20024 */ addiu $v0, $sp, 0x24 +/* EE81B0 80241C00 46022100 */ add.s $f4, $f4, $f2 +/* EE81B4 80241C04 3C014024 */ lui $at, 0x4024 +/* EE81B8 80241C08 44811800 */ mtc1 $at, $f3 +/* EE81BC 80241C0C 44801000 */ mtc1 $zero, $f2 +/* EE81C0 80241C10 46000021 */ cvt.d.s $f0, $f0 +/* EE81C4 80241C14 46220000 */ add.d $f0, $f0, $f2 +/* EE81C8 80241C18 E7A60020 */ swc1 $f6, 0x20($sp) +/* EE81CC 80241C1C E7A4001C */ swc1 $f4, 0x1c($sp) +/* EE81D0 80241C20 46200020 */ cvt.s.d $f0, $f0 +/* EE81D4 80241C24 E7A00024 */ swc1 $f0, 0x24($sp) +/* EE81D8 80241C28 AFA20010 */ sw $v0, 0x10($sp) +/* EE81DC 80241C2C 8E040080 */ lw $a0, 0x80($s0) +/* EE81E0 80241C30 0C03908F */ jal func_800E423C +/* EE81E4 80241C34 27A70020 */ addiu $a3, $sp, 0x20 +/* EE81E8 80241C38 10400015 */ beqz $v0, .L80241C90 +/* EE81EC 80241C3C 00000000 */ nop +/* EE81F0 80241C40 860200A8 */ lh $v0, 0xa8($s0) +/* EE81F4 80241C44 C604001C */ lwc1 $f4, 0x1c($s0) +/* EE81F8 80241C48 44820000 */ mtc1 $v0, $f0 +/* EE81FC 80241C4C 00000000 */ nop +/* EE8200 80241C50 46800020 */ cvt.s.w $f0, $f0 +/* EE8204 80241C54 46002085 */ abs.s $f2, $f4 +/* EE8208 80241C58 46020000 */ add.s $f0, $f0, $f2 +/* EE820C 80241C5C C7A20024 */ lwc1 $f2, 0x24($sp) +/* EE8210 80241C60 4600103E */ c.le.s $f2, $f0 +/* EE8214 80241C64 00000000 */ nop +/* EE8218 80241C68 45000005 */ bc1f .L80241C80 +/* EE821C 80241C6C 00000000 */ nop +/* EE8220 80241C70 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EE8224 80241C74 AE00001C */ sw $zero, 0x1c($s0) +/* EE8228 80241C78 08090735 */ j .L80241CD4 +/* EE822C 80241C7C E600003C */ swc1 $f0, 0x3c($s0) +.L80241C80: +/* EE8230 80241C80 C600003C */ lwc1 $f0, 0x3c($s0) +/* EE8234 80241C84 46040000 */ add.s $f0, $f0, $f4 +/* EE8238 80241C88 08090735 */ j .L80241CD4 +/* EE823C 80241C8C E600003C */ swc1 $f0, 0x3c($s0) +.L80241C90: +/* EE8240 80241C90 C606003C */ lwc1 $f6, 0x3c($s0) +/* EE8244 80241C94 860200A8 */ lh $v0, 0xa8($s0) +/* EE8248 80241C98 46163081 */ sub.s $f2, $f6, $f22 +/* EE824C 80241C9C 44820000 */ mtc1 $v0, $f0 +/* EE8250 80241CA0 00000000 */ nop +/* EE8254 80241CA4 46800020 */ cvt.s.w $f0, $f0 +/* EE8258 80241CA8 46001080 */ add.s $f2, $f2, $f0 +/* EE825C 80241CAC C604001C */ lwc1 $f4, 0x1c($s0) +/* EE8260 80241CB0 46002005 */ abs.s $f0, $f4 +/* EE8264 80241CB4 4602003C */ c.lt.s $f0, $f2 +/* EE8268 80241CB8 00000000 */ nop +/* EE826C 80241CBC 45020005 */ bc1fl .L80241CD4 +/* EE8270 80241CC0 AE00001C */ sw $zero, 0x1c($s0) +/* EE8274 80241CC4 46043000 */ add.s $f0, $f6, $f4 +/* EE8278 80241CC8 08090735 */ j .L80241CD4 +/* EE827C 80241CCC E600003C */ swc1 $f0, 0x3c($s0) +.L80241CD0: +/* EE8280 80241CD0 AE00001C */ sw $zero, 0x1c($s0) +.L80241CD4: +/* EE8284 80241CD4 8FBF0038 */ lw $ra, 0x38($sp) +/* EE8288 80241CD8 8FB30034 */ lw $s3, 0x34($sp) +/* EE828C 80241CDC 8FB20030 */ lw $s2, 0x30($sp) +/* EE8290 80241CE0 8FB1002C */ lw $s1, 0x2c($sp) +/* EE8294 80241CE4 8FB00028 */ lw $s0, 0x28($sp) +/* EE8298 80241CE8 D7B60048 */ ldc1 $f22, 0x48($sp) +/* EE829C 80241CEC D7B40040 */ ldc1 $f20, 0x40($sp) +/* EE82A0 80241CF0 03E00008 */ jr $ra +/* EE82A4 80241CF4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EE70C0/func_80241CF8_EE82A8.s b/asm/nonmatchings/code_EE70C0/func_80241CF8_EE82A8.s new file mode 100644 index 0000000000..d731132677 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_80241CF8_EE82A8.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CF8_EE82A8 +/* EE82A8 80241CF8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EE82AC 80241CFC AFB00028 */ sw $s0, 0x28($sp) +/* EE82B0 80241D00 00A0802D */ daddu $s0, $a1, $zero +/* EE82B4 80241D04 AFB1002C */ sw $s1, 0x2c($sp) +/* EE82B8 80241D08 00C0882D */ daddu $s1, $a2, $zero +/* EE82BC 80241D0C AFBF0034 */ sw $ra, 0x34($sp) +/* EE82C0 80241D10 AFB20030 */ sw $s2, 0x30($sp) +/* EE82C4 80241D14 AE200070 */ sw $zero, 0x70($s1) +/* EE82C8 80241D18 8C830000 */ lw $v1, ($a0) +/* EE82CC 80241D1C 2402FDFF */ addiu $v0, $zero, -0x201 +/* EE82D0 80241D20 A480008E */ sh $zero, 0x8e($a0) +/* EE82D4 80241D24 00621824 */ and $v1, $v1, $v0 +/* EE82D8 80241D28 34650800 */ ori $a1, $v1, 0x800 +/* EE82DC 80241D2C AC850000 */ sw $a1, ($a0) +/* EE82E0 80241D30 8E0200D0 */ lw $v0, 0xd0($s0) +/* EE82E4 80241D34 8C420034 */ lw $v0, 0x34($v0) +/* EE82E8 80241D38 10400003 */ beqz $v0, .L80241D48 +/* EE82EC 80241D3C 00E0902D */ daddu $s2, $a3, $zero +/* EE82F0 80241D40 08090754 */ j .L80241D50 +/* EE82F4 80241D44 34620808 */ ori $v0, $v1, 0x808 +.L80241D48: +/* EE82F8 80241D48 2402FFF7 */ addiu $v0, $zero, -9 +/* EE82FC 80241D4C 00A21024 */ and $v0, $a1, $v0 +.L80241D50: +/* EE8300 80241D50 AC820000 */ sw $v0, ($a0) +/* EE8304 80241D54 27A20024 */ addiu $v0, $sp, 0x24 +/* EE8308 80241D58 27A50018 */ addiu $a1, $sp, 0x18 +/* EE830C 80241D5C C4800038 */ lwc1 $f0, 0x38($a0) +/* EE8310 80241D60 C482003C */ lwc1 $f2, 0x3c($a0) +/* EE8314 80241D64 C4840040 */ lwc1 $f4, 0x40($a0) +/* EE8318 80241D68 3C01447A */ lui $at, 0x447a +/* EE831C 80241D6C 44813000 */ mtc1 $at, $f6 +/* EE8320 80241D70 27A6001C */ addiu $a2, $sp, 0x1c +/* EE8324 80241D74 E7A00018 */ swc1 $f0, 0x18($sp) +/* EE8328 80241D78 E7A2001C */ swc1 $f2, 0x1c($sp) +/* EE832C 80241D7C E7A40020 */ swc1 $f4, 0x20($sp) +/* EE8330 80241D80 E7A60024 */ swc1 $f6, 0x24($sp) +/* EE8334 80241D84 AFA20010 */ sw $v0, 0x10($sp) +/* EE8338 80241D88 8C840080 */ lw $a0, 0x80($a0) +/* EE833C 80241D8C 0C03908F */ jal func_800E423C +/* EE8340 80241D90 27A70020 */ addiu $a3, $sp, 0x20 +/* EE8344 80241D94 C7A20024 */ lwc1 $f2, 0x24($sp) +/* EE8348 80241D98 3C014059 */ lui $at, 0x4059 +/* EE834C 80241D9C 44812800 */ mtc1 $at, $f5 +/* EE8350 80241DA0 44802000 */ mtc1 $zero, $f4 +/* EE8354 80241DA4 460010A1 */ cvt.d.s $f2, $f2 +/* EE8358 80241DA8 46241082 */ mul.d $f2, $f2, $f4 +/* EE835C 80241DAC 00000000 */ nop +/* EE8360 80241DB0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EE8364 80241DB4 46000021 */ cvt.d.s $f0, $f0 +/* EE8368 80241DB8 46240002 */ mul.d $f0, $f0, $f4 +/* EE836C 80241DBC 00000000 */ nop +/* EE8370 80241DC0 3C013FE0 */ lui $at, 0x3fe0 +/* EE8374 80241DC4 44812800 */ mtc1 $at, $f5 +/* EE8378 80241DC8 44802000 */ mtc1 $zero, $f4 +/* EE837C 80241DCC 00000000 */ nop +/* EE8380 80241DD0 46241080 */ add.d $f2, $f2, $f4 +/* EE8384 80241DD4 AE000074 */ sw $zero, 0x74($s0) +/* EE8388 80241DD8 46240000 */ add.d $f0, $f0, $f4 +/* EE838C 80241DDC AE000090 */ sw $zero, 0x90($s0) +/* EE8390 80241DE0 4620120D */ trunc.w.d $f8, $f2 +/* EE8394 80241DE4 E6080078 */ swc1 $f8, 0x78($s0) +/* EE8398 80241DE8 4620020D */ trunc.w.d $f8, $f0 +/* EE839C 80241DEC E6080088 */ swc1 $f8, 0x88($s0) +/* EE83A0 80241DF0 8E420014 */ lw $v0, 0x14($s2) +/* EE83A4 80241DF4 AE220074 */ sw $v0, 0x74($s1) +/* EE83A8 80241DF8 8E0200B0 */ lw $v0, 0xb0($s0) +/* EE83AC 80241DFC 34420010 */ ori $v0, $v0, 0x10 +/* EE83B0 80241E00 AE0200B0 */ sw $v0, 0xb0($s0) +/* EE83B4 80241E04 8FBF0034 */ lw $ra, 0x34($sp) +/* EE83B8 80241E08 8FB20030 */ lw $s2, 0x30($sp) +/* EE83BC 80241E0C 8FB1002C */ lw $s1, 0x2c($sp) +/* EE83C0 80241E10 8FB00028 */ lw $s0, 0x28($sp) +/* EE83C4 80241E14 03E00008 */ jr $ra +/* EE83C8 80241E18 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s b/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s new file mode 100644 index 0000000000..e8f3c27e49 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E1C_EE83CC +/* EE83CC 80241E1C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EE83D0 80241E20 AFB50044 */ sw $s5, 0x44($sp) +/* EE83D4 80241E24 0080A82D */ daddu $s5, $a0, $zero +/* EE83D8 80241E28 AFBF0048 */ sw $ra, 0x48($sp) +/* EE83DC 80241E2C AFB40040 */ sw $s4, 0x40($sp) +/* EE83E0 80241E30 AFB3003C */ sw $s3, 0x3c($sp) +/* EE83E4 80241E34 AFB20038 */ sw $s2, 0x38($sp) +/* EE83E8 80241E38 AFB10034 */ sw $s1, 0x34($sp) +/* EE83EC 80241E3C AFB00030 */ sw $s0, 0x30($sp) +/* EE83F0 80241E40 8EB20148 */ lw $s2, 0x148($s5) +/* EE83F4 80241E44 86440008 */ lh $a0, 8($s2) +/* EE83F8 80241E48 8EB0000C */ lw $s0, 0xc($s5) +/* EE83FC 80241E4C 0C00F92F */ jal func_8003E4BC +/* EE8400 80241E50 00A0882D */ daddu $s1, $a1, $zero +/* EE8404 80241E54 02A0202D */ daddu $a0, $s5, $zero +/* EE8408 80241E58 8E050000 */ lw $a1, ($s0) +/* EE840C 80241E5C 0C0B53A3 */ jal func_802D4E8C +/* EE8410 80241E60 0040A02D */ daddu $s4, $v0, $zero +/* EE8414 80241E64 AFA00010 */ sw $zero, 0x10($sp) +/* EE8418 80241E68 8E4300D0 */ lw $v1, 0xd0($s2) +/* EE841C 80241E6C 8C630030 */ lw $v1, 0x30($v1) +/* EE8420 80241E70 AFA30014 */ sw $v1, 0x14($sp) +/* EE8424 80241E74 8E4300D0 */ lw $v1, 0xd0($s2) +/* EE8428 80241E78 8C63001C */ lw $v1, 0x1c($v1) +/* EE842C 80241E7C AFA30018 */ sw $v1, 0x18($sp) +/* EE8430 80241E80 8E4300D0 */ lw $v1, 0xd0($s2) +/* EE8434 80241E84 8C630024 */ lw $v1, 0x24($v1) +/* EE8438 80241E88 AFA3001C */ sw $v1, 0x1c($sp) +/* EE843C 80241E8C 8E4300D0 */ lw $v1, 0xd0($s2) +/* EE8440 80241E90 8C630028 */ lw $v1, 0x28($v1) +/* EE8444 80241E94 AFA30020 */ sw $v1, 0x20($sp) +/* EE8448 80241E98 8E4300D0 */ lw $v1, 0xd0($s2) +/* EE844C 80241E9C 3C0142F0 */ lui $at, 0x42f0 +/* EE8450 80241EA0 44810000 */ mtc1 $at, $f0 +/* EE8454 80241EA4 8C63002C */ lw $v1, 0x2c($v1) +/* EE8458 80241EA8 E7A00028 */ swc1 $f0, 0x28($sp) +/* EE845C 80241EAC A7A0002C */ sh $zero, 0x2c($sp) +/* EE8460 80241EB0 AFA30024 */ sw $v1, 0x24($sp) +/* EE8464 80241EB4 C6800038 */ lwc1 $f0, 0x38($s4) +/* EE8468 80241EB8 E6400108 */ swc1 $f0, 0x108($s2) +/* EE846C 80241EBC C680003C */ lwc1 $f0, 0x3c($s4) +/* EE8470 80241EC0 27B30010 */ addiu $s3, $sp, 0x10 +/* EE8474 80241EC4 E640010C */ swc1 $f0, 0x10c($s2) +/* EE8478 80241EC8 3C0138D1 */ lui $at, 0x38d1 +/* EE847C 80241ECC 3421B717 */ ori $at, $at, 0xb717 +/* EE8480 80241ED0 44810000 */ mtc1 $at, $f0 +/* EE8484 80241ED4 C6820040 */ lwc1 $f2, 0x40($s4) +/* EE8488 80241ED8 0040802D */ daddu $s0, $v0, $zero +/* EE848C 80241EDC E6400114 */ swc1 $f0, 0x114($s2) +/* EE8490 80241EE0 E6400118 */ swc1 $f0, 0x118($s2) +/* EE8494 80241EE4 12200006 */ beqz $s1, .L80241F00 +/* EE8498 80241EE8 E6420110 */ swc1 $f2, 0x110($s2) +/* EE849C 80241EEC 0280202D */ daddu $a0, $s4, $zero +/* EE84A0 80241EF0 0240282D */ daddu $a1, $s2, $zero +/* EE84A4 80241EF4 02A0302D */ daddu $a2, $s5, $zero +/* EE84A8 80241EF8 0C09073E */ jal func_80241CF8_EE82A8 +/* EE84AC 80241EFC 0200382D */ daddu $a3, $s0, $zero +.L80241F00: +/* EE84B0 80241F00 2402FFFE */ addiu $v0, $zero, -2 +/* EE84B4 80241F04 A28200AB */ sb $v0, 0xab($s4) +/* EE84B8 80241F08 8E4300B0 */ lw $v1, 0xb0($s2) +/* EE84BC 80241F0C 30620004 */ andi $v0, $v1, 4 +/* EE84C0 80241F10 10400007 */ beqz $v0, .L80241F30 +/* EE84C4 80241F14 00000000 */ nop +/* EE84C8 80241F18 824200B4 */ lb $v0, 0xb4($s2) +/* EE84CC 80241F1C 1440003C */ bnez $v0, .L80242010 +/* EE84D0 80241F20 0000102D */ daddu $v0, $zero, $zero +/* EE84D4 80241F24 2402FFFB */ addiu $v0, $zero, -5 +/* EE84D8 80241F28 00621024 */ and $v0, $v1, $v0 +/* EE84DC 80241F2C AE4200B0 */ sw $v0, 0xb0($s2) +.L80241F30: +/* EE84E0 80241F30 8EA30070 */ lw $v1, 0x70($s5) +/* EE84E4 80241F34 2C62000F */ sltiu $v0, $v1, 0xf +/* EE84E8 80241F38 10400034 */ beqz $v0, .L8024200C +/* EE84EC 80241F3C 00031080 */ sll $v0, $v1, 2 +/* EE84F0 80241F40 3C018024 */ lui $at, %hi(D_80245398) +/* EE84F4 80241F44 00220821 */ addu $at, $at, $v0 +/* EE84F8 80241F48 8C225398 */ lw $v0, %lo(D_80245398)($at) +/* EE84FC 80241F4C 00400008 */ jr $v0 +/* EE8500 80241F50 00000000 */ nop +/* EE8504 80241F54 02A0202D */ daddu $a0, $s5, $zero +/* EE8508 80241F58 0200282D */ daddu $a1, $s0, $zero +/* EE850C 80241F5C 0C0902C4 */ jal func_80240B10_EE70C0 +/* EE8510 80241F60 0260302D */ daddu $a2, $s3, $zero +/* EE8514 80241F64 02A0202D */ daddu $a0, $s5, $zero +/* EE8518 80241F68 0200282D */ daddu $a1, $s0, $zero +/* EE851C 80241F6C 0C090330 */ jal func_80240CC0_EE7270 +/* EE8520 80241F70 0260302D */ daddu $a2, $s3, $zero +/* EE8524 80241F74 08090804 */ j .L80242010 +/* EE8528 80241F78 0000102D */ daddu $v0, $zero, $zero +/* EE852C 80241F7C 02A0202D */ daddu $a0, $s5, $zero +/* EE8530 80241F80 0200282D */ daddu $a1, $s0, $zero +/* EE8534 80241F84 0C0904BA */ jal func_802412E8_EE7898 +/* EE8538 80241F88 0260302D */ daddu $a2, $s3, $zero +/* EE853C 80241F8C 02A0202D */ daddu $a0, $s5, $zero +/* EE8540 80241F90 0200282D */ daddu $a1, $s0, $zero +/* EE8544 80241F94 0C0904EA */ jal func_802413A8_EE7958 +/* EE8548 80241F98 0260302D */ daddu $a2, $s3, $zero +/* EE854C 80241F9C 08090804 */ j .L80242010 +/* EE8550 80241FA0 0000102D */ daddu $v0, $zero, $zero +/* EE8554 80241FA4 02A0202D */ daddu $a0, $s5, $zero +/* EE8558 80241FA8 0200282D */ daddu $a1, $s0, $zero +/* EE855C 80241FAC 0C0905BB */ jal func_802416EC_EE7C9C +/* EE8560 80241FB0 0260302D */ daddu $a2, $s3, $zero +/* EE8564 80241FB4 02A0202D */ daddu $a0, $s5, $zero +/* EE8568 80241FB8 0200282D */ daddu $a1, $s0, $zero +/* EE856C 80241FBC 0C0905D9 */ jal func_80241764_EE7D14 +/* EE8570 80241FC0 0260302D */ daddu $a2, $s3, $zero +/* EE8574 80241FC4 08090804 */ j .L80242010 +/* EE8578 80241FC8 0000102D */ daddu $v0, $zero, $zero +/* EE857C 80241FCC 02A0202D */ daddu $a0, $s5, $zero +/* EE8580 80241FD0 0200282D */ daddu $a1, $s0, $zero +/* EE8584 80241FD4 0C0905F4 */ jal func_802417D0_EE7D80 +/* EE8588 80241FD8 0260302D */ daddu $a2, $s3, $zero +/* EE858C 80241FDC 08090804 */ j .L80242010 +/* EE8590 80241FE0 0000102D */ daddu $v0, $zero, $zero +/* EE8594 80241FE4 02A0202D */ daddu $a0, $s5, $zero +/* EE8598 80241FE8 0200282D */ daddu $a1, $s0, $zero +/* EE859C 80241FEC 0C090641 */ jal func_80241904_EE7EB4 +/* EE85A0 80241FF0 0260302D */ daddu $a2, $s3, $zero +/* EE85A4 80241FF4 08090804 */ j .L80242010 +/* EE85A8 80241FF8 0000102D */ daddu $v0, $zero, $zero +/* EE85AC 80241FFC 02A0202D */ daddu $a0, $s5, $zero +/* EE85B0 80242000 0200282D */ daddu $a1, $s0, $zero +/* EE85B4 80242004 0C09065A */ jal func_80241968_EE7F18 +/* EE85B8 80242008 0260302D */ daddu $a2, $s3, $zero +.L8024200C: +/* EE85BC 8024200C 0000102D */ daddu $v0, $zero, $zero +.L80242010: +/* EE85C0 80242010 8FBF0048 */ lw $ra, 0x48($sp) +/* EE85C4 80242014 8FB50044 */ lw $s5, 0x44($sp) +/* EE85C8 80242018 8FB40040 */ lw $s4, 0x40($sp) +/* EE85CC 8024201C 8FB3003C */ lw $s3, 0x3c($sp) +/* EE85D0 80242020 8FB20038 */ lw $s2, 0x38($sp) +/* EE85D4 80242024 8FB10034 */ lw $s1, 0x34($sp) +/* EE85D8 80242028 8FB00030 */ lw $s0, 0x30($sp) +/* EE85DC 8024202C 03E00008 */ jr $ra +/* EE85E0 80242030 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EE70C0/func_80242034_EE85E4.s b/asm/nonmatchings/code_EE70C0/func_80242034_EE85E4.s new file mode 100644 index 0000000000..5eae0e33ea --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_80242034_EE85E4.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242034_EE85E4 +/* EE85E4 80242034 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EE85E8 80242038 AFB10014 */ sw $s1, 0x14($sp) +/* EE85EC 8024203C 0080882D */ daddu $s1, $a0, $zero +/* EE85F0 80242040 AFBF0018 */ sw $ra, 0x18($sp) +/* EE85F4 80242044 AFB00010 */ sw $s0, 0x10($sp) +/* EE85F8 80242048 8E30000C */ lw $s0, 0xc($s1) +/* EE85FC 8024204C 8E050000 */ lw $a1, ($s0) +/* EE8600 80242050 0C0B53A3 */ jal func_802D4E8C +/* EE8604 80242054 26100004 */ addiu $s0, $s0, 4 +/* EE8608 80242058 0C00F94D */ jal func_8003E534 +/* EE860C 8024205C 0040202D */ daddu $a0, $v0, $zero +/* EE8610 80242060 10400005 */ beqz $v0, .L80242078 +/* EE8614 80242064 00000000 */ nop +/* EE8618 80242068 8E050000 */ lw $a1, ($s0) +/* EE861C 8024206C 844600A8 */ lh $a2, 0xa8($v0) +/* EE8620 80242070 0C0B551A */ jal func_802D5468 +/* EE8624 80242074 0220202D */ daddu $a0, $s1, $zero +.L80242078: +/* EE8628 80242078 8FBF0018 */ lw $ra, 0x18($sp) +/* EE862C 8024207C 8FB10014 */ lw $s1, 0x14($sp) +/* EE8630 80242080 8FB00010 */ lw $s0, 0x10($sp) +/* EE8634 80242084 24020002 */ addiu $v0, $zero, 2 +/* EE8638 80242088 03E00008 */ jr $ra +/* EE863C 8024208C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EE70C0/func_80242090_EE8640.s b/asm/nonmatchings/code_EE70C0/func_80242090_EE8640.s new file mode 100644 index 0000000000..6aa2d14d1e --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_80242090_EE8640.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242090_EE8640 +/* EE8640 80242090 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EE8644 80242094 AFB10014 */ sw $s1, 0x14($sp) +/* EE8648 80242098 0080882D */ daddu $s1, $a0, $zero +/* EE864C 8024209C AFBF0024 */ sw $ra, 0x24($sp) +/* EE8650 802420A0 AFB40020 */ sw $s4, 0x20($sp) +/* EE8654 802420A4 AFB3001C */ sw $s3, 0x1c($sp) +/* EE8658 802420A8 AFB20018 */ sw $s2, 0x18($sp) +/* EE865C 802420AC AFB00010 */ sw $s0, 0x10($sp) +/* EE8660 802420B0 F7BC0048 */ sdc1 $f28, 0x48($sp) +/* EE8664 802420B4 F7BA0040 */ sdc1 $f26, 0x40($sp) +/* EE8668 802420B8 F7B80038 */ sdc1 $f24, 0x38($sp) +/* EE866C 802420BC F7B60030 */ sdc1 $f22, 0x30($sp) +/* EE8670 802420C0 F7B40028 */ sdc1 $f20, 0x28($sp) +/* EE8674 802420C4 8E30000C */ lw $s0, 0xc($s1) +/* EE8678 802420C8 8E130000 */ lw $s3, ($s0) +/* EE867C 802420CC 26100004 */ addiu $s0, $s0, 4 +/* EE8680 802420D0 0C0B53A3 */ jal func_802D4E8C +/* EE8684 802420D4 0260282D */ daddu $a1, $s3, $zero +/* EE8688 802420D8 4482E000 */ mtc1 $v0, $f28 +/* EE868C 802420DC 00000000 */ nop +/* EE8690 802420E0 4680E720 */ cvt.s.w $f28, $f28 +/* EE8694 802420E4 8E140000 */ lw $s4, ($s0) +/* EE8698 802420E8 26100004 */ addiu $s0, $s0, 4 +/* EE869C 802420EC 0220202D */ daddu $a0, $s1, $zero +/* EE86A0 802420F0 0C0B53A3 */ jal func_802D4E8C +/* EE86A4 802420F4 0280282D */ daddu $a1, $s4, $zero +/* EE86A8 802420F8 4482D000 */ mtc1 $v0, $f26 +/* EE86AC 802420FC 00000000 */ nop +/* EE86B0 80242100 4680D6A0 */ cvt.s.w $f26, $f26 +/* EE86B4 80242104 8E100000 */ lw $s0, ($s0) +/* EE86B8 80242108 0220202D */ daddu $a0, $s1, $zero +/* EE86BC 8024210C 0C0B53A3 */ jal func_802D4E8C +/* EE86C0 80242110 0200282D */ daddu $a1, $s0, $zero +/* EE86C4 80242114 4482C000 */ mtc1 $v0, $f24 +/* EE86C8 80242118 00000000 */ nop +/* EE86CC 8024211C 4680C620 */ cvt.s.w $f24, $f24 +/* EE86D0 80242120 3C128011 */ lui $s2, %hi(D_80117578) +/* EE86D4 80242124 26527578 */ addiu $s2, $s2, %lo(D_80117578) +/* EE86D8 80242128 3C038008 */ lui $v1, %hi(D_8007C760) +/* EE86DC 8024212C 8C63C760 */ lw $v1, %lo(D_8007C760)($v1) +/* EE86E0 80242130 C64200A8 */ lwc1 $f2, 0xa8($s2) +/* EE86E4 80242134 44800000 */ mtc1 $zero, $f0 +/* EE86E8 80242138 00031080 */ sll $v0, $v1, 2 +/* EE86EC 8024213C 00431021 */ addu $v0, $v0, $v1 +/* EE86F0 80242140 00021080 */ sll $v0, $v0, 2 +/* EE86F4 80242144 00431023 */ subu $v0, $v0, $v1 +/* EE86F8 80242148 000218C0 */ sll $v1, $v0, 3 +/* EE86FC 8024214C 00431021 */ addu $v0, $v0, $v1 +/* EE8700 80242150 000210C0 */ sll $v0, $v0, 3 +/* EE8704 80242154 46001032 */ c.eq.s $f2, $f0 +/* EE8708 80242158 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EE870C 8024215C 00220821 */ addu $at, $at, $v0 +/* EE8710 80242160 C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) +/* EE8714 80242164 45000005 */ bc1f .L8024217C +/* EE8718 80242168 00000000 */ nop +/* EE871C 8024216C 3C0142C8 */ lui $at, 0x42c8 +/* EE8720 80242170 44810000 */ mtc1 $at, $f0 +/* EE8724 80242174 08090863 */ j .L8024218C +/* EE8728 80242178 4600B581 */ sub.s $f22, $f22, $f0 +.L8024217C: +/* EE872C 8024217C 3C0142C8 */ lui $at, 0x42c8 +/* EE8730 80242180 44810000 */ mtc1 $at, $f0 +/* EE8734 80242184 00000000 */ nop +/* EE8738 80242188 4600B580 */ add.s $f22, $f22, $f0 +.L8024218C: +/* EE873C 8024218C 0C00AB85 */ jal func_8002AE14 +/* EE8740 80242190 4600B306 */ mov.s $f12, $f22 +/* EE8744 80242194 46000586 */ mov.s $f22, $f0 +/* EE8748 80242198 3C014170 */ lui $at, 0x4170 +/* EE874C 8024219C 4481A000 */ mtc1 $at, $f20 +/* EE8750 802421A0 0C00AD77 */ jal func_8002B5DC +/* EE8754 802421A4 4600B306 */ mov.s $f12, $f22 +/* EE8758 802421A8 46140002 */ mul.s $f0, $f0, $f20 +/* EE875C 802421AC 00000000 */ nop +/* EE8760 802421B0 864200B0 */ lh $v0, 0xb0($s2) +/* EE8764 802421B4 3C013F00 */ lui $at, 0x3f00 +/* EE8768 802421B8 44812000 */ mtc1 $at, $f4 +/* EE876C 802421BC 44821000 */ mtc1 $v0, $f2 +/* EE8770 802421C0 00000000 */ nop +/* EE8774 802421C4 468010A0 */ cvt.s.w $f2, $f2 +/* EE8778 802421C8 46041082 */ mul.s $f2, $f2, $f4 +/* EE877C 802421CC 00000000 */ nop +/* EE8780 802421D0 4600E700 */ add.s $f28, $f28, $f0 +/* EE8784 802421D4 4602D680 */ add.s $f26, $f26, $f2 +/* EE8788 802421D8 0C00AD90 */ jal func_8002B640 +/* EE878C 802421DC 4600B306 */ mov.s $f12, $f22 +/* EE8790 802421E0 46140002 */ mul.s $f0, $f0, $f20 +/* EE8794 802421E4 00000000 */ nop +/* EE8798 802421E8 0220202D */ daddu $a0, $s1, $zero +/* EE879C 802421EC 0260282D */ daddu $a1, $s3, $zero +/* EE87A0 802421F0 4600E18D */ trunc.w.s $f6, $f28 +/* EE87A4 802421F4 44063000 */ mfc1 $a2, $f6 +/* EE87A8 802421F8 0C0B551A */ jal func_802D5468 +/* EE87AC 802421FC 4600C601 */ sub.s $f24, $f24, $f0 +/* EE87B0 80242200 0220202D */ daddu $a0, $s1, $zero +/* EE87B4 80242204 4600D18D */ trunc.w.s $f6, $f26 +/* EE87B8 80242208 44063000 */ mfc1 $a2, $f6 +/* EE87BC 8024220C 0C0B551A */ jal func_802D5468 +/* EE87C0 80242210 0280282D */ daddu $a1, $s4, $zero +/* EE87C4 80242214 0220202D */ daddu $a0, $s1, $zero +/* EE87C8 80242218 4600C18D */ trunc.w.s $f6, $f24 +/* EE87CC 8024221C 44063000 */ mfc1 $a2, $f6 +/* EE87D0 80242220 0C0B551A */ jal func_802D5468 +/* EE87D4 80242224 0200282D */ daddu $a1, $s0, $zero +/* EE87D8 80242228 8FBF0024 */ lw $ra, 0x24($sp) +/* EE87DC 8024222C 8FB40020 */ lw $s4, 0x20($sp) +/* EE87E0 80242230 8FB3001C */ lw $s3, 0x1c($sp) +/* EE87E4 80242234 8FB20018 */ lw $s2, 0x18($sp) +/* EE87E8 80242238 8FB10014 */ lw $s1, 0x14($sp) +/* EE87EC 8024223C 8FB00010 */ lw $s0, 0x10($sp) +/* EE87F0 80242240 D7BC0048 */ ldc1 $f28, 0x48($sp) +/* EE87F4 80242244 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* EE87F8 80242248 D7B80038 */ ldc1 $f24, 0x38($sp) +/* EE87FC 8024224C D7B60030 */ ldc1 $f22, 0x30($sp) +/* EE8800 80242250 D7B40028 */ ldc1 $f20, 0x28($sp) +/* EE8804 80242254 24020002 */ addiu $v0, $zero, 2 +/* EE8808 80242258 03E00008 */ jr $ra +/* EE880C 8024225C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EE70C0/func_80242260_EE8810.s b/asm/nonmatchings/code_EE70C0/func_80242260_EE8810.s new file mode 100644 index 0000000000..6b4fcd9326 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_80242260_EE8810.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242260_EE8810 +/* EE8810 80242260 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE8814 80242264 AFBF0010 */ sw $ra, 0x10($sp) +/* EE8818 80242268 10A00003 */ beqz $a1, .L80242278 +/* EE881C 8024226C 8C86000C */ lw $a2, 0xc($a0) +/* EE8820 80242270 3C018024 */ lui $at, %hi(D_8024462C) +/* EE8824 80242274 AC20462C */ sw $zero, %lo(D_8024462C)($at) +.L80242278: +/* EE8828 80242278 3C038024 */ lui $v1, %hi(D_8024462C) +/* EE882C 8024227C 2463462C */ addiu $v1, $v1, %lo(D_8024462C) +/* EE8830 80242280 8C620000 */ lw $v0, ($v1) +/* EE8834 80242284 54400003 */ bnel $v0, $zero, .L80242294 +/* EE8838 80242288 AC600000 */ sw $zero, ($v1) +/* EE883C 8024228C 080908AA */ j .L802422A8 +/* EE8840 80242290 0000102D */ daddu $v0, $zero, $zero +.L80242294: +/* EE8844 80242294 8CC50000 */ lw $a1, ($a2) +/* EE8848 80242298 3C068024 */ lui $a2, %hi(D_80244630) +/* EE884C 8024229C 0C0B551A */ jal func_802D5468 +/* EE8850 802422A0 8CC64630 */ lw $a2, %lo(D_80244630)($a2) +/* EE8854 802422A4 24020002 */ addiu $v0, $zero, 2 +.L802422A8: +/* EE8858 802422A8 8FBF0010 */ lw $ra, 0x10($sp) +/* EE885C 802422AC 03E00008 */ jr $ra +/* EE8860 802422B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EE70C0/func_802422B4_EE8864.s b/asm/nonmatchings/code_EE70C0/func_802422B4_EE8864.s new file mode 100644 index 0000000000..7022b50d32 --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_802422B4_EE8864.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422B4_EE8864 +/* EE8864 802422B4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE8868 802422B8 AFBF0010 */ sw $ra, 0x10($sp) +/* EE886C 802422BC 8C82000C */ lw $v0, 0xc($a0) +/* EE8870 802422C0 0C0B53A3 */ jal func_802D4E8C +/* EE8874 802422C4 8C450000 */ lw $a1, ($v0) +/* EE8878 802422C8 3C018024 */ lui $at, %hi(D_80244630) +/* EE887C 802422CC AC224630 */ sw $v0, %lo(D_80244630)($at) +/* EE8880 802422D0 24020002 */ addiu $v0, $zero, 2 +/* EE8884 802422D4 8FBF0010 */ lw $ra, 0x10($sp) +/* EE8888 802422D8 24030001 */ addiu $v1, $zero, 1 +/* EE888C 802422DC 3C018024 */ lui $at, %hi(D_8024462C) +/* EE8890 802422E0 AC23462C */ sw $v1, %lo(D_8024462C)($at) +/* EE8894 802422E4 03E00008 */ jr $ra +/* EE8898 802422E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EE70C0/func_802422EC_EE889C.s b/asm/nonmatchings/code_EE70C0/func_802422EC_EE889C.s new file mode 100644 index 0000000000..72a2380f2f --- /dev/null +++ b/asm/nonmatchings/code_EE70C0/func_802422EC_EE889C.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422EC_EE889C +/* EE889C 802422EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE88A0 802422F0 AFBF0010 */ sw $ra, 0x10($sp) +/* EE88A4 802422F4 8C82000C */ lw $v0, 0xc($a0) +/* EE88A8 802422F8 0C0B53A3 */ jal func_802D4E8C +/* EE88AC 802422FC 8C450000 */ lw $a1, ($v0) +/* EE88B0 80242300 0040182D */ daddu $v1, $v0, $zero +/* EE88B4 80242304 10600012 */ beqz $v1, .L80242350 +/* EE88B8 80242308 0000202D */ daddu $a0, $zero, $zero +/* EE88BC 8024230C 8C620000 */ lw $v0, ($v1) +/* EE88C0 80242310 5040000A */ beql $v0, $zero, .L8024233C +/* EE88C4 80242314 00041080 */ sll $v0, $a0, 2 +/* EE88C8 80242318 3C058024 */ lui $a1, %hi(D_802453E0) +/* EE88CC 8024231C 24A553E0 */ addiu $a1, $a1, %lo(D_802453E0) +.L80242320: +/* EE88D0 80242320 24630004 */ addiu $v1, $v1, 4 +/* EE88D4 80242324 24840001 */ addiu $a0, $a0, 1 +/* EE88D8 80242328 ACA20000 */ sw $v0, ($a1) +/* EE88DC 8024232C 8C620000 */ lw $v0, ($v1) +/* EE88E0 80242330 1440FFFB */ bnez $v0, .L80242320 +/* EE88E4 80242334 24A50004 */ addiu $a1, $a1, 4 +/* EE88E8 80242338 00041080 */ sll $v0, $a0, 2 +.L8024233C: +/* EE88EC 8024233C 3C018024 */ lui $at, %hi(D_802453E0) +/* EE88F0 80242340 00220821 */ addu $at, $at, $v0 +/* EE88F4 80242344 AC2053E0 */ sw $zero, %lo(D_802453E0)($at) +/* EE88F8 80242348 080908DE */ j .L80242378 +/* EE88FC 8024234C 00000000 */ nop +.L80242350: +/* EE8900 80242350 3C038024 */ lui $v1, %hi(D_802453E0) +/* EE8904 80242354 246353E0 */ addiu $v1, $v1, %lo(D_802453E0) +/* EE8908 80242358 0060282D */ daddu $a1, $v1, $zero +.L8024235C: +/* EE890C 8024235C 24820080 */ addiu $v0, $a0, 0x80 +/* EE8910 80242360 AC620000 */ sw $v0, ($v1) +/* EE8914 80242364 24630004 */ addiu $v1, $v1, 4 +/* EE8918 80242368 24840001 */ addiu $a0, $a0, 1 +/* EE891C 8024236C 2882005B */ slti $v0, $a0, 0x5b +/* EE8920 80242370 1440FFFA */ bnez $v0, .L8024235C +/* EE8924 80242374 ACA0016C */ sw $zero, 0x16c($a1) +.L80242378: +/* EE8928 80242378 8FBF0010 */ lw $ra, 0x10($sp) +/* EE892C 8024237C 24020002 */ addiu $v0, $zero, 2 +/* EE8930 80242380 03E00008 */ jr $ra +/* EE8934 80242384 27BD0018 */ addiu $sp, $sp, 0x18 +/* EE8938 80242388 00000000 */ nop +/* EE893C 8024238C 00000000 */ nop diff --git a/asm/nonmatchings/code_EE8940/func_80242390_EE8940.s b/asm/nonmatchings/code_EE8940/func_80242390_EE8940.s new file mode 100644 index 0000000000..d5f095a7ef --- /dev/null +++ b/asm/nonmatchings/code_EE8940/func_80242390_EE8940.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242390_EE8940 +/* EE8940 80242390 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EE8944 80242394 AFBF0010 */ sw $ra, 0x10($sp) +/* EE8948 80242398 8C82000C */ lw $v0, 0xc($a0) +/* EE894C 8024239C 3C068017 */ lui $a2, %hi(D_80169B16) +/* EE8950 802423A0 84C69B16 */ lh $a2, %lo(D_80169B16)($a2) +/* EE8954 802423A4 0C0B551A */ jal func_802D5468 +/* EE8958 802423A8 8C450000 */ lw $a1, ($v0) +/* EE895C 802423AC 8FBF0010 */ lw $ra, 0x10($sp) +/* EE8960 802423B0 24020002 */ addiu $v0, $zero, 2 +/* EE8964 802423B4 03E00008 */ jr $ra +/* EE8968 802423B8 27BD0018 */ addiu $sp, $sp, 0x18 +/* EE896C 802423BC 00000000 */ nop diff --git a/asm/nonmatchings/code_EED100/func_80240000_EED100.s b/asm/nonmatchings/code_EED100/func_80240000_EED100.s new file mode 100644 index 0000000000..1a8f5b0780 --- /dev/null +++ b/asm/nonmatchings/code_EED100/func_80240000_EED100.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EED100 +/* EED100 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EED104 80240004 24040001 */ addiu $a0, $zero, 1 +/* EED108 80240008 0000282D */ daddu $a1, $zero, $zero +/* EED10C 8024000C 00A0302D */ daddu $a2, $a1, $zero +/* EED110 80240010 00A0382D */ daddu $a3, $a1, $zero +/* EED114 80240014 AFBF0018 */ sw $ra, 0x18($sp) +/* EED118 80240018 AFA00010 */ sw $zero, 0x10($sp) +/* EED11C 8024001C 0C01DEF4 */ jal func_80077BD0 +/* EED120 80240020 AFA00014 */ sw $zero, 0x14($sp) +/* EED124 80240024 8FBF0018 */ lw $ra, 0x18($sp) +/* EED128 80240028 24020002 */ addiu $v0, $zero, 2 +/* EED12C 8024002C 03E00008 */ jr $ra +/* EED130 80240030 27BD0020 */ addiu $sp, $sp, 0x20 +/* EED134 80240034 00000000 */ nop +/* EED138 80240038 00000000 */ nop +/* EED13C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EED140/func_80240040_EED140.s b/asm/nonmatchings/code_EED140/func_80240040_EED140.s new file mode 100644 index 0000000000..44e173484d --- /dev/null +++ b/asm/nonmatchings/code_EED140/func_80240040_EED140.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240040_EED140 +/* EED140 80240040 8C820084 */ lw $v0, 0x84($a0) +/* EED144 80240044 8C830090 */ lw $v1, 0x90($a0) +/* EED148 80240048 00431023 */ subu $v0, $v0, $v1 +/* EED14C 8024004C 44821000 */ mtc1 $v0, $f2 +/* EED150 80240050 00000000 */ nop +/* EED154 80240054 468010A0 */ cvt.s.w $f2, $f2 +/* EED158 80240058 8C820088 */ lw $v0, 0x88($a0) +/* EED15C 8024005C 8C830094 */ lw $v1, 0x94($a0) +/* EED160 80240060 46021082 */ mul.s $f2, $f2, $f2 +/* EED164 80240064 00000000 */ nop +/* EED168 80240068 00431023 */ subu $v0, $v0, $v1 +/* EED16C 8024006C 44822000 */ mtc1 $v0, $f4 +/* EED170 80240070 00000000 */ nop +/* EED174 80240074 46802120 */ cvt.s.w $f4, $f4 +/* EED178 80240078 8C82008C */ lw $v0, 0x8c($a0) +/* EED17C 8024007C 46042102 */ mul.s $f4, $f4, $f4 +/* EED180 80240080 00000000 */ nop +/* EED184 80240084 8C830098 */ lw $v1, 0x98($a0) +/* EED188 80240088 00431023 */ subu $v0, $v0, $v1 +/* EED18C 8024008C 44820000 */ mtc1 $v0, $f0 +/* EED190 80240090 00000000 */ nop +/* EED194 80240094 46800020 */ cvt.s.w $f0, $f0 +/* EED198 80240098 46000002 */ mul.s $f0, $f0, $f0 +/* EED19C 8024009C 00000000 */ nop +/* EED1A0 802400A0 46041080 */ add.s $f2, $f2, $f4 +/* EED1A4 802400A4 46001080 */ add.s $f2, $f2, $f0 +/* EED1A8 802400A8 3C014561 */ lui $at, 0x4561 +/* EED1AC 802400AC 44810000 */ mtc1 $at, $f0 +/* EED1B0 802400B0 00000000 */ nop +/* EED1B4 802400B4 4600103C */ c.lt.s $f2, $f0 +/* EED1B8 802400B8 00000000 */ nop +/* EED1BC 802400BC 45010002 */ bc1t .L802400C8 +/* EED1C0 802400C0 24020001 */ addiu $v0, $zero, 1 +/* EED1C4 802400C4 0000102D */ daddu $v0, $zero, $zero +.L802400C8: +/* EED1C8 802400C8 AC820084 */ sw $v0, 0x84($a0) +/* EED1CC 802400CC 03E00008 */ jr $ra +/* EED1D0 802400D0 24020002 */ addiu $v0, $zero, 2 +/* EED1D4 802400D4 00000000 */ nop +/* EED1D8 802400D8 00000000 */ nop +/* EED1DC 802400DC 00000000 */ nop diff --git a/asm/nonmatchings/code_EED1E0/func_802400E0_EED1E0.s b/asm/nonmatchings/code_EED1E0/func_802400E0_EED1E0.s new file mode 100644 index 0000000000..bd48214810 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_802400E0_EED1E0.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400E0_EED1E0 +/* EED1E0 802400E0 3C03800A */ lui $v1, %hi(D_800A15A8) +/* EED1E4 802400E4 246315A8 */ addiu $v1, $v1, %lo(D_800A15A8) +/* EED1E8 802400E8 8C620000 */ lw $v0, ($v1) +/* EED1EC 802400EC 34420040 */ ori $v0, $v0, 0x40 +/* EED1F0 802400F0 AC620000 */ sw $v0, ($v1) +/* EED1F4 802400F4 03E00008 */ jr $ra +/* EED1F8 802400F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EED1E0/func_802400FC_EED1FC.s b/asm/nonmatchings/code_EED1E0/func_802400FC_EED1FC.s new file mode 100644 index 0000000000..ad98dd7c33 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_802400FC_EED1FC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400FC_EED1FC +/* EED1FC 802400FC 3C02800A */ lui $v0, %hi(D_800A15A8) +/* EED200 80240100 244215A8 */ addiu $v0, $v0, %lo(D_800A15A8) +/* EED204 80240104 8C430000 */ lw $v1, ($v0) +/* EED208 80240108 2404FFBF */ addiu $a0, $zero, -0x41 +/* EED20C 8024010C 00641824 */ and $v1, $v1, $a0 +/* EED210 80240110 AC430000 */ sw $v1, ($v0) +/* EED214 80240114 03E00008 */ jr $ra +/* EED218 80240118 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EED1E0/func_8024011C_EED21C.s b/asm/nonmatchings/code_EED1E0/func_8024011C_EED21C.s new file mode 100644 index 0000000000..dbcc91bb03 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_8024011C_EED21C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024011C_EED21C +/* EED21C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EED220 80240120 AFBF0010 */ sw $ra, 0x10($sp) +/* EED224 80240124 8C82000C */ lw $v0, 0xc($a0) +/* EED228 80240128 0C0B53A3 */ jal func_802D4E8C +/* EED22C 8024012C 8C450000 */ lw $a1, ($v0) +/* EED230 80240130 0C0BCEC0 */ jal func_802F3B00 +/* EED234 80240134 0040202D */ daddu $a0, $v0, $zero +/* EED238 80240138 8FBF0010 */ lw $ra, 0x10($sp) +/* EED23C 8024013C 24020002 */ addiu $v0, $zero, 2 +/* EED240 80240140 03E00008 */ jr $ra +/* EED244 80240144 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EED1E0/func_80240148_EED248.s b/asm/nonmatchings/code_EED1E0/func_80240148_EED248.s new file mode 100644 index 0000000000..27f9544e94 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240148_EED248.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240148_EED248 +/* EED248 80240148 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EED24C 8024014C AFB00010 */ sw $s0, 0x10($sp) +/* EED250 80240150 0080802D */ daddu $s0, $a0, $zero +/* EED254 80240154 AFBF0018 */ sw $ra, 0x18($sp) +/* EED258 80240158 AFB10014 */ sw $s1, 0x14($sp) +/* EED25C 8024015C 8E11000C */ lw $s1, 0xc($s0) +/* EED260 80240160 8E250000 */ lw $a1, ($s1) +/* EED264 80240164 0C0B53A3 */ jal func_802D4E8C +/* EED268 80240168 26310004 */ addiu $s1, $s1, 4 +/* EED26C 8024016C 0200202D */ daddu $a0, $s0, $zero +/* EED270 80240170 3C038011 */ lui $v1, %hi(D_80117840) +/* EED274 80240174 24637840 */ addiu $v1, $v1, %lo(D_80117840) +/* EED278 80240178 000210C0 */ sll $v0, $v0, 3 +/* EED27C 8024017C 00431021 */ addu $v0, $v0, $v1 +/* EED280 80240180 90460015 */ lbu $a2, 0x15($v0) +/* EED284 80240184 8E250000 */ lw $a1, ($s1) +/* EED288 80240188 24C60001 */ addiu $a2, $a2, 1 +/* EED28C 8024018C A0460015 */ sb $a2, 0x15($v0) +/* EED290 80240190 00063600 */ sll $a2, $a2, 0x18 +/* EED294 80240194 0C0B551A */ jal func_802D5468 +/* EED298 80240198 00063603 */ sra $a2, $a2, 0x18 +/* EED29C 8024019C 8FBF0018 */ lw $ra, 0x18($sp) +/* EED2A0 802401A0 8FB10014 */ lw $s1, 0x14($sp) +/* EED2A4 802401A4 8FB00010 */ lw $s0, 0x10($sp) +/* EED2A8 802401A8 24020002 */ addiu $v0, $zero, 2 +/* EED2AC 802401AC 03E00008 */ jr $ra +/* EED2B0 802401B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EED1E0/func_802401B4_EED2B4.s b/asm/nonmatchings/code_EED1E0/func_802401B4_EED2B4.s new file mode 100644 index 0000000000..18dcf11381 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_802401B4_EED2B4.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401B4_EED2B4 +/* EED2B4 802401B4 3C028011 */ lui $v0, %hi(D_80117840) +/* EED2B8 802401B8 24427840 */ addiu $v0, $v0, %lo(D_80117840) +/* EED2BC 802401BC 000420C0 */ sll $a0, $a0, 3 +/* EED2C0 802401C0 00822021 */ addu $a0, $a0, $v0 +/* EED2C4 802401C4 90820014 */ lbu $v0, 0x14($a0) +/* EED2C8 802401C8 10400009 */ beqz $v0, .L802401F0 +/* EED2CC 802401CC 00000000 */ nop +/* EED2D0 802401D0 90820015 */ lbu $v0, 0x15($a0) +/* EED2D4 802401D4 00022600 */ sll $a0, $v0, 0x18 +/* EED2D8 802401D8 00041E03 */ sra $v1, $a0, 0x18 +/* EED2DC 802401DC 00051400 */ sll $v0, $a1, 0x10 +/* EED2E0 802401E0 00021403 */ sra $v0, $v0, 0x10 +/* EED2E4 802401E4 0043102A */ slt $v0, $v0, $v1 +/* EED2E8 802401E8 10400003 */ beqz $v0, .L802401F8 +/* EED2EC 802401EC 00000000 */ nop +.L802401F0: +/* EED2F0 802401F0 03E00008 */ jr $ra +/* EED2F4 802401F4 2402FFFF */ addiu $v0, $zero, -1 +.L802401F8: +/* EED2F8 802401F8 03E00008 */ jr $ra +/* EED2FC 802401FC 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/code_EED1E0/func_80240200_EED300.s b/asm/nonmatchings/code_EED1E0/func_80240200_EED300.s new file mode 100644 index 0000000000..24bb2e85a1 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240200_EED300.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240200_EED300 +/* EED300 80240200 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EED304 80240204 AFB3001C */ sw $s3, 0x1c($sp) +/* EED308 80240208 0080982D */ daddu $s3, $a0, $zero +/* EED30C 8024020C AFB00010 */ sw $s0, 0x10($sp) +/* EED310 80240210 24100001 */ addiu $s0, $zero, 1 +/* EED314 80240214 AFB40020 */ sw $s4, 0x20($sp) +/* EED318 80240218 2414FFFF */ addiu $s4, $zero, -1 +/* EED31C 8024021C AFB50024 */ sw $s5, 0x24($sp) +/* EED320 80240220 0200A82D */ daddu $s5, $s0, $zero +/* EED324 80240224 AFB10014 */ sw $s1, 0x14($sp) +/* EED328 80240228 3C118011 */ lui $s1, %hi(D_80117848) +/* EED32C 8024022C 26317848 */ addiu $s1, $s1, %lo(D_80117848) +/* EED330 80240230 AFBF0028 */ sw $ra, 0x28($sp) +/* EED334 80240234 AFB20018 */ sw $s2, 0x18($sp) +/* EED338 80240238 8E6200B4 */ lw $v0, 0xb4($s3) +/* EED33C 8024023C 0280182D */ daddu $v1, $s4, $zero +/* EED340 80240240 AE630084 */ sw $v1, 0x84($s3) +/* EED344 80240244 00021027 */ nor $v0, $zero, $v0 +/* EED348 80240248 000217C2 */ srl $v0, $v0, 0x1f +/* EED34C 8024024C 00029400 */ sll $s2, $v0, 0x10 +.L80240250: +/* EED350 80240250 92220014 */ lbu $v0, 0x14($s1) +/* EED354 80240254 50400008 */ beql $v0, $zero, .L80240278 +/* EED358 80240258 26100001 */ addiu $s0, $s0, 1 +/* EED35C 8024025C 0200202D */ daddu $a0, $s0, $zero +/* EED360 80240260 0C09006D */ jal func_802401B4_EED2B4 +/* EED364 80240264 00122C03 */ sra $a1, $s2, 0x10 +/* EED368 80240268 10540003 */ beq $v0, $s4, .L80240278 +/* EED36C 8024026C 26100001 */ addiu $s0, $s0, 1 +/* EED370 80240270 080900A1 */ j .L80240284 +/* EED374 80240274 AE750084 */ sw $s5, 0x84($s3) +.L80240278: +/* EED378 80240278 2A02000C */ slti $v0, $s0, 0xc +/* EED37C 8024027C 1440FFF4 */ bnez $v0, .L80240250 +/* EED380 80240280 26310008 */ addiu $s1, $s1, 8 +.L80240284: +/* EED384 80240284 8FBF0028 */ lw $ra, 0x28($sp) +/* EED388 80240288 8FB50024 */ lw $s5, 0x24($sp) +/* EED38C 8024028C 8FB40020 */ lw $s4, 0x20($sp) +/* EED390 80240290 8FB3001C */ lw $s3, 0x1c($sp) +/* EED394 80240294 8FB20018 */ lw $s2, 0x18($sp) +/* EED398 80240298 8FB10014 */ lw $s1, 0x14($sp) +/* EED39C 8024029C 8FB00010 */ lw $s0, 0x10($sp) +/* EED3A0 802402A0 24020002 */ addiu $v0, $zero, 2 +/* EED3A4 802402A4 03E00008 */ jr $ra +/* EED3A8 802402A8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EED1E0/func_802402AC_EED3AC.s b/asm/nonmatchings/code_EED1E0/func_802402AC_EED3AC.s new file mode 100644 index 0000000000..33fcc99368 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_802402AC_EED3AC.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402AC_EED3AC +/* EED3AC 802402AC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* EED3B0 802402B0 AFB5002C */ sw $s5, 0x2c($sp) +/* EED3B4 802402B4 0080A82D */ daddu $s5, $a0, $zero +/* EED3B8 802402B8 AFBE0038 */ sw $fp, 0x38($sp) +/* EED3BC 802402BC 3C1E8011 */ lui $fp, %hi(D_80117840) +/* EED3C0 802402C0 27DE7840 */ addiu $fp, $fp, %lo(D_80117840) +/* EED3C4 802402C4 AFBF003C */ sw $ra, 0x3c($sp) +/* EED3C8 802402C8 AFB70034 */ sw $s7, 0x34($sp) +/* EED3CC 802402CC AFB60030 */ sw $s6, 0x30($sp) +/* EED3D0 802402D0 AFB40028 */ sw $s4, 0x28($sp) +/* EED3D4 802402D4 AFB30024 */ sw $s3, 0x24($sp) +/* EED3D8 802402D8 AFB20020 */ sw $s2, 0x20($sp) +/* EED3DC 802402DC AFB1001C */ sw $s1, 0x1c($sp) +/* EED3E0 802402E0 10A0004F */ beqz $a1, .L80240420 +/* EED3E4 802402E4 AFB00018 */ sw $s0, 0x18($sp) +/* EED3E8 802402E8 0C00AFF5 */ jal func_8002BFD4 +/* EED3EC 802402EC 24040330 */ addiu $a0, $zero, 0x330 +/* EED3F0 802402F0 0040982D */ daddu $s3, $v0, $zero +/* EED3F4 802402F4 0000B02D */ daddu $s6, $zero, $zero +/* EED3F8 802402F8 02C0902D */ daddu $s2, $s6, $zero +/* EED3FC 802402FC 3C148024 */ lui $s4, %hi(D_80243768) +/* EED400 80240300 26943768 */ addiu $s4, $s4, %lo(D_80243768) +/* EED404 80240304 0260882D */ daddu $s1, $s3, $zero +/* EED408 80240308 8EA200B4 */ lw $v0, 0xb4($s5) +/* EED40C 8024030C 3C038024 */ lui $v1, %hi(func_80243760_8B37D0) +/* EED410 80240310 24633760 */ addiu $v1, $v1, %lo(func_80243760_8B37D0) +/* EED414 80240314 AEB30078 */ sw $s3, 0x78($s5) +/* EED418 80240318 00021027 */ nor $v0, $zero, $v0 +/* EED41C 8024031C 0002BFC2 */ srl $s7, $v0, 0x1f +/* EED420 80240320 00171080 */ sll $v0, $s7, 2 +/* EED424 80240324 00431021 */ addu $v0, $v0, $v1 +/* EED428 80240328 AFA20010 */ sw $v0, 0x10($sp) +.L8024032C: +/* EED42C 8024032C 86900000 */ lh $s0, ($s4) +/* EED430 80240330 001010C0 */ sll $v0, $s0, 3 +/* EED434 80240334 03C21021 */ addu $v0, $fp, $v0 +/* EED438 80240338 90420014 */ lbu $v0, 0x14($v0) +/* EED43C 8024033C 5040002E */ beql $v0, $zero, .L802403F8 +/* EED440 80240340 26520001 */ addiu $s2, $s2, 1 +/* EED444 80240344 00101100 */ sll $v0, $s0, 4 +/* EED448 80240348 3C068009 */ lui $a2, %hi(D_80094900) +/* EED44C 8024034C 24C64900 */ addiu $a2, $a2, %lo(D_80094900) +/* EED450 80240350 00461021 */ addu $v0, $v0, $a2 +/* EED454 80240354 0200202D */ daddu $a0, $s0, $zero +/* EED458 80240358 AE300108 */ sw $s0, 0x108($s1) +/* EED45C 8024035C 8C420000 */ lw $v0, ($v0) +/* EED460 80240360 02E0282D */ daddu $a1, $s7, $zero +/* EED464 80240364 0C09006D */ jal func_802401B4_EED2B4 +/* EED468 80240368 AE220084 */ sw $v0, 0x84($s1) +/* EED46C 8024036C 0040202D */ daddu $a0, $v0, $zero +/* EED470 80240370 04800011 */ bltz $a0, .L802403B8 +/* EED474 80240374 00101080 */ sll $v0, $s0, 2 +/* EED478 80240378 3C068010 */ lui $a2, %hi(D_80100060) +/* EED47C 8024037C 24C60060 */ addiu $a2, $a2, %lo(D_80100060) +/* EED480 80240380 00461021 */ addu $v0, $v0, $a2 +/* EED484 80240384 8C430000 */ lw $v1, ($v0) +/* EED488 80240388 24020001 */ addiu $v0, $zero, 1 +/* EED48C 8024038C AE22018C */ sw $v0, 0x18c($s1) +/* EED490 80240390 00041080 */ sll $v0, $a0, 2 +/* EED494 80240394 3C068024 */ lui $a2, %hi(func_80243778_96C938) +/* EED498 80240398 24C63778 */ addiu $a2, $a2, %lo(func_80243778_96C938) +/* EED49C 8024039C AE230000 */ sw $v1, ($s1) +/* EED4A0 802403A0 001218C0 */ sll $v1, $s2, 3 +/* EED4A4 802403A4 00431021 */ addu $v0, $v0, $v1 +/* EED4A8 802403A8 00461021 */ addu $v0, $v0, $a2 +/* EED4AC 802403AC 8C420000 */ lw $v0, ($v0) +/* EED4B0 802403B0 080900F7 */ j .L802403DC +/* EED4B4 802403B4 AE220294 */ sw $v0, 0x294($s1) +.L802403B8: +/* EED4B8 802403B8 3C068010 */ lui $a2, %hi(D_801000A0) +/* EED4BC 802403BC 24C600A0 */ addiu $a2, $a2, %lo(D_801000A0) +/* EED4C0 802403C0 00461021 */ addu $v0, $v0, $a2 +/* EED4C4 802403C4 8C420000 */ lw $v0, ($v0) +/* EED4C8 802403C8 AE20018C */ sw $zero, 0x18c($s1) +/* EED4CC 802403CC AE220000 */ sw $v0, ($s1) +/* EED4D0 802403D0 8FA60010 */ lw $a2, 0x10($sp) +/* EED4D4 802403D4 8CC20000 */ lw $v0, ($a2) +/* EED4D8 802403D8 AE220294 */ sw $v0, 0x294($s1) +.L802403DC: +/* EED4DC 802403DC 001010C0 */ sll $v0, $s0, 3 +/* EED4E0 802403E0 03C21021 */ addu $v0, $fp, $v0 +/* EED4E4 802403E4 80420015 */ lb $v0, 0x15($v0) +/* EED4E8 802403E8 26D60001 */ addiu $s6, $s6, 1 +/* EED4EC 802403EC AE220210 */ sw $v0, 0x210($s1) +/* EED4F0 802403F0 26310004 */ addiu $s1, $s1, 4 +/* EED4F4 802403F4 26520001 */ addiu $s2, $s2, 1 +.L802403F8: +/* EED4F8 802403F8 2A420008 */ slti $v0, $s2, 8 +/* EED4FC 802403FC 1440FFCB */ bnez $v0, .L8024032C +/* EED500 80240400 26940002 */ addiu $s4, $s4, 2 +/* EED504 80240404 0260202D */ daddu $a0, $s3, $zero +/* EED508 80240408 24020004 */ addiu $v0, $zero, 4 +/* EED50C 8024040C AC820318 */ sw $v0, 0x318($a0) +/* EED510 80240410 AC960324 */ sw $s6, 0x324($a0) +/* EED514 80240414 0C03F343 */ jal func_800FCD0C +/* EED518 80240418 AC800328 */ sw $zero, 0x328($a0) +/* EED51C 8024041C AEA00070 */ sw $zero, 0x70($s5) +.L80240420: +/* EED520 80240420 8EA20070 */ lw $v0, 0x70($s5) +/* EED524 80240424 8EB30078 */ lw $s3, 0x78($s5) +/* EED528 80240428 14400008 */ bnez $v0, .L8024044C +/* EED52C 8024042C 24420001 */ addiu $v0, $v0, 1 +/* EED530 80240430 8662032C */ lh $v0, 0x32c($s3) +/* EED534 80240434 10400009 */ beqz $v0, .L8024045C +/* EED538 80240438 AEA20074 */ sw $v0, 0x74($s5) +/* EED53C 8024043C 0C03E498 */ jal func_800F9260 +/* EED540 80240440 00000000 */ nop +/* EED544 80240444 8EA20070 */ lw $v0, 0x70($s5) +/* EED548 80240448 24420001 */ addiu $v0, $v0, 1 +.L8024044C: +/* EED54C 8024044C AEA20070 */ sw $v0, 0x70($s5) +/* EED550 80240450 2842000F */ slti $v0, $v0, 0xf +/* EED554 80240454 10400003 */ beqz $v0, .L80240464 +/* EED558 80240458 00000000 */ nop +.L8024045C: +/* EED55C 8024045C 08090133 */ j .L802404CC +/* EED560 80240460 0000102D */ daddu $v0, $zero, $zero +.L80240464: +/* EED564 80240464 0C03E4FA */ jal func_800F93E8 +/* EED568 80240468 00000000 */ nop +/* EED56C 8024046C 8EA30074 */ lw $v1, 0x74($s5) +/* EED570 80240470 240200FF */ addiu $v0, $zero, 0xff +/* EED574 80240474 10620010 */ beq $v1, $v0, .L802404B8 +/* EED578 80240478 2462FFFF */ addiu $v0, $v1, -1 +/* EED57C 8024047C 00021080 */ sll $v0, $v0, 2 +/* EED580 80240480 02621021 */ addu $v0, $s3, $v0 +/* EED584 80240484 8C420108 */ lw $v0, 0x108($v0) +/* EED588 80240488 00021100 */ sll $v0, $v0, 4 +/* EED58C 8024048C 3C038009 */ lui $v1, %hi(D_80094900) +/* EED590 80240490 00621821 */ addu $v1, $v1, $v0 +/* EED594 80240494 8C634900 */ lw $v1, %lo(D_80094900)($v1) +/* EED598 80240498 8EA20074 */ lw $v0, 0x74($s5) +/* EED59C 8024049C 2442FFFF */ addiu $v0, $v0, -1 +/* EED5A0 802404A0 00021080 */ sll $v0, $v0, 2 +/* EED5A4 802404A4 02621021 */ addu $v0, $s3, $v0 +/* EED5A8 802404A8 AEA30084 */ sw $v1, 0x84($s5) +/* EED5AC 802404AC 8C420108 */ lw $v0, 0x108($v0) +/* EED5B0 802404B0 08090130 */ j .L802404C0 +/* EED5B4 802404B4 AEA20088 */ sw $v0, 0x88($s5) +.L802404B8: +/* EED5B8 802404B8 2402FFFF */ addiu $v0, $zero, -1 +/* EED5BC 802404BC AEA20084 */ sw $v0, 0x84($s5) +.L802404C0: +/* EED5C0 802404C0 0C00B007 */ jal func_8002C01C +/* EED5C4 802404C4 8EA40078 */ lw $a0, 0x78($s5) +/* EED5C8 802404C8 24020002 */ addiu $v0, $zero, 2 +.L802404CC: +/* EED5CC 802404CC 8FBF003C */ lw $ra, 0x3c($sp) +/* EED5D0 802404D0 8FBE0038 */ lw $fp, 0x38($sp) +/* EED5D4 802404D4 8FB70034 */ lw $s7, 0x34($sp) +/* EED5D8 802404D8 8FB60030 */ lw $s6, 0x30($sp) +/* EED5DC 802404DC 8FB5002C */ lw $s5, 0x2c($sp) +/* EED5E0 802404E0 8FB40028 */ lw $s4, 0x28($sp) +/* EED5E4 802404E4 8FB30024 */ lw $s3, 0x24($sp) +/* EED5E8 802404E8 8FB20020 */ lw $s2, 0x20($sp) +/* EED5EC 802404EC 8FB1001C */ lw $s1, 0x1c($sp) +/* EED5F0 802404F0 8FB00018 */ lw $s0, 0x18($sp) +/* EED5F4 802404F4 03E00008 */ jr $ra +/* EED5F8 802404F8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_EED1E0/func_802404FC_EED5FC.s b/asm/nonmatchings/code_EED1E0/func_802404FC_EED5FC.s new file mode 100644 index 0000000000..25aa6ad93e --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_802404FC_EED5FC.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404FC_EED5FC +/* EED5FC 802404FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EED600 80240500 AFBF0010 */ sw $ra, 0x10($sp) +/* EED604 80240504 8C82000C */ lw $v0, 0xc($a0) +/* EED608 80240508 0C0B53A3 */ jal func_802D4E8C +/* EED60C 8024050C 8C450000 */ lw $a1, ($v0) +/* EED610 80240510 0C03CB57 */ jal func_800F2D5C +/* EED614 80240514 0040202D */ daddu $a0, $v0, $zero +/* EED618 80240518 8FBF0010 */ lw $ra, 0x10($sp) +/* EED61C 8024051C 24020002 */ addiu $v0, $zero, 2 +/* EED620 80240520 03E00008 */ jr $ra +/* EED624 80240524 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EED1E0/func_80240528_EED628.s b/asm/nonmatchings/code_EED1E0/func_80240528_EED628.s new file mode 100644 index 0000000000..c421f747ce --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240528_EED628.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240528_EED628 +/* EED628 80240528 3C028011 */ lui $v0, %hi(D_80117852) +/* EED62C 8024052C 80427852 */ lb $v0, %lo(D_80117852)($v0) +/* EED630 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EED634 80240534 AFBF0010 */ sw $ra, 0x10($sp) +/* EED638 80240538 00021100 */ sll $v0, $v0, 4 +/* EED63C 8024053C 3C048009 */ lui $a0, %hi(D_80094900) +/* EED640 80240540 00822021 */ addu $a0, $a0, $v0 +/* EED644 80240544 8C844900 */ lw $a0, %lo(D_80094900)($a0) +/* EED648 80240548 0C04C31D */ jal func_80130C74 +/* EED64C 8024054C 0000282D */ daddu $a1, $zero, $zero +/* EED650 80240550 8FBF0010 */ lw $ra, 0x10($sp) +/* EED654 80240554 24020002 */ addiu $v0, $zero, 2 +/* EED658 80240558 03E00008 */ jr $ra +/* EED65C 8024055C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EED1E0/func_80240560_EED660.s b/asm/nonmatchings/code_EED1E0/func_80240560_EED660.s new file mode 100644 index 0000000000..cec04a3b8f --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240560_EED660.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240560_EED660 +/* EED660 80240560 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EED664 80240564 AFB1001C */ sw $s1, 0x1c($sp) +/* EED668 80240568 0080882D */ daddu $s1, $a0, $zero +/* EED66C 8024056C AFBF0020 */ sw $ra, 0x20($sp) +/* EED670 80240570 AFB00018 */ sw $s0, 0x18($sp) +/* EED674 80240574 8E30000C */ lw $s0, 0xc($s1) +/* EED678 80240578 8E050000 */ lw $a1, ($s0) +/* EED67C 8024057C 0C0B53A3 */ jal func_802D4E8C +/* EED680 80240580 26100004 */ addiu $s0, $s0, 4 +/* EED684 80240584 0C0462EC */ jal func_80118BB0 +/* EED688 80240588 0040202D */ daddu $a0, $v0, $zero +/* EED68C 8024058C 8E100000 */ lw $s0, ($s0) +/* EED690 80240590 C444004C */ lwc1 $f4, 0x4c($v0) +/* EED694 80240594 3C014148 */ lui $at, 0x4148 +/* EED698 80240598 44810000 */ mtc1 $at, $f0 +/* EED69C 8024059C 3C013F33 */ lui $at, 0x3f33 +/* EED6A0 802405A0 34213333 */ ori $at, $at, 0x3333 +/* EED6A4 802405A4 44811000 */ mtc1 $at, $f2 +/* EED6A8 802405A8 AFA00014 */ sw $zero, 0x14($sp) +/* EED6AC 802405AC 46002100 */ add.s $f4, $f4, $f0 +/* EED6B0 802405B0 E7A20010 */ swc1 $f2, 0x10($sp) +/* EED6B4 802405B4 8C450048 */ lw $a1, 0x48($v0) +/* EED6B8 802405B8 8C470050 */ lw $a3, 0x50($v0) +/* EED6BC 802405BC 44062000 */ mfc1 $a2, $f4 +/* EED6C0 802405C0 0C01DA74 */ jal func_800769D0 +/* EED6C4 802405C4 0000202D */ daddu $a0, $zero, $zero +/* EED6C8 802405C8 0220202D */ daddu $a0, $s1, $zero +/* EED6CC 802405CC 0200282D */ daddu $a1, $s0, $zero +/* EED6D0 802405D0 0C0B551A */ jal func_802D5468 +/* EED6D4 802405D4 0040302D */ daddu $a2, $v0, $zero +/* EED6D8 802405D8 8FBF0020 */ lw $ra, 0x20($sp) +/* EED6DC 802405DC 8FB1001C */ lw $s1, 0x1c($sp) +/* EED6E0 802405E0 8FB00018 */ lw $s0, 0x18($sp) +/* EED6E4 802405E4 24020002 */ addiu $v0, $zero, 2 +/* EED6E8 802405E8 03E00008 */ jr $ra +/* EED6EC 802405EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EED1E0/func_802405F0_EED6F0.s b/asm/nonmatchings/code_EED1E0/func_802405F0_EED6F0.s new file mode 100644 index 0000000000..d7d4282152 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_802405F0_EED6F0.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405F0_EED6F0 +/* EED6F0 802405F0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EED6F4 802405F4 AFBF0010 */ sw $ra, 0x10($sp) +/* EED6F8 802405F8 8C82000C */ lw $v0, 0xc($a0) +/* EED6FC 802405FC 0C0B53A3 */ jal func_802D4E8C +/* EED700 80240600 8C450000 */ lw $a1, ($v0) +/* EED704 80240604 0040202D */ daddu $a0, $v0, $zero +/* EED708 80240608 8C830000 */ lw $v1, ($a0) +/* EED70C 8024060C 34630010 */ ori $v1, $v1, 0x10 +/* EED710 80240610 AC830000 */ sw $v1, ($a0) +/* EED714 80240614 8FBF0010 */ lw $ra, 0x10($sp) +/* EED718 80240618 24020002 */ addiu $v0, $zero, 2 +/* EED71C 8024061C 03E00008 */ jr $ra +/* EED720 80240620 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EED1E0/func_80240624_EED724.s b/asm/nonmatchings/code_EED1E0/func_80240624_EED724.s new file mode 100644 index 0000000000..26fba4efb1 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240624_EED724.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240624_EED724 +/* EED724 80240624 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EED728 80240628 AFBF0018 */ sw $ra, 0x18($sp) +/* EED72C 8024062C 8C82000C */ lw $v0, 0xc($a0) +/* EED730 80240630 0C0B53A3 */ jal func_802D4E8C +/* EED734 80240634 8C450000 */ lw $a1, ($v0) +/* EED738 80240638 0C0462EC */ jal func_80118BB0 +/* EED73C 8024063C 0040202D */ daddu $a0, $v0, $zero +/* EED740 80240640 3C013F80 */ lui $at, 0x3f80 +/* EED744 80240644 44810000 */ mtc1 $at, $f0 +/* EED748 80240648 C442004C */ lwc1 $f2, 0x4c($v0) +/* EED74C 8024064C E7A00010 */ swc1 $f0, 0x10($sp) +/* EED750 80240650 3C014148 */ lui $at, 0x4148 +/* EED754 80240654 44810000 */ mtc1 $at, $f0 +/* EED758 80240658 2403004B */ addiu $v1, $zero, 0x4b +/* EED75C 8024065C AFA30014 */ sw $v1, 0x14($sp) +/* EED760 80240660 46001080 */ add.s $f2, $f2, $f0 +/* EED764 80240664 8C450048 */ lw $a1, 0x48($v0) +/* EED768 80240668 8C470050 */ lw $a3, 0x50($v0) +/* EED76C 8024066C 44061000 */ mfc1 $a2, $f2 +/* EED770 80240670 0C01D78C */ jal func_80075E30 +/* EED774 80240674 24040004 */ addiu $a0, $zero, 4 +/* EED778 80240678 8FBF0018 */ lw $ra, 0x18($sp) +/* EED77C 8024067C 24020002 */ addiu $v0, $zero, 2 +/* EED780 80240680 03E00008 */ jr $ra +/* EED784 80240684 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EED1E0/func_80240688_EED788.s b/asm/nonmatchings/code_EED1E0/func_80240688_EED788.s new file mode 100644 index 0000000000..b522315bf7 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240688_EED788.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240688_EED788 +/* EED788 80240688 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EED78C 8024068C AFBF0018 */ sw $ra, 0x18($sp) +/* EED790 80240690 0C00F94D */ jal func_8003E534 +/* EED794 80240694 2404FFFC */ addiu $a0, $zero, -4 +/* EED798 80240698 C444003C */ lwc1 $f4, 0x3c($v0) +/* EED79C 8024069C 3C014148 */ lui $at, 0x4148 +/* EED7A0 802406A0 44811000 */ mtc1 $at, $f2 +/* EED7A4 802406A4 3C013F80 */ lui $at, 0x3f80 +/* EED7A8 802406A8 44810000 */ mtc1 $at, $f0 +/* EED7AC 802406AC 2403001E */ addiu $v1, $zero, 0x1e +/* EED7B0 802406B0 AFA30014 */ sw $v1, 0x14($sp) +/* EED7B4 802406B4 46022100 */ add.s $f4, $f4, $f2 +/* EED7B8 802406B8 E7A00010 */ swc1 $f0, 0x10($sp) +/* EED7BC 802406BC 8C450038 */ lw $a1, 0x38($v0) +/* EED7C0 802406C0 8C470040 */ lw $a3, 0x40($v0) +/* EED7C4 802406C4 44062000 */ mfc1 $a2, $f4 +/* EED7C8 802406C8 0C01D78C */ jal func_80075E30 +/* EED7CC 802406CC 24040009 */ addiu $a0, $zero, 9 +/* EED7D0 802406D0 8FBF0018 */ lw $ra, 0x18($sp) +/* EED7D4 802406D4 24020002 */ addiu $v0, $zero, 2 +/* EED7D8 802406D8 03E00008 */ jr $ra +/* EED7DC 802406DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EED1E0/func_802406E0_EED7E0.s b/asm/nonmatchings/code_EED1E0/func_802406E0_EED7E0.s new file mode 100644 index 0000000000..5fa6daee5a --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_802406E0_EED7E0.s @@ -0,0 +1,356 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406E0_EED7E0 +/* EED7E0 802406E0 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* EED7E4 802406E4 AFB60040 */ sw $s6, 0x40($sp) +/* EED7E8 802406E8 0080B02D */ daddu $s6, $a0, $zero +/* EED7EC 802406EC AFB00028 */ sw $s0, 0x28($sp) +/* EED7F0 802406F0 00A0802D */ daddu $s0, $a1, $zero +/* EED7F4 802406F4 AFBF0044 */ sw $ra, 0x44($sp) +/* EED7F8 802406F8 AFB5003C */ sw $s5, 0x3c($sp) +/* EED7FC 802406FC AFB40038 */ sw $s4, 0x38($sp) +/* EED800 80240700 AFB30034 */ sw $s3, 0x34($sp) +/* EED804 80240704 AFB20030 */ sw $s2, 0x30($sp) +/* EED808 80240708 AFB1002C */ sw $s1, 0x2c($sp) +/* EED80C 8024070C F7B80058 */ sdc1 $f24, 0x58($sp) +/* EED810 80240710 F7B60050 */ sdc1 $f22, 0x50($sp) +/* EED814 80240714 F7B40048 */ sdc1 $f20, 0x48($sp) +/* EED818 80240718 8ED3000C */ lw $s3, 0xc($s6) +/* EED81C 8024071C 0C00F94D */ jal func_8003E534 +/* EED820 80240720 2404FFFC */ addiu $a0, $zero, -4 +/* EED824 80240724 27A50018 */ addiu $a1, $sp, 0x18 +/* EED828 80240728 3C048008 */ lui $a0, %hi(D_8007C760) +/* EED82C 8024072C 8C84C760 */ lw $a0, %lo(D_8007C760)($a0) +/* EED830 80240730 27A6001C */ addiu $a2, $sp, 0x1c +/* EED834 80240734 00041880 */ sll $v1, $a0, 2 +/* EED838 80240738 00641821 */ addu $v1, $v1, $a0 +/* EED83C 8024073C 00031880 */ sll $v1, $v1, 2 +/* EED840 80240740 00641823 */ subu $v1, $v1, $a0 +/* EED844 80240744 000320C0 */ sll $a0, $v1, 3 +/* EED848 80240748 00641821 */ addu $v1, $v1, $a0 +/* EED84C 8024074C 000318C0 */ sll $v1, $v1, 3 +/* EED850 80240750 3C01800C */ lui $at, %hi(D_800B8DEC) +/* EED854 80240754 00230821 */ addu $at, $at, $v1 +/* EED858 80240758 C42C8DEC */ lwc1 $f12, %lo(D_800B8DEC)($at) +/* EED85C 8024075C 0C00AD49 */ jal func_8002B524 +/* EED860 80240760 0040A82D */ daddu $s5, $v0, $zero +/* EED864 80240764 1200005D */ beqz $s0, .L802408DC +/* EED868 80240768 00000000 */ nop +/* EED86C 8024076C 0C00AFC6 */ jal func_8002BF18 +/* EED870 80240770 24040068 */ addiu $a0, $zero, 0x68 +/* EED874 80240774 0040902D */ daddu $s2, $v0, $zero +/* EED878 80240778 02C0202D */ daddu $a0, $s6, $zero +/* EED87C 8024077C 0000882D */ daddu $s1, $zero, $zero +/* EED880 80240780 2414FFFF */ addiu $s4, $zero, -1 +/* EED884 80240784 AED20060 */ sw $s2, 0x60($s6) +/* EED888 80240788 8E650000 */ lw $a1, ($s3) +/* EED88C 8024078C 3C014148 */ lui $at, 0x4148 +/* EED890 80240790 4481C000 */ mtc1 $at, $f24 +/* EED894 80240794 3C013F80 */ lui $at, 0x3f80 +/* EED898 80240798 4481B000 */ mtc1 $at, $f22 +/* EED89C 8024079C 4480A000 */ mtc1 $zero, $f20 +/* EED8A0 802407A0 0C0B53A3 */ jal func_802D4E8C +/* EED8A4 802407A4 0240802D */ daddu $s0, $s2, $zero +/* EED8A8 802407A8 0C0462EC */ jal func_80118BB0 +/* EED8AC 802407AC 0040202D */ daddu $a0, $v0, $zero +/* EED8B0 802407B0 AE42005C */ sw $v0, 0x5c($s2) +.L802407B4: +/* EED8B4 802407B4 8E42005C */ lw $v0, 0x5c($s2) +/* EED8B8 802407B8 C440004C */ lwc1 $f0, 0x4c($v0) +/* EED8BC 802407BC 0000202D */ daddu $a0, $zero, $zero +/* EED8C0 802407C0 E7B60010 */ swc1 $f22, 0x10($sp) +/* EED8C4 802407C4 AFB40014 */ sw $s4, 0x14($sp) +/* EED8C8 802407C8 46180000 */ add.s $f0, $f0, $f24 +/* EED8CC 802407CC 8C450048 */ lw $a1, 0x48($v0) +/* EED8D0 802407D0 8C470050 */ lw $a3, 0x50($v0) +/* EED8D4 802407D4 44060000 */ mfc1 $a2, $f0 +/* EED8D8 802407D8 0C01DA5C */ jal func_80076970 +/* EED8DC 802407DC 26310001 */ addiu $s1, $s1, 1 +/* EED8E0 802407E0 AE020008 */ sw $v0, 8($s0) +/* EED8E4 802407E4 E614002C */ swc1 $f20, 0x2c($s0) +/* EED8E8 802407E8 E6140020 */ swc1 $f20, 0x20($s0) +/* EED8EC 802407EC E6140014 */ swc1 $f20, 0x14($s0) +/* EED8F0 802407F0 E6140050 */ swc1 $f20, 0x50($s0) +/* EED8F4 802407F4 E6140044 */ swc1 $f20, 0x44($s0) +/* EED8F8 802407F8 E6140038 */ swc1 $f20, 0x38($s0) +/* EED8FC 802407FC 2A220003 */ slti $v0, $s1, 3 +/* EED900 80240800 1440FFEC */ bnez $v0, .L802407B4 +/* EED904 80240804 26100004 */ addiu $s0, $s0, 4 +/* EED908 80240808 0000882D */ daddu $s1, $zero, $zero +/* EED90C 8024080C 0240802D */ daddu $s0, $s2, $zero +/* EED910 80240810 3C148024 */ lui $s4, %hi(func_802437B8) +/* EED914 80240814 269437B8 */ addiu $s4, $s4, %lo(func_802437B8) +/* EED918 80240818 3C014248 */ lui $at, 0x4248 +/* EED91C 8024081C 4481A000 */ mtc1 $at, $f20 +/* EED920 80240820 24130044 */ addiu $s3, $zero, 0x44 +/* EED924 80240824 AE400000 */ sw $zero, ($s2) +/* EED928 80240828 AE400004 */ sw $zero, 4($s2) +/* EED92C 8024082C AE400060 */ sw $zero, 0x60($s2) +/* EED930 80240830 AE400064 */ sw $zero, 0x64($s2) +.L80240834: +/* EED934 80240834 27A40020 */ addiu $a0, $sp, 0x20 +/* EED938 80240838 4406A000 */ mfc1 $a2, $f20 +/* EED93C 8024083C 8E870000 */ lw $a3, ($s4) +/* EED940 80240840 02532821 */ addu $a1, $s2, $s3 +/* EED944 80240844 0C00ACA3 */ jal func_8002B28C +/* EED948 80240848 AFA00020 */ sw $zero, 0x20($sp) +/* EED94C 8024084C C7A2001C */ lwc1 $f2, 0x1c($sp) +/* EED950 80240850 C7A40020 */ lwc1 $f4, 0x20($sp) +/* EED954 80240854 46041082 */ mul.s $f2, $f2, $f4 +/* EED958 80240858 00000000 */ nop +/* EED95C 8024085C C7A00018 */ lwc1 $f0, 0x18($sp) +/* EED960 80240860 46040002 */ mul.s $f0, $f0, $f4 +/* EED964 80240864 00000000 */ nop +/* EED968 80240868 E6020038 */ swc1 $f2, 0x38($s0) +/* EED96C 8024086C E6000050 */ swc1 $f0, 0x50($s0) +/* EED970 80240870 8E42005C */ lw $v0, 0x5c($s2) +/* EED974 80240874 C6000038 */ lwc1 $f0, 0x38($s0) +/* EED978 80240878 C4420048 */ lwc1 $f2, 0x48($v0) +/* EED97C 8024087C 46001080 */ add.s $f2, $f2, $f0 +/* EED980 80240880 C6A00038 */ lwc1 $f0, 0x38($s5) +/* EED984 80240884 46020001 */ sub.s $f0, $f0, $f2 +/* EED988 80240888 E6000038 */ swc1 $f0, 0x38($s0) +/* EED98C 8024088C 8E42005C */ lw $v0, 0x5c($s2) +/* EED990 80240890 C6000044 */ lwc1 $f0, 0x44($s0) +/* EED994 80240894 C442004C */ lwc1 $f2, 0x4c($v0) +/* EED998 80240898 46001080 */ add.s $f2, $f2, $f0 +/* EED99C 8024089C C6A0003C */ lwc1 $f0, 0x3c($s5) +/* EED9A0 802408A0 46020001 */ sub.s $f0, $f0, $f2 +/* EED9A4 802408A4 E6000044 */ swc1 $f0, 0x44($s0) +/* EED9A8 802408A8 8E42005C */ lw $v0, 0x5c($s2) +/* EED9AC 802408AC C6000050 */ lwc1 $f0, 0x50($s0) +/* EED9B0 802408B0 C4420050 */ lwc1 $f2, 0x50($v0) +/* EED9B4 802408B4 26940004 */ addiu $s4, $s4, 4 +/* EED9B8 802408B8 46001080 */ add.s $f2, $f2, $f0 +/* EED9BC 802408BC C6A00040 */ lwc1 $f0, 0x40($s5) +/* EED9C0 802408C0 26730004 */ addiu $s3, $s3, 4 +/* EED9C4 802408C4 46020001 */ sub.s $f0, $f0, $f2 +/* EED9C8 802408C8 26310001 */ addiu $s1, $s1, 1 +/* EED9CC 802408CC 2A220003 */ slti $v0, $s1, 3 +/* EED9D0 802408D0 E6000050 */ swc1 $f0, 0x50($s0) +/* EED9D4 802408D4 1440FFD7 */ bnez $v0, .L80240834 +/* EED9D8 802408D8 26100004 */ addiu $s0, $s0, 4 +.L802408DC: +/* EED9DC 802408DC 8ED20060 */ lw $s2, 0x60($s6) +/* EED9E0 802408E0 8E430000 */ lw $v1, ($s2) +/* EED9E4 802408E4 24020001 */ addiu $v0, $zero, 1 +/* EED9E8 802408E8 10620038 */ beq $v1, $v0, .L802409CC +/* EED9EC 802408EC 28620002 */ slti $v0, $v1, 2 +/* EED9F0 802408F0 50400005 */ beql $v0, $zero, .L80240908 +/* EED9F4 802408F4 24020002 */ addiu $v0, $zero, 2 +/* EED9F8 802408F8 10600007 */ beqz $v1, .L80240918 +/* EED9FC 802408FC 24040005 */ addiu $a0, $zero, 5 +/* EEDA00 80240900 080902AC */ j .L80240AB0 +/* EEDA04 80240904 00000000 */ nop +.L80240908: +/* EEDA08 80240908 10620058 */ beq $v1, $v0, .L80240A6C +/* EEDA0C 8024090C 00000000 */ nop +/* EEDA10 80240910 080902AC */ j .L80240AB0 +/* EEDA14 80240914 00000000 */ nop +.L80240918: +/* EEDA18 80240918 0000882D */ daddu $s1, $zero, $zero +/* EEDA1C 8024091C 3C148024 */ lui $s4, %hi(func_802437B8) +/* EEDA20 80240920 269437B8 */ addiu $s4, $s4, %lo(func_802437B8) +/* EEDA24 80240924 24130020 */ addiu $s3, $zero, 0x20 +/* EEDA28 80240928 3C064248 */ lui $a2, 0x4248 +/* EEDA2C 8024092C 44800000 */ mtc1 $zero, $f0 +/* EEDA30 80240930 24020014 */ addiu $v0, $zero, 0x14 +/* EEDA34 80240934 AFA20010 */ sw $v0, 0x10($sp) +/* EEDA38 80240938 44050000 */ mfc1 $a1, $f0 +/* EEDA3C 8024093C 8E470060 */ lw $a3, 0x60($s2) +/* EEDA40 80240940 4485B000 */ mtc1 $a1, $f22 +/* EEDA44 80240944 0C00ADA9 */ jal func_8002B6A4 +/* EEDA48 80240948 0240802D */ daddu $s0, $s2, $zero +/* EEDA4C 8024094C 46000506 */ mov.s $f20, $f0 +.L80240950: +/* EEDA50 80240950 4406A000 */ mfc1 $a2, $f20 +/* EEDA54 80240954 27A40020 */ addiu $a0, $sp, 0x20 +/* EEDA58 80240958 E6160020 */ swc1 $f22, 0x20($s0) +/* EEDA5C 8024095C 8E870000 */ lw $a3, ($s4) +/* EEDA60 80240960 02532821 */ addu $a1, $s2, $s3 +/* EEDA64 80240964 0C00ACA3 */ jal func_8002B28C +/* EEDA68 80240968 E7B60020 */ swc1 $f22, 0x20($sp) +/* EEDA6C 8024096C C7A4001C */ lwc1 $f4, 0x1c($sp) +/* EEDA70 80240970 C7A00020 */ lwc1 $f0, 0x20($sp) +/* EEDA74 80240974 46002102 */ mul.s $f4, $f4, $f0 +/* EEDA78 80240978 00000000 */ nop +/* EEDA7C 8024097C C7A20018 */ lwc1 $f2, 0x18($sp) +/* EEDA80 80240980 26940004 */ addiu $s4, $s4, 4 +/* EEDA84 80240984 46001082 */ mul.s $f2, $f2, $f0 +/* EEDA88 80240988 00000000 */ nop +/* EEDA8C 8024098C 26730004 */ addiu $s3, $s3, 4 +/* EEDA90 80240990 26310001 */ addiu $s1, $s1, 1 +/* EEDA94 80240994 2A220003 */ slti $v0, $s1, 3 +/* EEDA98 80240998 E6040014 */ swc1 $f4, 0x14($s0) +/* EEDA9C 8024099C E602002C */ swc1 $f2, 0x2c($s0) +/* EEDAA0 802409A0 1440FFEB */ bnez $v0, .L80240950 +/* EEDAA4 802409A4 26100004 */ addiu $s0, $s0, 4 +/* EEDAA8 802409A8 8E420060 */ lw $v0, 0x60($s2) +/* EEDAAC 802409AC 24420001 */ addiu $v0, $v0, 1 +/* EEDAB0 802409B0 AE420060 */ sw $v0, 0x60($s2) +/* EEDAB4 802409B4 28420015 */ slti $v0, $v0, 0x15 +/* EEDAB8 802409B8 1440003D */ bnez $v0, .L80240AB0 +/* EEDABC 802409BC 24020001 */ addiu $v0, $zero, 1 +/* EEDAC0 802409C0 AE420000 */ sw $v0, ($s2) +/* EEDAC4 802409C4 080902AC */ j .L80240AB0 +/* EEDAC8 802409C8 AE400060 */ sw $zero, 0x60($s2) +.L802409CC: +/* EEDACC 802409CC 0000882D */ daddu $s1, $zero, $zero +/* EEDAD0 802409D0 3C148024 */ lui $s4, %hi(func_802437B8) +/* EEDAD4 802409D4 269437B8 */ addiu $s4, $s4, %lo(func_802437B8) +/* EEDAD8 802409D8 24130020 */ addiu $s3, $zero, 0x20 +/* EEDADC 802409DC 0240802D */ daddu $s0, $s2, $zero +/* EEDAE0 802409E0 3C014248 */ lui $at, 0x4248 +/* EEDAE4 802409E4 4481A000 */ mtc1 $at, $f20 +/* EEDAE8 802409E8 4480B000 */ mtc1 $zero, $f22 +.L802409EC: +/* EEDAEC 802409EC 4406A000 */ mfc1 $a2, $f20 +/* EEDAF0 802409F0 27A40020 */ addiu $a0, $sp, 0x20 +/* EEDAF4 802409F4 E6160020 */ swc1 $f22, 0x20($s0) +/* EEDAF8 802409F8 8E870000 */ lw $a3, ($s4) +/* EEDAFC 802409FC 02532821 */ addu $a1, $s2, $s3 +/* EEDB00 80240A00 0C00ACA3 */ jal func_8002B28C +/* EEDB04 80240A04 E7B60020 */ swc1 $f22, 0x20($sp) +/* EEDB08 80240A08 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* EEDB0C 80240A0C C7A00020 */ lwc1 $f0, 0x20($sp) +/* EEDB10 80240A10 46002102 */ mul.s $f4, $f4, $f0 +/* EEDB14 80240A14 00000000 */ nop +/* EEDB18 80240A18 C7A20018 */ lwc1 $f2, 0x18($sp) +/* EEDB1C 80240A1C 26940004 */ addiu $s4, $s4, 4 +/* EEDB20 80240A20 46001082 */ mul.s $f2, $f2, $f0 +/* EEDB24 80240A24 00000000 */ nop +/* EEDB28 80240A28 26730004 */ addiu $s3, $s3, 4 +/* EEDB2C 80240A2C 26310001 */ addiu $s1, $s1, 1 +/* EEDB30 80240A30 2A220003 */ slti $v0, $s1, 3 +/* EEDB34 80240A34 E6040014 */ swc1 $f4, 0x14($s0) +/* EEDB38 80240A38 E602002C */ swc1 $f2, 0x2c($s0) +/* EEDB3C 80240A3C 1440FFEB */ bnez $v0, .L802409EC +/* EEDB40 80240A40 26100004 */ addiu $s0, $s0, 4 +/* EEDB44 80240A44 8E420060 */ lw $v0, 0x60($s2) +/* EEDB48 80240A48 24420001 */ addiu $v0, $v0, 1 +/* EEDB4C 80240A4C AE420060 */ sw $v0, 0x60($s2) +/* EEDB50 80240A50 28420010 */ slti $v0, $v0, 0x10 +/* EEDB54 80240A54 14400016 */ bnez $v0, .L80240AB0 +/* EEDB58 80240A58 2402000F */ addiu $v0, $zero, 0xf +/* EEDB5C 80240A5C AE420060 */ sw $v0, 0x60($s2) +/* EEDB60 80240A60 24020002 */ addiu $v0, $zero, 2 +/* EEDB64 80240A64 080902AC */ j .L80240AB0 +/* EEDB68 80240A68 AE420000 */ sw $v0, ($s2) +.L80240A6C: +/* EEDB6C 80240A6C 8E420060 */ lw $v0, 0x60($s2) +/* EEDB70 80240A70 24420001 */ addiu $v0, $v0, 1 +/* EEDB74 80240A74 AE420060 */ sw $v0, 0x60($s2) +/* EEDB78 80240A78 2842001F */ slti $v0, $v0, 0x1f +/* EEDB7C 80240A7C 1440000C */ bnez $v0, .L80240AB0 +/* EEDB80 80240A80 0000882D */ daddu $s1, $zero, $zero +/* EEDB84 80240A84 0240282D */ daddu $a1, $s2, $zero +.L80240A88: +/* EEDB88 80240A88 8CA20008 */ lw $v0, 8($a1) +/* EEDB8C 80240A8C 8C430000 */ lw $v1, ($v0) +/* EEDB90 80240A90 26310001 */ addiu $s1, $s1, 1 +/* EEDB94 80240A94 34630010 */ ori $v1, $v1, 0x10 +/* EEDB98 80240A98 AC430000 */ sw $v1, ($v0) +/* EEDB9C 80240A9C 2A220003 */ slti $v0, $s1, 3 +/* EEDBA0 80240AA0 1440FFF9 */ bnez $v0, .L80240A88 +/* EEDBA4 80240AA4 24A50004 */ addiu $a1, $a1, 4 +/* EEDBA8 80240AA8 080902F9 */ j .L80240BE4 +/* EEDBAC 80240AAC 24020002 */ addiu $v0, $zero, 2 +.L80240AB0: +/* EEDBB0 80240AB0 8E430004 */ lw $v1, 4($s2) +/* EEDBB4 80240AB4 10600005 */ beqz $v1, .L80240ACC +/* EEDBB8 80240AB8 24020001 */ addiu $v0, $zero, 1 +/* EEDBBC 80240ABC 1062000B */ beq $v1, $v0, .L80240AEC +/* EEDBC0 80240AC0 0000882D */ daddu $s1, $zero, $zero +/* EEDBC4 80240AC4 080902E8 */ j .L80240BA0 +/* EEDBC8 80240AC8 0240282D */ daddu $a1, $s2, $zero +.L80240ACC: +/* EEDBCC 80240ACC 8E420064 */ lw $v0, 0x64($s2) +/* EEDBD0 80240AD0 24420001 */ addiu $v0, $v0, 1 +/* EEDBD4 80240AD4 AE420064 */ sw $v0, 0x64($s2) +/* EEDBD8 80240AD8 28420010 */ slti $v0, $v0, 0x10 +/* EEDBDC 80240ADC 1440002F */ bnez $v0, .L80240B9C +/* EEDBE0 80240AE0 0000882D */ daddu $s1, $zero, $zero +/* EEDBE4 80240AE4 080902E4 */ j .L80240B90 +/* EEDBE8 80240AE8 24020001 */ addiu $v0, $zero, 1 +.L80240AEC: +/* EEDBEC 80240AEC 4480A000 */ mtc1 $zero, $f20 +/* EEDBF0 80240AF0 24130014 */ addiu $s3, $zero, 0x14 +/* EEDBF4 80240AF4 0240802D */ daddu $s0, $s2, $zero +.L80240AF8: +/* EEDBF8 80240AF8 4405A000 */ mfc1 $a1, $f20 +/* EEDBFC 80240AFC AFB30010 */ sw $s3, 0x10($sp) +/* EEDC00 80240B00 8E060038 */ lw $a2, 0x38($s0) +/* EEDC04 80240B04 8E470064 */ lw $a3, 0x64($s2) +/* EEDC08 80240B08 0C00ADA9 */ jal func_8002B6A4 +/* EEDC0C 80240B0C 24040001 */ addiu $a0, $zero, 1 +/* EEDC10 80240B10 C6020014 */ lwc1 $f2, 0x14($s0) +/* EEDC14 80240B14 46001080 */ add.s $f2, $f2, $f0 +/* EEDC18 80240B18 4405A000 */ mfc1 $a1, $f20 +/* EEDC1C 80240B1C E6020014 */ swc1 $f2, 0x14($s0) +/* EEDC20 80240B20 AFB30010 */ sw $s3, 0x10($sp) +/* EEDC24 80240B24 8E060044 */ lw $a2, 0x44($s0) +/* EEDC28 80240B28 8E470064 */ lw $a3, 0x64($s2) +/* EEDC2C 80240B2C 0C00ADA9 */ jal func_8002B6A4 +/* EEDC30 80240B30 24040001 */ addiu $a0, $zero, 1 +/* EEDC34 80240B34 C6020020 */ lwc1 $f2, 0x20($s0) +/* EEDC38 80240B38 46001080 */ add.s $f2, $f2, $f0 +/* EEDC3C 80240B3C 4405A000 */ mfc1 $a1, $f20 +/* EEDC40 80240B40 E6020020 */ swc1 $f2, 0x20($s0) +/* EEDC44 80240B44 AFB30010 */ sw $s3, 0x10($sp) +/* EEDC48 80240B48 8E060050 */ lw $a2, 0x50($s0) +/* EEDC4C 80240B4C 8E470064 */ lw $a3, 0x64($s2) +/* EEDC50 80240B50 0C00ADA9 */ jal func_8002B6A4 +/* EEDC54 80240B54 24040001 */ addiu $a0, $zero, 1 +/* EEDC58 80240B58 C602002C */ lwc1 $f2, 0x2c($s0) +/* EEDC5C 80240B5C 46001080 */ add.s $f2, $f2, $f0 +/* EEDC60 80240B60 26310001 */ addiu $s1, $s1, 1 +/* EEDC64 80240B64 2A220003 */ slti $v0, $s1, 3 +/* EEDC68 80240B68 E602002C */ swc1 $f2, 0x2c($s0) +/* EEDC6C 80240B6C 1440FFE2 */ bnez $v0, .L80240AF8 +/* EEDC70 80240B70 26100004 */ addiu $s0, $s0, 4 +/* EEDC74 80240B74 8E420064 */ lw $v0, 0x64($s2) +/* EEDC78 80240B78 24420001 */ addiu $v0, $v0, 1 +/* EEDC7C 80240B7C AE420064 */ sw $v0, 0x64($s2) +/* EEDC80 80240B80 28420015 */ slti $v0, $v0, 0x15 +/* EEDC84 80240B84 14400005 */ bnez $v0, .L80240B9C +/* EEDC88 80240B88 0000882D */ daddu $s1, $zero, $zero +/* EEDC8C 80240B8C 24020002 */ addiu $v0, $zero, 2 +.L80240B90: +/* EEDC90 80240B90 AE420004 */ sw $v0, 4($s2) +/* EEDC94 80240B94 AE400064 */ sw $zero, 0x64($s2) +/* EEDC98 80240B98 0000882D */ daddu $s1, $zero, $zero +.L80240B9C: +/* EEDC9C 80240B9C 0240282D */ daddu $a1, $s2, $zero +.L80240BA0: +/* EEDCA0 80240BA0 8CA20008 */ lw $v0, 8($a1) +/* EEDCA4 80240BA4 C4A00014 */ lwc1 $f0, 0x14($a1) +/* EEDCA8 80240BA8 8C42000C */ lw $v0, 0xc($v0) +/* EEDCAC 80240BAC E4400010 */ swc1 $f0, 0x10($v0) +/* EEDCB0 80240BB0 8CA20008 */ lw $v0, 8($a1) +/* EEDCB4 80240BB4 C4A00020 */ lwc1 $f0, 0x20($a1) +/* EEDCB8 80240BB8 8C42000C */ lw $v0, 0xc($v0) +/* EEDCBC 80240BBC 26310001 */ addiu $s1, $s1, 1 +/* EEDCC0 80240BC0 E4400014 */ swc1 $f0, 0x14($v0) +/* EEDCC4 80240BC4 8CA20008 */ lw $v0, 8($a1) +/* EEDCC8 80240BC8 C4A0002C */ lwc1 $f0, 0x2c($a1) +/* EEDCCC 80240BCC 8C42000C */ lw $v0, 0xc($v0) +/* EEDCD0 80240BD0 E4400018 */ swc1 $f0, 0x18($v0) +/* EEDCD4 80240BD4 2A220003 */ slti $v0, $s1, 3 +/* EEDCD8 80240BD8 1440FFF1 */ bnez $v0, .L80240BA0 +/* EEDCDC 80240BDC 24A50004 */ addiu $a1, $a1, 4 +/* EEDCE0 80240BE0 0000102D */ daddu $v0, $zero, $zero +.L80240BE4: +/* EEDCE4 80240BE4 8FBF0044 */ lw $ra, 0x44($sp) +/* EEDCE8 80240BE8 8FB60040 */ lw $s6, 0x40($sp) +/* EEDCEC 80240BEC 8FB5003C */ lw $s5, 0x3c($sp) +/* EEDCF0 80240BF0 8FB40038 */ lw $s4, 0x38($sp) +/* EEDCF4 80240BF4 8FB30034 */ lw $s3, 0x34($sp) +/* EEDCF8 80240BF8 8FB20030 */ lw $s2, 0x30($sp) +/* EEDCFC 80240BFC 8FB1002C */ lw $s1, 0x2c($sp) +/* EEDD00 80240C00 8FB00028 */ lw $s0, 0x28($sp) +/* EEDD04 80240C04 D7B80058 */ ldc1 $f24, 0x58($sp) +/* EEDD08 80240C08 D7B60050 */ ldc1 $f22, 0x50($sp) +/* EEDD0C 80240C0C D7B40048 */ ldc1 $f20, 0x48($sp) +/* EEDD10 80240C10 03E00008 */ jr $ra +/* EEDD14 80240C14 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/code_EED1E0/func_80240C18_EEDD18.s b/asm/nonmatchings/code_EED1E0/func_80240C18_EEDD18.s new file mode 100644 index 0000000000..64768a5031 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240C18_EEDD18.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C18_EEDD18 +/* EEDD18 80240C18 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EEDD1C 80240C1C AFB10014 */ sw $s1, 0x14($sp) +/* EEDD20 80240C20 0080882D */ daddu $s1, $a0, $zero +/* EEDD24 80240C24 AFB20018 */ sw $s2, 0x18($sp) +/* EEDD28 80240C28 AFBF001C */ sw $ra, 0x1c($sp) +/* EEDD2C 80240C2C AFB00010 */ sw $s0, 0x10($sp) +/* EEDD30 80240C30 8E30000C */ lw $s0, 0xc($s1) +/* EEDD34 80240C34 10A00010 */ beqz $a1, .L80240C78 +/* EEDD38 80240C38 0000902D */ daddu $s2, $zero, $zero +/* EEDD3C 80240C3C 8E050000 */ lw $a1, ($s0) +/* EEDD40 80240C40 0C0B53A3 */ jal func_802D4E8C +/* EEDD44 80240C44 26100004 */ addiu $s0, $s0, 4 +/* EEDD48 80240C48 AE220084 */ sw $v0, 0x84($s1) +/* EEDD4C 80240C4C 8E050000 */ lw $a1, ($s0) +/* EEDD50 80240C50 0C0B53A3 */ jal func_802D4E8C +/* EEDD54 80240C54 0220202D */ daddu $a0, $s1, $zero +/* EEDD58 80240C58 0240202D */ daddu $a0, $s2, $zero +/* EEDD5C 80240C5C 240500D0 */ addiu $a1, $zero, 0xd0 +/* EEDD60 80240C60 00A0302D */ daddu $a2, $a1, $zero +/* EEDD64 80240C64 00A0382D */ daddu $a3, $a1, $zero +/* EEDD68 80240C68 AE220088 */ sw $v0, 0x88($s1) +/* EEDD6C 80240C6C AE200070 */ sw $zero, 0x70($s1) +/* EEDD70 80240C70 0C051080 */ jal func_80144200 +/* EEDD74 80240C74 AE200074 */ sw $zero, 0x74($s1) +.L80240C78: +/* EEDD78 80240C78 8E230070 */ lw $v1, 0x70($s1) +/* EEDD7C 80240C7C 24040001 */ addiu $a0, $zero, 1 +/* EEDD80 80240C80 10640019 */ beq $v1, $a0, .L80240CE8 +/* EEDD84 80240C84 28620002 */ slti $v0, $v1, 2 +/* EEDD88 80240C88 10400005 */ beqz $v0, .L80240CA0 +/* EEDD8C 80240C8C 24020002 */ addiu $v0, $zero, 2 +/* EEDD90 80240C90 10600007 */ beqz $v1, .L80240CB0 +/* EEDD94 80240C94 240500FF */ addiu $a1, $zero, 0xff +/* EEDD98 80240C98 0809034A */ j .L80240D28 +/* EEDD9C 80240C9C 00000000 */ nop +.L80240CA0: +/* EEDDA0 80240CA0 10620019 */ beq $v1, $v0, .L80240D08 +/* EEDDA4 80240CA4 00000000 */ nop +/* EEDDA8 80240CA8 0809034A */ j .L80240D28 +/* EEDDAC 80240CAC 00000000 */ nop +.L80240CB0: +/* EEDDB0 80240CB0 8E220074 */ lw $v0, 0x74($s1) +/* EEDDB4 80240CB4 14450004 */ bne $v0, $a1, .L80240CC8 +/* EEDDB8 80240CB8 00000000 */ nop +/* EEDDBC 80240CBC AE240070 */ sw $a0, 0x70($s1) +/* EEDDC0 80240CC0 AE200078 */ sw $zero, 0x78($s1) +/* EEDDC4 80240CC4 8E220074 */ lw $v0, 0x74($s1) +.L80240CC8: +/* EEDDC8 80240CC8 8E230084 */ lw $v1, 0x84($s1) +/* EEDDCC 80240CCC 00431021 */ addu $v0, $v0, $v1 +/* EEDDD0 80240CD0 AE220074 */ sw $v0, 0x74($s1) +/* EEDDD4 80240CD4 28420100 */ slti $v0, $v0, 0x100 +/* EEDDD8 80240CD8 50400013 */ beql $v0, $zero, .L80240D28 +/* EEDDDC 80240CDC AE250074 */ sw $a1, 0x74($s1) +/* EEDDE0 80240CE0 0809034A */ j .L80240D28 +/* EEDDE4 80240CE4 00000000 */ nop +.L80240CE8: +/* EEDDE8 80240CE8 8E220078 */ lw $v0, 0x78($s1) +/* EEDDEC 80240CEC 24420001 */ addiu $v0, $v0, 1 +/* EEDDF0 80240CF0 AE220078 */ sw $v0, 0x78($s1) +/* EEDDF4 80240CF4 28420002 */ slti $v0, $v0, 2 +/* EEDDF8 80240CF8 1440000B */ bnez $v0, .L80240D28 +/* EEDDFC 80240CFC 24020002 */ addiu $v0, $zero, 2 +/* EEDE00 80240D00 0809034A */ j .L80240D28 +/* EEDE04 80240D04 AE220070 */ sw $v0, 0x70($s1) +.L80240D08: +/* EEDE08 80240D08 8E230074 */ lw $v1, 0x74($s1) +/* EEDE0C 80240D0C 50600001 */ beql $v1, $zero, .L80240D14 +/* EEDE10 80240D10 24120001 */ addiu $s2, $zero, 1 +.L80240D14: +/* EEDE14 80240D14 8E220088 */ lw $v0, 0x88($s1) +/* EEDE18 80240D18 00621023 */ subu $v0, $v1, $v0 +/* EEDE1C 80240D1C 04410002 */ bgez $v0, .L80240D28 +/* EEDE20 80240D20 AE220074 */ sw $v0, 0x74($s1) +/* EEDE24 80240D24 AE200074 */ sw $zero, 0x74($s1) +.L80240D28: +/* EEDE28 80240D28 C6200074 */ lwc1 $f0, 0x74($s1) +/* EEDE2C 80240D2C 46800020 */ cvt.s.w $f0, $f0 +/* EEDE30 80240D30 44050000 */ mfc1 $a1, $f0 +/* EEDE34 80240D34 0C05105E */ jal func_80144178 +/* EEDE38 80240D38 24040001 */ addiu $a0, $zero, 1 +/* EEDE3C 80240D3C 0240102D */ daddu $v0, $s2, $zero +/* EEDE40 80240D40 8FBF001C */ lw $ra, 0x1c($sp) +/* EEDE44 80240D44 8FB20018 */ lw $s2, 0x18($sp) +/* EEDE48 80240D48 8FB10014 */ lw $s1, 0x14($sp) +/* EEDE4C 80240D4C 8FB00010 */ lw $s0, 0x10($sp) +/* EEDE50 80240D50 03E00008 */ jr $ra +/* EEDE54 80240D54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EED1E0/func_80240D58_EEDE58.s b/asm/nonmatchings/code_EED1E0/func_80240D58_EEDE58.s new file mode 100644 index 0000000000..8706f36bdc --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240D58_EEDE58.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D58_EEDE58 +/* EEDE58 80240D58 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EEDE5C 80240D5C AFBF0018 */ sw $ra, 0x18($sp) +/* EEDE60 80240D60 0C00F94D */ jal func_8003E534 +/* EEDE64 80240D64 2404FFFC */ addiu $a0, $zero, -4 +/* EEDE68 80240D68 3C0141F0 */ lui $at, 0x41f0 +/* EEDE6C 80240D6C 44810000 */ mtc1 $at, $f0 +/* EEDE70 80240D70 C442003C */ lwc1 $f2, 0x3c($v0) +/* EEDE74 80240D74 46001080 */ add.s $f2, $f2, $f0 +/* EEDE78 80240D78 E7A00010 */ swc1 $f0, 0x10($sp) +/* EEDE7C 80240D7C 8C450038 */ lw $a1, 0x38($v0) +/* EEDE80 80240D80 8C470040 */ lw $a3, 0x40($v0) +/* EEDE84 80240D84 44061000 */ mfc1 $a2, $f2 +/* EEDE88 80240D88 0C01D45C */ jal func_80075170 +/* EEDE8C 80240D8C 24040002 */ addiu $a0, $zero, 2 +/* EEDE90 80240D90 8FBF0018 */ lw $ra, 0x18($sp) +/* EEDE94 80240D94 24020002 */ addiu $v0, $zero, 2 +/* EEDE98 80240D98 03E00008 */ jr $ra +/* EEDE9C 80240D9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EED1E0/func_80240DA0_EEDEA0.s b/asm/nonmatchings/code_EED1E0/func_80240DA0_EEDEA0.s new file mode 100644 index 0000000000..3f436abba2 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240DA0_EEDEA0.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DA0_EEDEA0 +/* EEDEA0 80240DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EEDEA4 80240DA4 AFBF0018 */ sw $ra, 0x18($sp) +/* EEDEA8 80240DA8 0C00F94D */ jal func_8003E534 +/* EEDEAC 80240DAC 2404FFFC */ addiu $a0, $zero, -4 +/* EEDEB0 80240DB0 3C0141F0 */ lui $at, 0x41f0 +/* EEDEB4 80240DB4 44810000 */ mtc1 $at, $f0 +/* EEDEB8 80240DB8 C442003C */ lwc1 $f2, 0x3c($v0) +/* EEDEBC 80240DBC 46001080 */ add.s $f2, $f2, $f0 +/* EEDEC0 80240DC0 E7A00010 */ swc1 $f0, 0x10($sp) +/* EEDEC4 80240DC4 8C450038 */ lw $a1, 0x38($v0) +/* EEDEC8 80240DC8 8C470040 */ lw $a3, 0x40($v0) +/* EEDECC 80240DCC 44061000 */ mfc1 $a2, $f2 +/* EEDED0 80240DD0 0C01D45C */ jal func_80075170 +/* EEDED4 80240DD4 24040004 */ addiu $a0, $zero, 4 +/* EEDED8 80240DD8 8FBF0018 */ lw $ra, 0x18($sp) +/* EEDEDC 80240DDC 24020002 */ addiu $v0, $zero, 2 +/* EEDEE0 80240DE0 03E00008 */ jr $ra +/* EEDEE4 80240DE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EED1E0/func_80240DE8_EEDEE8.s b/asm/nonmatchings/code_EED1E0/func_80240DE8_EEDEE8.s new file mode 100644 index 0000000000..1494a91c1e --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240DE8_EEDEE8.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DE8_EEDEE8 +/* EEDEE8 80240DE8 3C038011 */ lui $v1, %hi(D_80117160) +/* EEDEEC 80240DEC 24637160 */ addiu $v1, $v1, %lo(D_80117160) +/* EEDEF0 80240DF0 AC800084 */ sw $zero, 0x84($a0) +/* EEDEF4 80240DF4 80620000 */ lb $v0, ($v1) +/* EEDEF8 80240DF8 10400005 */ beqz $v0, .L80240E10 +/* EEDEFC 80240DFC 24020003 */ addiu $v0, $zero, 3 +/* EEDF00 80240E00 80630003 */ lb $v1, 3($v1) +/* EEDF04 80240E04 14620002 */ bne $v1, $v0, .L80240E10 +/* EEDF08 80240E08 24020001 */ addiu $v0, $zero, 1 +/* EEDF0C 80240E0C AC820084 */ sw $v0, 0x84($a0) +.L80240E10: +/* EEDF10 80240E10 03E00008 */ jr $ra +/* EEDF14 80240E14 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EED1E0/func_80240E18_EEDF18.s b/asm/nonmatchings/code_EED1E0/func_80240E18_EEDF18.s new file mode 100644 index 0000000000..81e4611416 --- /dev/null +++ b/asm/nonmatchings/code_EED1E0/func_80240E18_EEDF18.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E18_EEDF18 +/* EEDF18 80240E18 AC800084 */ sw $zero, 0x84($a0) +/* EEDF1C 80240E1C 3C038011 */ lui $v1, %hi(D_8011762C) +/* EEDF20 80240E20 8063762C */ lb $v1, %lo(D_8011762C)($v1) +/* EEDF24 80240E24 2402000E */ addiu $v0, $zero, 0xe +/* EEDF28 80240E28 10620004 */ beq $v1, $v0, .L80240E3C +/* EEDF2C 80240E2C 24020001 */ addiu $v0, $zero, 1 +/* EEDF30 80240E30 24020010 */ addiu $v0, $zero, 0x10 +/* EEDF34 80240E34 14620002 */ bne $v1, $v0, .L80240E40 +/* EEDF38 80240E38 24020001 */ addiu $v0, $zero, 1 +.L80240E3C: +/* EEDF3C 80240E3C AC820084 */ sw $v0, 0x84($a0) +.L80240E40: +/* EEDF40 80240E40 03E00008 */ jr $ra +/* EEDF44 80240E44 24020002 */ addiu $v0, $zero, 2 +/* EEDF48 80240E48 00000000 */ nop +/* EEDF4C 80240E4C 00000000 */ nop diff --git a/asm/nonmatchings/code_EEDF50/func_80240E50_EEDF50.s b/asm/nonmatchings/code_EEDF50/func_80240E50_EEDF50.s new file mode 100644 index 0000000000..15690182ee --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80240E50_EEDF50.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E50_EEDF50 +/* EEDF50 80240E50 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EEDF54 80240E54 AFB3002C */ sw $s3, 0x2c($sp) +/* EEDF58 80240E58 0080982D */ daddu $s3, $a0, $zero +/* EEDF5C 80240E5C AFBF0030 */ sw $ra, 0x30($sp) +/* EEDF60 80240E60 AFB20028 */ sw $s2, 0x28($sp) +/* EEDF64 80240E64 AFB10024 */ sw $s1, 0x24($sp) +/* EEDF68 80240E68 AFB00020 */ sw $s0, 0x20($sp) +/* EEDF6C 80240E6C 8E710148 */ lw $s1, 0x148($s3) +/* EEDF70 80240E70 86240008 */ lh $a0, 8($s1) +/* EEDF74 80240E74 0C00F92F */ jal func_8003E4BC +/* EEDF78 80240E78 00A0902D */ daddu $s2, $a1, $zero +/* EEDF7C 80240E7C 8E440004 */ lw $a0, 4($s2) +/* EEDF80 80240E80 0040802D */ daddu $s0, $v0, $zero +/* EEDF84 80240E84 00041FC2 */ srl $v1, $a0, 0x1f +/* EEDF88 80240E88 00832021 */ addu $a0, $a0, $v1 +/* EEDF8C 80240E8C 00042043 */ sra $a0, $a0, 1 +/* EEDF90 80240E90 0C00AB3B */ jal func_8002ACEC +/* EEDF94 80240E94 24840001 */ addiu $a0, $a0, 1 +/* EEDF98 80240E98 8E430004 */ lw $v1, 4($s2) +/* EEDF9C 80240E9C 000327C2 */ srl $a0, $v1, 0x1f +/* EEDFA0 80240EA0 00641821 */ addu $v1, $v1, $a0 +/* EEDFA4 80240EA4 00031843 */ sra $v1, $v1, 1 +/* EEDFA8 80240EA8 00621821 */ addu $v1, $v1, $v0 +/* EEDFAC 80240EAC A603008E */ sh $v1, 0x8e($s0) +/* EEDFB0 80240EB0 8E2300D0 */ lw $v1, 0xd0($s1) +/* EEDFB4 80240EB4 C6000040 */ lwc1 $f0, 0x40($s0) +/* EEDFB8 80240EB8 C4640000 */ lwc1 $f4, ($v1) +/* EEDFBC 80240EBC 46802120 */ cvt.s.w $f4, $f4 +/* EEDFC0 80240EC0 C4620008 */ lwc1 $f2, 8($v1) +/* EEDFC4 80240EC4 468010A0 */ cvt.s.w $f2, $f2 +/* EEDFC8 80240EC8 E7A00010 */ swc1 $f0, 0x10($sp) +/* EEDFCC 80240ECC 8E2200D0 */ lw $v0, 0xd0($s1) +/* EEDFD0 80240ED0 44061000 */ mfc1 $a2, $f2 +/* EEDFD4 80240ED4 C440000C */ lwc1 $f0, 0xc($v0) +/* EEDFD8 80240ED8 46800020 */ cvt.s.w $f0, $f0 +/* EEDFDC 80240EDC E7A00014 */ swc1 $f0, 0x14($sp) +/* EEDFE0 80240EE0 8E2200D0 */ lw $v0, 0xd0($s1) +/* EEDFE4 80240EE4 44052000 */ mfc1 $a1, $f4 +/* EEDFE8 80240EE8 C4400010 */ lwc1 $f0, 0x10($v0) +/* EEDFEC 80240EEC 46800020 */ cvt.s.w $f0, $f0 +/* EEDFF0 80240EF0 E7A00018 */ swc1 $f0, 0x18($sp) +/* EEDFF4 80240EF4 8C640018 */ lw $a0, 0x18($v1) +/* EEDFF8 80240EF8 0C013431 */ jal func_8004D0C4 +/* EEDFFC 80240EFC 8E070038 */ lw $a3, 0x38($s0) +/* EEE000 80240F00 1040000E */ beqz $v0, .L80240F3C +/* EEE004 80240F04 00000000 */ nop +/* EEE008 80240F08 8E2200D0 */ lw $v0, 0xd0($s1) +/* EEE00C 80240F0C C60C0038 */ lwc1 $f12, 0x38($s0) +/* EEE010 80240F10 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EEE014 80240F14 C4460000 */ lwc1 $f6, ($v0) +/* EEE018 80240F18 468031A0 */ cvt.s.w $f6, $f6 +/* EEE01C 80240F1C 44063000 */ mfc1 $a2, $f6 +/* EEE020 80240F20 C4460008 */ lwc1 $f6, 8($v0) +/* EEE024 80240F24 468031A0 */ cvt.s.w $f6, $f6 +/* EEE028 80240F28 44073000 */ mfc1 $a3, $f6 +/* EEE02C 80240F2C 0C00ABDC */ jal fio_validate_header_checksums +/* EEE030 80240F30 00000000 */ nop +/* EEE034 80240F34 080903DB */ j .L80240F6C +/* EEE038 80240F38 E600000C */ swc1 $f0, 0xc($s0) +.L80240F3C: +/* EEE03C 80240F3C 0C00AB3B */ jal func_8002ACEC +/* EEE040 80240F40 2404003C */ addiu $a0, $zero, 0x3c +/* EEE044 80240F44 C60C000C */ lwc1 $f12, 0xc($s0) +/* EEE048 80240F48 44820000 */ mtc1 $v0, $f0 +/* EEE04C 80240F4C 00000000 */ nop +/* EEE050 80240F50 46800020 */ cvt.s.w $f0, $f0 +/* EEE054 80240F54 46006300 */ add.s $f12, $f12, $f0 +/* EEE058 80240F58 3C0141F0 */ lui $at, 0x41f0 +/* EEE05C 80240F5C 44810000 */ mtc1 $at, $f0 +/* EEE060 80240F60 0C00AB85 */ jal func_8002AE14 +/* EEE064 80240F64 46006301 */ sub.s $f12, $f12, $f0 +/* EEE068 80240F68 E600000C */ swc1 $f0, 0xc($s0) +.L80240F6C: +/* EEE06C 80240F6C 8E2200CC */ lw $v0, 0xcc($s1) +/* EEE070 80240F70 8C420004 */ lw $v0, 4($v0) +/* EEE074 80240F74 AE020028 */ sw $v0, 0x28($s0) +/* EEE078 80240F78 AE600074 */ sw $zero, 0x74($s3) +/* EEE07C 80240F7C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EEE080 80240F80 8C420014 */ lw $v0, 0x14($v0) +/* EEE084 80240F84 04410004 */ bgez $v0, .L80240F98 +/* EEE088 80240F88 00000000 */ nop +/* EEE08C 80240F8C C6400000 */ lwc1 $f0, ($s2) +/* EEE090 80240F90 080903EE */ j .L80240FB8 +/* EEE094 80240F94 E6000018 */ swc1 $f0, 0x18($s0) +.L80240F98: +/* EEE098 80240F98 3C018024 */ lui $at, %hi(D_80245450) +/* EEE09C 80240F9C D4225450 */ ldc1 $f2, %lo(D_80245450)($at) +/* EEE0A0 80240FA0 44820000 */ mtc1 $v0, $f0 +/* EEE0A4 80240FA4 00000000 */ nop +/* EEE0A8 80240FA8 46800021 */ cvt.d.w $f0, $f0 +/* EEE0AC 80240FAC 46220003 */ div.d $f0, $f0, $f2 +/* EEE0B0 80240FB0 46200020 */ cvt.s.d $f0, $f0 +/* EEE0B4 80240FB4 E6000018 */ swc1 $f0, 0x18($s0) +.L80240FB8: +/* EEE0B8 80240FB8 C600003C */ lwc1 $f0, 0x3c($s0) +/* EEE0BC 80240FBC 3C014059 */ lui $at, 0x4059 +/* EEE0C0 80240FC0 44811800 */ mtc1 $at, $f3 +/* EEE0C4 80240FC4 44801000 */ mtc1 $zero, $f2 +/* EEE0C8 80240FC8 46000021 */ cvt.d.s $f0, $f0 +/* EEE0CC 80240FCC 46220002 */ mul.d $f0, $f0, $f2 +/* EEE0D0 80240FD0 00000000 */ nop +/* EEE0D4 80240FD4 24020001 */ addiu $v0, $zero, 1 +/* EEE0D8 80240FD8 4620018D */ trunc.w.d $f6, $f0 +/* EEE0DC 80240FDC E626007C */ swc1 $f6, 0x7c($s1) +/* EEE0E0 80240FE0 AE620070 */ sw $v0, 0x70($s3) +/* EEE0E4 80240FE4 8FBF0030 */ lw $ra, 0x30($sp) +/* EEE0E8 80240FE8 8FB3002C */ lw $s3, 0x2c($sp) +/* EEE0EC 80240FEC 8FB20028 */ lw $s2, 0x28($sp) +/* EEE0F0 80240FF0 8FB10024 */ lw $s1, 0x24($sp) +/* EEE0F4 80240FF4 8FB00020 */ lw $s0, 0x20($sp) +/* EEE0F8 80240FF8 03E00008 */ jr $ra +/* EEE0FC 80240FFC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EEDF50/func_80241000_EEE100.s b/asm/nonmatchings/code_EEDF50/func_80241000_EEE100.s new file mode 100644 index 0000000000..6ca5b22b06 --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80241000_EEE100.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241000_EEE100 +/* EEE100 80241000 27BDFF80 */ addiu $sp, $sp, -0x80 +/* EEE104 80241004 AFB3004C */ sw $s3, 0x4c($sp) +/* EEE108 80241008 0080982D */ daddu $s3, $a0, $zero +/* EEE10C 8024100C AFBF0058 */ sw $ra, 0x58($sp) +/* EEE110 80241010 AFB50054 */ sw $s5, 0x54($sp) +/* EEE114 80241014 AFB40050 */ sw $s4, 0x50($sp) +/* EEE118 80241018 AFB20048 */ sw $s2, 0x48($sp) +/* EEE11C 8024101C AFB10044 */ sw $s1, 0x44($sp) +/* EEE120 80241020 AFB00040 */ sw $s0, 0x40($sp) +/* EEE124 80241024 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* EEE128 80241028 F7B80070 */ sdc1 $f24, 0x70($sp) +/* EEE12C 8024102C F7B60068 */ sdc1 $f22, 0x68($sp) +/* EEE130 80241030 F7B40060 */ sdc1 $f20, 0x60($sp) +/* EEE134 80241034 8E710148 */ lw $s1, 0x148($s3) +/* EEE138 80241038 00A0902D */ daddu $s2, $a1, $zero +/* EEE13C 8024103C 86240008 */ lh $a0, 8($s1) +/* EEE140 80241040 0C00F92F */ jal func_8003E4BC +/* EEE144 80241044 00C0A82D */ daddu $s5, $a2, $zero +/* EEE148 80241048 0040802D */ daddu $s0, $v0, $zero +/* EEE14C 8024104C 0000A02D */ daddu $s4, $zero, $zero +/* EEE150 80241050 C624007C */ lwc1 $f4, 0x7c($s1) +/* EEE154 80241054 46802120 */ cvt.s.w $f4, $f4 +/* EEE158 80241058 C6220088 */ lwc1 $f2, 0x88($s1) +/* EEE15C 8024105C 468010A0 */ cvt.s.w $f2, $f2 +/* EEE160 80241060 460010A1 */ cvt.d.s $f2, $f2 +/* EEE164 80241064 46002121 */ cvt.d.s $f4, $f4 +/* EEE168 80241068 C600003C */ lwc1 $f0, 0x3c($s0) +/* EEE16C 8024106C 3C014059 */ lui $at, 0x4059 +/* EEE170 80241070 44813800 */ mtc1 $at, $f7 +/* EEE174 80241074 44803000 */ mtc1 $zero, $f6 +/* EEE178 80241078 46000021 */ cvt.d.s $f0, $f0 +/* EEE17C 8024107C 46260002 */ mul.d $f0, $f0, $f6 +/* EEE180 80241080 00000000 */ nop +/* EEE184 80241084 24020001 */ addiu $v0, $zero, 1 +/* EEE188 80241088 8E24006C */ lw $a0, 0x6c($s1) +/* EEE18C 8024108C 46261083 */ div.d $f2, $f2, $f6 +/* EEE190 80241090 462010A0 */ cvt.s.d $f2, $f2 +/* EEE194 80241094 46262103 */ div.d $f4, $f4, $f6 +/* EEE198 80241098 46202520 */ cvt.s.d $f20, $f4 +/* EEE19C 8024109C 30830011 */ andi $v1, $a0, 0x11 +/* EEE1A0 802410A0 4620020D */ trunc.w.d $f8, $f0 +/* EEE1A4 802410A4 E628007C */ swc1 $f8, 0x7c($s1) +/* EEE1A8 802410A8 C6200078 */ lwc1 $f0, 0x78($s1) +/* EEE1AC 802410AC 46800020 */ cvt.s.w $f0, $f0 +/* EEE1B0 802410B0 46000021 */ cvt.d.s $f0, $f0 +/* EEE1B4 802410B4 46260003 */ div.d $f0, $f0, $f6 +/* EEE1B8 802410B8 462006A0 */ cvt.s.d $f26, $f0 +/* EEE1BC 802410BC C6200070 */ lwc1 $f0, 0x70($s1) +/* EEE1C0 802410C0 46800020 */ cvt.s.w $f0, $f0 +/* EEE1C4 802410C4 46000021 */ cvt.d.s $f0, $f0 +/* EEE1C8 802410C8 46260003 */ div.d $f0, $f0, $f6 +/* EEE1CC 802410CC 462005A0 */ cvt.s.d $f22, $f0 +/* EEE1D0 802410D0 14620025 */ bne $v1, $v0, .L80241168 +/* EEE1D4 802410D4 4602D600 */ add.s $f24, $f26, $f2 +/* EEE1D8 802410D8 8E020000 */ lw $v0, ($s0) +/* EEE1DC 802410DC 30420008 */ andi $v0, $v0, 8 +/* EEE1E0 802410E0 10400009 */ beqz $v0, .L80241108 +/* EEE1E4 802410E4 27A50028 */ addiu $a1, $sp, 0x28 +/* EEE1E8 802410E8 C600003C */ lwc1 $f0, 0x3c($s0) +/* EEE1EC 802410EC 4600C001 */ sub.s $f0, $f24, $f0 +/* EEE1F0 802410F0 4600B03C */ c.lt.s $f22, $f0 +/* EEE1F4 802410F4 00000000 */ nop +/* EEE1F8 802410F8 4500001B */ bc1f .L80241168 +/* EEE1FC 802410FC 34820010 */ ori $v0, $a0, 0x10 +/* EEE200 80241100 0809045A */ j .L80241168 +/* EEE204 80241104 AE22006C */ sw $v0, 0x6c($s1) +.L80241108: +/* EEE208 80241108 27A6002C */ addiu $a2, $sp, 0x2c +/* EEE20C 8024110C C6000038 */ lwc1 $f0, 0x38($s0) +/* EEE210 80241110 C602003C */ lwc1 $f2, 0x3c($s0) +/* EEE214 80241114 C6040040 */ lwc1 $f4, 0x40($s0) +/* EEE218 80241118 3C01447A */ lui $at, 0x447a +/* EEE21C 8024111C 44813000 */ mtc1 $at, $f6 +/* EEE220 80241120 27A20034 */ addiu $v0, $sp, 0x34 +/* EEE224 80241124 E7A00028 */ swc1 $f0, 0x28($sp) +/* EEE228 80241128 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EEE22C 8024112C E7A40030 */ swc1 $f4, 0x30($sp) +/* EEE230 80241130 E7A60034 */ swc1 $f6, 0x34($sp) +/* EEE234 80241134 AFA20010 */ sw $v0, 0x10($sp) +/* EEE238 80241138 8E040080 */ lw $a0, 0x80($s0) +/* EEE23C 8024113C 0C03908F */ jal func_800E423C +/* EEE240 80241140 27A70030 */ addiu $a3, $sp, 0x30 +/* EEE244 80241144 C7A00034 */ lwc1 $f0, 0x34($sp) +/* EEE248 80241148 4600D001 */ sub.s $f0, $f26, $f0 +/* EEE24C 8024114C 4600B03C */ c.lt.s $f22, $f0 +/* EEE250 80241150 00000000 */ nop +/* EEE254 80241154 45000004 */ bc1f .L80241168 +/* EEE258 80241158 00000000 */ nop +/* EEE25C 8024115C 8E22006C */ lw $v0, 0x6c($s1) +/* EEE260 80241160 34420010 */ ori $v0, $v0, 0x10 +/* EEE264 80241164 AE22006C */ sw $v0, 0x6c($s1) +.L80241168: +/* EEE268 80241168 8E22006C */ lw $v0, 0x6c($s1) +/* EEE26C 8024116C 24030011 */ addiu $v1, $zero, 0x11 +/* EEE270 80241170 30420011 */ andi $v0, $v0, 0x11 +/* EEE274 80241174 14430039 */ bne $v0, $v1, .L8024125C +/* EEE278 80241178 00000000 */ nop +/* EEE27C 8024117C 8E020000 */ lw $v0, ($s0) +/* EEE280 80241180 30420008 */ andi $v0, $v0, 8 +/* EEE284 80241184 1040000A */ beqz $v0, .L802411B0 +/* EEE288 80241188 4600C106 */ mov.s $f4, $f24 +/* EEE28C 8024118C 4614C081 */ sub.s $f2, $f24, $f20 +/* EEE290 80241190 3C018024 */ lui $at, %hi(D_80245458) +/* EEE294 80241194 D4205458 */ ldc1 $f0, %lo(D_80245458)($at) +/* EEE298 80241198 460010A1 */ cvt.d.s $f2, $f2 +/* EEE29C 8024119C 46201082 */ mul.d $f2, $f2, $f0 +/* EEE2A0 802411A0 00000000 */ nop +/* EEE2A4 802411A4 4600A021 */ cvt.d.s $f0, $f20 +/* EEE2A8 802411A8 08090485 */ j .L80241214 +/* EEE2AC 802411AC 46220000 */ add.d $f0, $f0, $f2 +.L802411B0: +/* EEE2B0 802411B0 27A50028 */ addiu $a1, $sp, 0x28 +/* EEE2B4 802411B4 27A6002C */ addiu $a2, $sp, 0x2c +/* EEE2B8 802411B8 C6000038 */ lwc1 $f0, 0x38($s0) +/* EEE2BC 802411BC C6020040 */ lwc1 $f2, 0x40($s0) +/* EEE2C0 802411C0 3C01447A */ lui $at, 0x447a +/* EEE2C4 802411C4 44812000 */ mtc1 $at, $f4 +/* EEE2C8 802411C8 27A20034 */ addiu $v0, $sp, 0x34 +/* EEE2CC 802411CC E7B4002C */ swc1 $f20, 0x2c($sp) +/* EEE2D0 802411D0 E7A00028 */ swc1 $f0, 0x28($sp) +/* EEE2D4 802411D4 E7A20030 */ swc1 $f2, 0x30($sp) +/* EEE2D8 802411D8 E7A40034 */ swc1 $f4, 0x34($sp) +/* EEE2DC 802411DC AFA20010 */ sw $v0, 0x10($sp) +/* EEE2E0 802411E0 8E040080 */ lw $a0, 0x80($s0) +/* EEE2E4 802411E4 0C03908F */ jal func_800E423C +/* EEE2E8 802411E8 27A70030 */ addiu $a3, $sp, 0x30 +/* EEE2EC 802411EC C7A4002C */ lwc1 $f4, 0x2c($sp) +/* EEE2F0 802411F0 461A2100 */ add.s $f4, $f4, $f26 +/* EEE2F4 802411F4 46142081 */ sub.s $f2, $f4, $f20 +/* EEE2F8 802411F8 3C018024 */ lui $at, %hi(D_80245460) +/* EEE2FC 802411FC D4205460 */ ldc1 $f0, %lo(D_80245460)($at) +/* EEE300 80241200 460010A1 */ cvt.d.s $f2, $f2 +/* EEE304 80241204 46201082 */ mul.d $f2, $f2, $f0 +/* EEE308 80241208 00000000 */ nop +/* EEE30C 8024120C 4600A021 */ cvt.d.s $f0, $f20 +/* EEE310 80241210 46220000 */ add.d $f0, $f0, $f2 +.L80241214: +/* EEE314 80241214 46200020 */ cvt.s.d $f0, $f0 +/* EEE318 80241218 E600003C */ swc1 $f0, 0x3c($s0) +/* EEE31C 8024121C C600003C */ lwc1 $f0, 0x3c($s0) +/* EEE320 80241220 46002001 */ sub.s $f0, $f4, $f0 +/* EEE324 80241224 3C013FF0 */ lui $at, 0x3ff0 +/* EEE328 80241228 44811800 */ mtc1 $at, $f3 +/* EEE32C 8024122C 44801000 */ mtc1 $zero, $f2 +/* EEE330 80241230 46000005 */ abs.s $f0, $f0 +/* EEE334 80241234 46000021 */ cvt.d.s $f0, $f0 +/* EEE338 80241238 4622003C */ c.lt.d $f0, $f2 +/* EEE33C 8024123C 00000000 */ nop +/* EEE340 80241240 45000036 */ bc1f .L8024131C +/* EEE344 80241244 2403FFEF */ addiu $v1, $zero, -0x11 +/* EEE348 80241248 E604003C */ swc1 $f4, 0x3c($s0) +/* EEE34C 8024124C 8E22006C */ lw $v0, 0x6c($s1) +/* EEE350 80241250 00431024 */ and $v0, $v0, $v1 +/* EEE354 80241254 080904C7 */ j .L8024131C +/* EEE358 80241258 AE22006C */ sw $v0, 0x6c($s1) +.L8024125C: +/* EEE35C 8024125C 8E220070 */ lw $v0, 0x70($s1) +/* EEE360 80241260 1840002E */ blez $v0, .L8024131C +/* EEE364 80241264 00000000 */ nop +/* EEE368 80241268 C62C0074 */ lwc1 $f12, 0x74($s1) +/* EEE36C 8024126C 0C00AD77 */ jal func_8002B5DC +/* EEE370 80241270 46806320 */ cvt.s.w $f12, $f12 +/* EEE374 80241274 8E020000 */ lw $v0, ($s0) +/* EEE378 80241278 30420008 */ andi $v0, $v0, 8 +/* EEE37C 8024127C 10400003 */ beqz $v0, .L8024128C +/* EEE380 80241280 46000506 */ mov.s $f20, $f0 +/* EEE384 80241284 080904B3 */ j .L802412CC +/* EEE388 80241288 0000102D */ daddu $v0, $zero, $zero +.L8024128C: +/* EEE38C 8024128C 27A50028 */ addiu $a1, $sp, 0x28 +/* EEE390 80241290 27A6002C */ addiu $a2, $sp, 0x2c +/* EEE394 80241294 C6000038 */ lwc1 $f0, 0x38($s0) +/* EEE398 80241298 C602003C */ lwc1 $f2, 0x3c($s0) +/* EEE39C 8024129C C6040040 */ lwc1 $f4, 0x40($s0) +/* EEE3A0 802412A0 3C01447A */ lui $at, 0x447a +/* EEE3A4 802412A4 44813000 */ mtc1 $at, $f6 +/* EEE3A8 802412A8 27A20034 */ addiu $v0, $sp, 0x34 +/* EEE3AC 802412AC E7A00028 */ swc1 $f0, 0x28($sp) +/* EEE3B0 802412B0 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EEE3B4 802412B4 E7A40030 */ swc1 $f4, 0x30($sp) +/* EEE3B8 802412B8 E7A60034 */ swc1 $f6, 0x34($sp) +/* EEE3BC 802412BC AFA20010 */ sw $v0, 0x10($sp) +/* EEE3C0 802412C0 8E040080 */ lw $a0, 0x80($s0) +/* EEE3C4 802412C4 0C03908F */ jal func_800E423C +/* EEE3C8 802412C8 27A70030 */ addiu $a3, $sp, 0x30 +.L802412CC: +/* EEE3CC 802412CC 10400007 */ beqz $v0, .L802412EC +/* EEE3D0 802412D0 00000000 */ nop +/* EEE3D4 802412D4 4616A082 */ mul.s $f2, $f20, $f22 +/* EEE3D8 802412D8 00000000 */ nop +/* EEE3DC 802412DC C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EEE3E0 802412E0 461A0000 */ add.s $f0, $f0, $f26 +/* EEE3E4 802412E4 080904BE */ j .L802412F8 +/* EEE3E8 802412E8 46020000 */ add.s $f0, $f0, $f2 +.L802412EC: +/* EEE3EC 802412EC 4616A002 */ mul.s $f0, $f20, $f22 +/* EEE3F0 802412F0 00000000 */ nop +/* EEE3F4 802412F4 4600C000 */ add.s $f0, $f24, $f0 +.L802412F8: +/* EEE3F8 802412F8 E600003C */ swc1 $f0, 0x3c($s0) +/* EEE3FC 802412FC 8E220074 */ lw $v0, 0x74($s1) +/* EEE400 80241300 2442000A */ addiu $v0, $v0, 0xa +/* EEE404 80241304 44826000 */ mtc1 $v0, $f12 +/* EEE408 80241308 00000000 */ nop +/* EEE40C 8024130C 0C00AB85 */ jal func_8002AE14 +/* EEE410 80241310 46806320 */ cvt.s.w $f12, $f12 +/* EEE414 80241314 4600020D */ trunc.w.s $f8, $f0 +/* EEE418 80241318 E6280074 */ swc1 $f8, 0x74($s1) +.L8024131C: +/* EEE41C 8024131C 8E220090 */ lw $v0, 0x90($s1) +/* EEE420 80241320 1C40004A */ bgtz $v0, .L8024144C +/* EEE424 80241324 2442FFFF */ addiu $v0, $v0, -1 +/* EEE428 80241328 8E430014 */ lw $v1, 0x14($s2) +/* EEE42C 8024132C 04600048 */ bltz $v1, .L80241450 +/* EEE430 80241330 00000000 */ nop +/* EEE434 80241334 8E620074 */ lw $v0, 0x74($s3) +/* EEE438 80241338 1C400042 */ bgtz $v0, .L80241444 +/* EEE43C 8024133C 2442FFFF */ addiu $v0, $v0, -1 +/* EEE440 80241340 AE630074 */ sw $v1, 0x74($s3) +/* EEE444 80241344 860200A8 */ lh $v0, 0xa8($s0) +/* EEE448 80241348 C602003C */ lwc1 $f2, 0x3c($s0) +/* EEE44C 8024134C 44820000 */ mtc1 $v0, $f0 +/* EEE450 80241350 00000000 */ nop +/* EEE454 80241354 46800020 */ cvt.s.w $f0, $f0 +/* EEE458 80241358 46001080 */ add.s $f2, $f2, $f0 +/* EEE45C 8024135C 3C014024 */ lui $at, 0x4024 +/* EEE460 80241360 44810800 */ mtc1 $at, $f1 +/* EEE464 80241364 44800000 */ mtc1 $zero, $f0 +/* EEE468 80241368 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EEE46C 8024136C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EEE470 80241370 460010A1 */ cvt.d.s $f2, $f2 +/* EEE474 80241374 46201080 */ add.d $f2, $f2, $f0 +/* EEE478 80241378 C440002C */ lwc1 $f0, 0x2c($v0) +/* EEE47C 8024137C 46000021 */ cvt.d.s $f0, $f0 +/* EEE480 80241380 4622003C */ c.lt.d $f0, $f2 +/* EEE484 80241384 00000000 */ nop +/* EEE488 80241388 4500002C */ bc1f .L8024143C +/* EEE48C 8024138C 02A0202D */ daddu $a0, $s5, $zero +/* EEE490 80241390 AFA00010 */ sw $zero, 0x10($sp) +/* EEE494 80241394 8E46000C */ lw $a2, 0xc($s2) +/* EEE498 80241398 8E470010 */ lw $a3, 0x10($s2) +/* EEE49C 8024139C 0C013469 */ jal func_8004D1A4 +/* EEE4A0 802413A0 0220282D */ daddu $a1, $s1, $zero +/* EEE4A4 802413A4 10400025 */ beqz $v0, .L8024143C +/* EEE4A8 802413A8 0000202D */ daddu $a0, $zero, $zero +/* EEE4AC 802413AC 0200282D */ daddu $a1, $s0, $zero +/* EEE4B0 802413B0 0000302D */ daddu $a2, $zero, $zero +/* EEE4B4 802413B4 2412000C */ addiu $s2, $zero, 0xc +/* EEE4B8 802413B8 860300A8 */ lh $v1, 0xa8($s0) +/* EEE4BC 802413BC 3C013F80 */ lui $at, 0x3f80 +/* EEE4C0 802413C0 44810000 */ mtc1 $at, $f0 +/* EEE4C4 802413C4 3C014000 */ lui $at, 0x4000 +/* EEE4C8 802413C8 44811000 */ mtc1 $at, $f2 +/* EEE4CC 802413CC 3C01C1A0 */ lui $at, 0xc1a0 +/* EEE4D0 802413D0 44812000 */ mtc1 $at, $f4 +/* EEE4D4 802413D4 44834000 */ mtc1 $v1, $f8 +/* EEE4D8 802413D8 00000000 */ nop +/* EEE4DC 802413DC 46804220 */ cvt.s.w $f8, $f8 +/* EEE4E0 802413E0 44074000 */ mfc1 $a3, $f8 +/* EEE4E4 802413E4 27A20038 */ addiu $v0, $sp, 0x38 +/* EEE4E8 802413E8 AFB2001C */ sw $s2, 0x1c($sp) +/* EEE4EC 802413EC AFA20020 */ sw $v0, 0x20($sp) +/* EEE4F0 802413F0 E7A00010 */ swc1 $f0, 0x10($sp) +/* EEE4F4 802413F4 E7A20014 */ swc1 $f2, 0x14($sp) +/* EEE4F8 802413F8 0C01D444 */ jal func_80075110 +/* EEE4FC 802413FC E7A40018 */ swc1 $f4, 0x18($sp) +/* EEE500 80241400 0200202D */ daddu $a0, $s0, $zero +/* EEE504 80241404 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EEE508 80241408 C480003C */ lwc1 $f0, 0x3c($a0) +/* EEE50C 8024140C 3C060020 */ lui $a2, 0x20 +/* EEE510 80241410 0C013600 */ jal func_8004D800 +/* EEE514 80241414 E4800064 */ swc1 $f0, 0x64($a0) +/* EEE518 80241418 8E220018 */ lw $v0, 0x18($s1) +/* EEE51C 8024141C 9442002A */ lhu $v0, 0x2a($v0) +/* EEE520 80241420 30420001 */ andi $v0, $v0, 1 +/* EEE524 80241424 10400003 */ beqz $v0, .L80241434 +/* EEE528 80241428 2402000A */ addiu $v0, $zero, 0xa +/* EEE52C 8024142C 0809057D */ j .L802415F4 +/* EEE530 80241430 AE620070 */ sw $v0, 0x70($s3) +.L80241434: +/* EEE534 80241434 0809057D */ j .L802415F4 +/* EEE538 80241438 AE720070 */ sw $s2, 0x70($s3) +.L8024143C: +/* EEE53C 8024143C 8E620074 */ lw $v0, 0x74($s3) +/* EEE540 80241440 2442FFFF */ addiu $v0, $v0, -1 +.L80241444: +/* EEE544 80241444 08090514 */ j .L80241450 +/* EEE548 80241448 AE620074 */ sw $v0, 0x74($s3) +.L8024144C: +/* EEE54C 8024144C AE220090 */ sw $v0, 0x90($s1) +.L80241450: +/* EEE550 80241450 8E2300D0 */ lw $v1, 0xd0($s1) +/* EEE554 80241454 C6000040 */ lwc1 $f0, 0x40($s0) +/* EEE558 80241458 C4620000 */ lwc1 $f2, ($v1) +/* EEE55C 8024145C 468010A0 */ cvt.s.w $f2, $f2 +/* EEE560 80241460 C4640008 */ lwc1 $f4, 8($v1) +/* EEE564 80241464 46802120 */ cvt.s.w $f4, $f4 +/* EEE568 80241468 E7A00010 */ swc1 $f0, 0x10($sp) +/* EEE56C 8024146C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EEE570 80241470 44051000 */ mfc1 $a1, $f2 +/* EEE574 80241474 C440000C */ lwc1 $f0, 0xc($v0) +/* EEE578 80241478 46800020 */ cvt.s.w $f0, $f0 +/* EEE57C 8024147C E7A00014 */ swc1 $f0, 0x14($sp) +/* EEE580 80241480 8E2200D0 */ lw $v0, 0xd0($s1) +/* EEE584 80241484 44062000 */ mfc1 $a2, $f4 +/* EEE588 80241488 C4400010 */ lwc1 $f0, 0x10($v0) +/* EEE58C 8024148C 46800020 */ cvt.s.w $f0, $f0 +/* EEE590 80241490 E7A00018 */ swc1 $f0, 0x18($sp) +/* EEE594 80241494 8C640018 */ lw $a0, 0x18($v1) +/* EEE598 80241498 0C013431 */ jal func_8004D0C4 +/* EEE59C 8024149C 8E070038 */ lw $a3, 0x38($s0) +/* EEE5A0 802414A0 1040001A */ beqz $v0, .L8024150C +/* EEE5A4 802414A4 00000000 */ nop +/* EEE5A8 802414A8 8E060038 */ lw $a2, 0x38($s0) +/* EEE5AC 802414AC 8E2200D0 */ lw $v0, 0xd0($s1) +/* EEE5B0 802414B0 8E070040 */ lw $a3, 0x40($s0) +/* EEE5B4 802414B4 C44C0000 */ lwc1 $f12, ($v0) +/* EEE5B8 802414B8 46806320 */ cvt.s.w $f12, $f12 +/* EEE5BC 802414BC C44E0008 */ lwc1 $f14, 8($v0) +/* EEE5C0 802414C0 0C00AC71 */ jal func_8002B1C4 +/* EEE5C4 802414C4 468073A0 */ cvt.s.w $f14, $f14 +/* EEE5C8 802414C8 C6020018 */ lwc1 $f2, 0x18($s0) +/* EEE5CC 802414CC 4600103C */ c.lt.s $f2, $f0 +/* EEE5D0 802414D0 00000000 */ nop +/* EEE5D4 802414D4 4500000D */ bc1f .L8024150C +/* EEE5D8 802414D8 E7A00034 */ swc1 $f0, 0x34($sp) +/* EEE5DC 802414DC C60C0038 */ lwc1 $f12, 0x38($s0) +/* EEE5E0 802414E0 8E2200D0 */ lw $v0, 0xd0($s1) +/* EEE5E4 802414E4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EEE5E8 802414E8 C4480000 */ lwc1 $f8, ($v0) +/* EEE5EC 802414EC 46804220 */ cvt.s.w $f8, $f8 +/* EEE5F0 802414F0 44064000 */ mfc1 $a2, $f8 +/* EEE5F4 802414F4 C4480008 */ lwc1 $f8, 8($v0) +/* EEE5F8 802414F8 46804220 */ cvt.s.w $f8, $f8 +/* EEE5FC 802414FC 44074000 */ mfc1 $a3, $f8 +/* EEE600 80241500 0C00ABDC */ jal fio_validate_header_checksums +/* EEE604 80241504 24140001 */ addiu $s4, $zero, 1 +/* EEE608 80241508 E600000C */ swc1 $f0, 0xc($s0) +.L8024150C: +/* EEE60C 8024150C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EEE610 80241510 8C43000C */ lw $v1, 0xc($v0) +/* EEE614 80241514 8C420010 */ lw $v0, 0x10($v0) +/* EEE618 80241518 00621825 */ or $v1, $v1, $v0 +/* EEE61C 8024151C 00741825 */ or $v1, $v1, $s4 +/* EEE620 80241520 10600008 */ beqz $v1, .L80241544 +/* EEE624 80241524 00000000 */ nop +/* EEE628 80241528 8602008C */ lh $v0, 0x8c($s0) +/* EEE62C 8024152C 14400031 */ bnez $v0, .L802415F4 +/* EEE630 80241530 00000000 */ nop +/* EEE634 80241534 8E050018 */ lw $a1, 0x18($s0) +/* EEE638 80241538 8E06000C */ lw $a2, 0xc($s0) +/* EEE63C 8024153C 0C00F909 */ jal func_8003E424 +/* EEE640 80241540 0200202D */ daddu $a0, $s0, $zero +.L80241544: +/* EEE644 80241544 C600003C */ lwc1 $f0, 0x3c($s0) +/* EEE648 80241548 3C014059 */ lui $at, 0x4059 +/* EEE64C 8024154C 44811800 */ mtc1 $at, $f3 +/* EEE650 80241550 44801000 */ mtc1 $zero, $f2 +/* EEE654 80241554 46000021 */ cvt.d.s $f0, $f0 +/* EEE658 80241558 46220002 */ mul.d $f0, $f0, $f2 +/* EEE65C 8024155C 00000000 */ nop +/* EEE660 80241560 4620020D */ trunc.w.d $f8, $f0 +/* EEE664 80241564 E628007C */ swc1 $f8, 0x7c($s1) +/* EEE668 80241568 8E420004 */ lw $v0, 4($s2) +/* EEE66C 8024156C 18400021 */ blez $v0, .L802415F4 +/* EEE670 80241570 00000000 */ nop +/* EEE674 80241574 8602008E */ lh $v0, 0x8e($s0) +/* EEE678 80241578 9603008E */ lhu $v1, 0x8e($s0) +/* EEE67C 8024157C 18400005 */ blez $v0, .L80241594 +/* EEE680 80241580 2462FFFF */ addiu $v0, $v1, -1 +/* EEE684 80241584 A602008E */ sh $v0, 0x8e($s0) +/* EEE688 80241588 00021400 */ sll $v0, $v0, 0x10 +/* EEE68C 8024158C 1C400019 */ bgtz $v0, .L802415F4 +/* EEE690 80241590 00000000 */ nop +.L80241594: +/* EEE694 80241594 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EEE698 80241598 24020002 */ addiu $v0, $zero, 2 +/* EEE69C 8024159C 0C00AB3B */ jal func_8002ACEC +/* EEE6A0 802415A0 AE620070 */ sw $v0, 0x70($s3) +/* EEE6A4 802415A4 3C035555 */ lui $v1, 0x5555 +/* EEE6A8 802415A8 34635556 */ ori $v1, $v1, 0x5556 +/* EEE6AC 802415AC 00430018 */ mult $v0, $v1 +/* EEE6B0 802415B0 000227C3 */ sra $a0, $v0, 0x1f +/* EEE6B4 802415B4 00004010 */ mfhi $t0 +/* EEE6B8 802415B8 01042023 */ subu $a0, $t0, $a0 +/* EEE6BC 802415BC 00041840 */ sll $v1, $a0, 1 +/* EEE6C0 802415C0 00641821 */ addu $v1, $v1, $a0 +/* EEE6C4 802415C4 00431023 */ subu $v0, $v0, $v1 +/* EEE6C8 802415C8 24430002 */ addiu $v1, $v0, 2 +/* EEE6CC 802415CC AE630074 */ sw $v1, 0x74($s3) +/* EEE6D0 802415D0 8E42002C */ lw $v0, 0x2c($s2) +/* EEE6D4 802415D4 58400007 */ blezl $v0, .L802415F4 +/* EEE6D8 802415D8 AE600070 */ sw $zero, 0x70($s3) +/* EEE6DC 802415DC 8E420008 */ lw $v0, 8($s2) +/* EEE6E0 802415E0 18400003 */ blez $v0, .L802415F0 +/* EEE6E4 802415E4 28620003 */ slti $v0, $v1, 3 +/* EEE6E8 802415E8 10400002 */ beqz $v0, .L802415F4 +/* EEE6EC 802415EC 00000000 */ nop +.L802415F0: +/* EEE6F0 802415F0 AE600070 */ sw $zero, 0x70($s3) +.L802415F4: +/* EEE6F4 802415F4 8FBF0058 */ lw $ra, 0x58($sp) +/* EEE6F8 802415F8 8FB50054 */ lw $s5, 0x54($sp) +/* EEE6FC 802415FC 8FB40050 */ lw $s4, 0x50($sp) +/* EEE700 80241600 8FB3004C */ lw $s3, 0x4c($sp) +/* EEE704 80241604 8FB20048 */ lw $s2, 0x48($sp) +/* EEE708 80241608 8FB10044 */ lw $s1, 0x44($sp) +/* EEE70C 8024160C 8FB00040 */ lw $s0, 0x40($sp) +/* EEE710 80241610 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* EEE714 80241614 D7B80070 */ ldc1 $f24, 0x70($sp) +/* EEE718 80241618 D7B60068 */ ldc1 $f22, 0x68($sp) +/* EEE71C 8024161C D7B40060 */ ldc1 $f20, 0x60($sp) +/* EEE720 80241620 03E00008 */ jr $ra +/* EEE724 80241624 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/code_EEDF50/func_80241628_EEE728.s b/asm/nonmatchings/code_EEDF50/func_80241628_EEE728.s new file mode 100644 index 0000000000..2328bb7f71 --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80241628_EEE728.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241628_EEE728 +/* EEE728 80241628 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EEE72C 8024162C AFB3001C */ sw $s3, 0x1c($sp) +/* EEE730 80241630 0080982D */ daddu $s3, $a0, $zero +/* EEE734 80241634 AFBF0020 */ sw $ra, 0x20($sp) +/* EEE738 80241638 AFB20018 */ sw $s2, 0x18($sp) +/* EEE73C 8024163C AFB10014 */ sw $s1, 0x14($sp) +/* EEE740 80241640 AFB00010 */ sw $s0, 0x10($sp) +/* EEE744 80241644 8E720148 */ lw $s2, 0x148($s3) +/* EEE748 80241648 86440008 */ lh $a0, 8($s2) +/* EEE74C 8024164C 0C00F92F */ jal func_8003E4BC +/* EEE750 80241650 00A0882D */ daddu $s1, $a1, $zero +/* EEE754 80241654 8E240008 */ lw $a0, 8($s1) +/* EEE758 80241658 0040802D */ daddu $s0, $v0, $zero +/* EEE75C 8024165C 00041FC2 */ srl $v1, $a0, 0x1f +/* EEE760 80241660 00832021 */ addu $a0, $a0, $v1 +/* EEE764 80241664 00042043 */ sra $a0, $a0, 1 +/* EEE768 80241668 0C00AB3B */ jal func_8002ACEC +/* EEE76C 8024166C 24840001 */ addiu $a0, $a0, 1 +/* EEE770 80241670 8E230008 */ lw $v1, 8($s1) +/* EEE774 80241674 240400B4 */ addiu $a0, $zero, 0xb4 +/* EEE778 80241678 00032FC2 */ srl $a1, $v1, 0x1f +/* EEE77C 8024167C 00651821 */ addu $v1, $v1, $a1 +/* EEE780 80241680 00031843 */ sra $v1, $v1, 1 +/* EEE784 80241684 00621821 */ addu $v1, $v1, $v0 +/* EEE788 80241688 0C00AB3B */ jal func_8002ACEC +/* EEE78C 8024168C A603008E */ sh $v1, 0x8e($s0) +/* EEE790 80241690 C60C000C */ lwc1 $f12, 0xc($s0) +/* EEE794 80241694 44820000 */ mtc1 $v0, $f0 +/* EEE798 80241698 00000000 */ nop +/* EEE79C 8024169C 46800020 */ cvt.s.w $f0, $f0 +/* EEE7A0 802416A0 46006300 */ add.s $f12, $f12, $f0 +/* EEE7A4 802416A4 3C0142B4 */ lui $at, 0x42b4 +/* EEE7A8 802416A8 44810000 */ mtc1 $at, $f0 +/* EEE7AC 802416AC 0C00AB85 */ jal func_8002AE14 +/* EEE7B0 802416B0 46006301 */ sub.s $f12, $f12, $f0 +/* EEE7B4 802416B4 E600000C */ swc1 $f0, 0xc($s0) +/* EEE7B8 802416B8 8E4200CC */ lw $v0, 0xcc($s2) +/* EEE7BC 802416BC 8C420000 */ lw $v0, ($v0) +/* EEE7C0 802416C0 AE020028 */ sw $v0, 0x28($s0) +/* EEE7C4 802416C4 24020003 */ addiu $v0, $zero, 3 +/* EEE7C8 802416C8 AE620070 */ sw $v0, 0x70($s3) +/* EEE7CC 802416CC 8FBF0020 */ lw $ra, 0x20($sp) +/* EEE7D0 802416D0 8FB3001C */ lw $s3, 0x1c($sp) +/* EEE7D4 802416D4 8FB20018 */ lw $s2, 0x18($sp) +/* EEE7D8 802416D8 8FB10014 */ lw $s1, 0x14($sp) +/* EEE7DC 802416DC 8FB00010 */ lw $s0, 0x10($sp) +/* EEE7E0 802416E0 03E00008 */ jr $ra +/* EEE7E4 802416E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EEDF50/func_802416E8_EEE7E8.s b/asm/nonmatchings/code_EEDF50/func_802416E8_EEE7E8.s new file mode 100644 index 0000000000..64df0a5955 --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_802416E8_EEE7E8.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416E8_EEE7E8 +/* EEE7E8 802416E8 27BDFF88 */ addiu $sp, $sp, -0x78 +/* EEE7EC 802416EC AFB3004C */ sw $s3, 0x4c($sp) +/* EEE7F0 802416F0 0080982D */ daddu $s3, $a0, $zero +/* EEE7F4 802416F4 AFBF0054 */ sw $ra, 0x54($sp) +/* EEE7F8 802416F8 AFB40050 */ sw $s4, 0x50($sp) +/* EEE7FC 802416FC AFB20048 */ sw $s2, 0x48($sp) +/* EEE800 80241700 AFB10044 */ sw $s1, 0x44($sp) +/* EEE804 80241704 AFB00040 */ sw $s0, 0x40($sp) +/* EEE808 80241708 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* EEE80C 8024170C F7B80068 */ sdc1 $f24, 0x68($sp) +/* EEE810 80241710 F7B60060 */ sdc1 $f22, 0x60($sp) +/* EEE814 80241714 F7B40058 */ sdc1 $f20, 0x58($sp) +/* EEE818 80241718 8E710148 */ lw $s1, 0x148($s3) +/* EEE81C 8024171C 00A0902D */ daddu $s2, $a1, $zero +/* EEE820 80241720 86240008 */ lh $a0, 8($s1) +/* EEE824 80241724 0C00F92F */ jal func_8003E4BC +/* EEE828 80241728 00C0A02D */ daddu $s4, $a2, $zero +/* EEE82C 8024172C 0040802D */ daddu $s0, $v0, $zero +/* EEE830 80241730 C6200078 */ lwc1 $f0, 0x78($s1) +/* EEE834 80241734 46800020 */ cvt.s.w $f0, $f0 +/* EEE838 80241738 46000021 */ cvt.d.s $f0, $f0 +/* EEE83C 8024173C 3C014059 */ lui $at, 0x4059 +/* EEE840 80241740 44811800 */ mtc1 $at, $f3 +/* EEE844 80241744 44801000 */ mtc1 $zero, $f2 +/* EEE848 80241748 8602008E */ lh $v0, 0x8e($s0) +/* EEE84C 8024174C 9603008E */ lhu $v1, 0x8e($s0) +/* EEE850 80241750 46220003 */ div.d $f0, $f0, $f2 +/* EEE854 80241754 46200620 */ cvt.s.d $f24, $f0 +/* EEE858 80241758 C6200088 */ lwc1 $f0, 0x88($s1) +/* EEE85C 8024175C 46800020 */ cvt.s.w $f0, $f0 +/* EEE860 80241760 46000021 */ cvt.d.s $f0, $f0 +/* EEE864 80241764 46220003 */ div.d $f0, $f0, $f2 +/* EEE868 80241768 46200020 */ cvt.s.d $f0, $f0 +/* EEE86C 8024176C 18400003 */ blez $v0, .L8024177C +/* EEE870 80241770 4600C680 */ add.s $f26, $f24, $f0 +/* EEE874 80241774 2462FFFF */ addiu $v0, $v1, -1 +/* EEE878 80241778 A602008E */ sh $v0, 0x8e($s0) +.L8024177C: +/* EEE87C 8024177C 8E220070 */ lw $v0, 0x70($s1) +/* EEE880 80241780 18400034 */ blez $v0, .L80241854 +/* EEE884 80241784 00000000 */ nop +/* EEE888 80241788 C62C0074 */ lwc1 $f12, 0x74($s1) +/* EEE88C 8024178C 46806320 */ cvt.s.w $f12, $f12 +/* EEE890 80241790 44820000 */ mtc1 $v0, $f0 +/* EEE894 80241794 00000000 */ nop +/* EEE898 80241798 46800020 */ cvt.s.w $f0, $f0 +/* EEE89C 8024179C 46000021 */ cvt.d.s $f0, $f0 +/* EEE8A0 802417A0 46220003 */ div.d $f0, $f0, $f2 +/* EEE8A4 802417A4 0C00AD77 */ jal func_8002B5DC +/* EEE8A8 802417A8 462005A0 */ cvt.s.d $f22, $f0 +/* EEE8AC 802417AC 8E020000 */ lw $v0, ($s0) +/* EEE8B0 802417B0 30420008 */ andi $v0, $v0, 8 +/* EEE8B4 802417B4 10400003 */ beqz $v0, .L802417C4 +/* EEE8B8 802417B8 46000506 */ mov.s $f20, $f0 +/* EEE8BC 802417BC 08090601 */ j .L80241804 +/* EEE8C0 802417C0 0000102D */ daddu $v0, $zero, $zero +.L802417C4: +/* EEE8C4 802417C4 27A50028 */ addiu $a1, $sp, 0x28 +/* EEE8C8 802417C8 27A6002C */ addiu $a2, $sp, 0x2c +/* EEE8CC 802417CC C6000038 */ lwc1 $f0, 0x38($s0) +/* EEE8D0 802417D0 C602003C */ lwc1 $f2, 0x3c($s0) +/* EEE8D4 802417D4 C6040040 */ lwc1 $f4, 0x40($s0) +/* EEE8D8 802417D8 3C01447A */ lui $at, 0x447a +/* EEE8DC 802417DC 44813000 */ mtc1 $at, $f6 +/* EEE8E0 802417E0 27A20034 */ addiu $v0, $sp, 0x34 +/* EEE8E4 802417E4 E7A00028 */ swc1 $f0, 0x28($sp) +/* EEE8E8 802417E8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EEE8EC 802417EC E7A40030 */ swc1 $f4, 0x30($sp) +/* EEE8F0 802417F0 E7A60034 */ swc1 $f6, 0x34($sp) +/* EEE8F4 802417F4 AFA20010 */ sw $v0, 0x10($sp) +/* EEE8F8 802417F8 8E040080 */ lw $a0, 0x80($s0) +/* EEE8FC 802417FC 0C03908F */ jal func_800E423C +/* EEE900 80241800 27A70030 */ addiu $a3, $sp, 0x30 +.L80241804: +/* EEE904 80241804 10400007 */ beqz $v0, .L80241824 +/* EEE908 80241808 00000000 */ nop +/* EEE90C 8024180C 4616A082 */ mul.s $f2, $f20, $f22 +/* EEE910 80241810 00000000 */ nop +/* EEE914 80241814 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EEE918 80241818 46180000 */ add.s $f0, $f0, $f24 +/* EEE91C 8024181C 0809060C */ j .L80241830 +/* EEE920 80241820 46020000 */ add.s $f0, $f0, $f2 +.L80241824: +/* EEE924 80241824 4616A002 */ mul.s $f0, $f20, $f22 +/* EEE928 80241828 00000000 */ nop +/* EEE92C 8024182C 4600D000 */ add.s $f0, $f26, $f0 +.L80241830: +/* EEE930 80241830 E600003C */ swc1 $f0, 0x3c($s0) +/* EEE934 80241834 8E220074 */ lw $v0, 0x74($s1) +/* EEE938 80241838 2442000A */ addiu $v0, $v0, 0xa +/* EEE93C 8024183C 44826000 */ mtc1 $v0, $f12 +/* EEE940 80241840 00000000 */ nop +/* EEE944 80241844 0C00AB85 */ jal func_8002AE14 +/* EEE948 80241848 46806320 */ cvt.s.w $f12, $f12 +/* EEE94C 8024184C 4600020D */ trunc.w.s $f8, $f0 +/* EEE950 80241850 E6280074 */ swc1 $f8, 0x74($s1) +.L80241854: +/* EEE954 80241854 8E220090 */ lw $v0, 0x90($s1) +/* EEE958 80241858 1C400040 */ bgtz $v0, .L8024195C +/* EEE95C 8024185C 2442FFFF */ addiu $v0, $v0, -1 +/* EEE960 80241860 860200A8 */ lh $v0, 0xa8($s0) +/* EEE964 80241864 C600003C */ lwc1 $f0, 0x3c($s0) +/* EEE968 80241868 44821000 */ mtc1 $v0, $f2 +/* EEE96C 8024186C 00000000 */ nop +/* EEE970 80241870 468010A0 */ cvt.s.w $f2, $f2 +/* EEE974 80241874 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EEE978 80241878 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EEE97C 8024187C 46020000 */ add.s $f0, $f0, $f2 +/* EEE980 80241880 3C014024 */ lui $at, 0x4024 +/* EEE984 80241884 44812800 */ mtc1 $at, $f5 +/* EEE988 80241888 44802000 */ mtc1 $zero, $f4 +/* EEE98C 8024188C C442002C */ lwc1 $f2, 0x2c($v0) +/* EEE990 80241890 46000021 */ cvt.d.s $f0, $f0 +/* EEE994 80241894 46240000 */ add.d $f0, $f0, $f4 +/* EEE998 80241898 460010A1 */ cvt.d.s $f2, $f2 +/* EEE99C 8024189C 4620103C */ c.lt.d $f2, $f0 +/* EEE9A0 802418A0 00000000 */ nop +/* EEE9A4 802418A4 4500002E */ bc1f .L80241960 +/* EEE9A8 802418A8 0280202D */ daddu $a0, $s4, $zero +/* EEE9AC 802418AC 24020001 */ addiu $v0, $zero, 1 +/* EEE9B0 802418B0 AFA20010 */ sw $v0, 0x10($sp) +/* EEE9B4 802418B4 8E460024 */ lw $a2, 0x24($s2) +/* EEE9B8 802418B8 8E470028 */ lw $a3, 0x28($s2) +/* EEE9BC 802418BC 0C013469 */ jal func_8004D1A4 +/* EEE9C0 802418C0 0220282D */ daddu $a1, $s1, $zero +/* EEE9C4 802418C4 10400026 */ beqz $v0, .L80241960 +/* EEE9C8 802418C8 0000202D */ daddu $a0, $zero, $zero +/* EEE9CC 802418CC 0200282D */ daddu $a1, $s0, $zero +/* EEE9D0 802418D0 0000302D */ daddu $a2, $zero, $zero +/* EEE9D4 802418D4 2412000C */ addiu $s2, $zero, 0xc +/* EEE9D8 802418D8 860300A8 */ lh $v1, 0xa8($s0) +/* EEE9DC 802418DC 3C013F80 */ lui $at, 0x3f80 +/* EEE9E0 802418E0 44810000 */ mtc1 $at, $f0 +/* EEE9E4 802418E4 3C014000 */ lui $at, 0x4000 +/* EEE9E8 802418E8 44811000 */ mtc1 $at, $f2 +/* EEE9EC 802418EC 3C01C1A0 */ lui $at, 0xc1a0 +/* EEE9F0 802418F0 44812000 */ mtc1 $at, $f4 +/* EEE9F4 802418F4 44834000 */ mtc1 $v1, $f8 +/* EEE9F8 802418F8 00000000 */ nop +/* EEE9FC 802418FC 46804220 */ cvt.s.w $f8, $f8 +/* EEEA00 80241900 44074000 */ mfc1 $a3, $f8 +/* EEEA04 80241904 27A20038 */ addiu $v0, $sp, 0x38 +/* EEEA08 80241908 AFB2001C */ sw $s2, 0x1c($sp) +/* EEEA0C 8024190C AFA20020 */ sw $v0, 0x20($sp) +/* EEEA10 80241910 E7A00010 */ swc1 $f0, 0x10($sp) +/* EEEA14 80241914 E7A20014 */ swc1 $f2, 0x14($sp) +/* EEEA18 80241918 0C01D444 */ jal func_80075110 +/* EEEA1C 8024191C E7A40018 */ swc1 $f4, 0x18($sp) +/* EEEA20 80241920 0200202D */ daddu $a0, $s0, $zero +/* EEEA24 80241924 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EEEA28 80241928 C480003C */ lwc1 $f0, 0x3c($a0) +/* EEEA2C 8024192C 3C060020 */ lui $a2, 0x20 +/* EEEA30 80241930 0C013600 */ jal func_8004D800 +/* EEEA34 80241934 E4800064 */ swc1 $f0, 0x64($a0) +/* EEEA38 80241938 8E220018 */ lw $v0, 0x18($s1) +/* EEEA3C 8024193C 9442002A */ lhu $v0, 0x2a($v0) +/* EEEA40 80241940 30420001 */ andi $v0, $v0, 1 +/* EEEA44 80241944 10400003 */ beqz $v0, .L80241954 +/* EEEA48 80241948 2402000A */ addiu $v0, $zero, 0xa +/* EEEA4C 8024194C 0809067F */ j .L802419FC +/* EEEA50 80241950 AE620070 */ sw $v0, 0x70($s3) +.L80241954: +/* EEEA54 80241954 0809067F */ j .L802419FC +/* EEEA58 80241958 AE720070 */ sw $s2, 0x70($s3) +.L8024195C: +/* EEEA5C 8024195C AE220090 */ sw $v0, 0x90($s1) +.L80241960: +/* EEEA60 80241960 8602008C */ lh $v0, 0x8c($s0) +/* EEEA64 80241964 14400025 */ bnez $v0, .L802419FC +/* EEEA68 80241968 00000000 */ nop +/* EEEA6C 8024196C 8602008E */ lh $v0, 0x8e($s0) +/* EEEA70 80241970 1C400022 */ bgtz $v0, .L802419FC +/* EEEA74 80241974 00000000 */ nop +/* EEEA78 80241978 8E620074 */ lw $v0, 0x74($s3) +/* EEEA7C 8024197C 2442FFFF */ addiu $v0, $v0, -1 +/* EEEA80 80241980 1840001D */ blez $v0, .L802419F8 +/* EEEA84 80241984 AE620074 */ sw $v0, 0x74($s3) +/* EEEA88 80241988 8E220018 */ lw $v0, 0x18($s1) +/* EEEA8C 8024198C 9442002A */ lhu $v0, 0x2a($v0) +/* EEEA90 80241990 30420010 */ andi $v0, $v0, 0x10 +/* EEEA94 80241994 14400007 */ bnez $v0, .L802419B4 +/* EEEA98 80241998 00000000 */ nop +/* EEEA9C 8024199C C600000C */ lwc1 $f0, 0xc($s0) +/* EEEAA0 802419A0 3C014334 */ lui $at, 0x4334 +/* EEEAA4 802419A4 44816000 */ mtc1 $at, $f12 +/* EEEAA8 802419A8 0C00AB85 */ jal func_8002AE14 +/* EEEAAC 802419AC 460C0300 */ add.s $f12, $f0, $f12 +/* EEEAB0 802419B0 E600000C */ swc1 $f0, 0xc($s0) +.L802419B4: +/* EEEAB4 802419B4 0C00AB3B */ jal func_8002ACEC +/* EEEAB8 802419B8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EEEABC 802419BC 3C032E8B */ lui $v1, 0x2e8b +/* EEEAC0 802419C0 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* EEEAC4 802419C4 00430018 */ mult $v0, $v1 +/* EEEAC8 802419C8 00021FC3 */ sra $v1, $v0, 0x1f +/* EEEACC 802419CC 00004010 */ mfhi $t0 +/* EEEAD0 802419D0 00082043 */ sra $a0, $t0, 1 +/* EEEAD4 802419D4 00832023 */ subu $a0, $a0, $v1 +/* EEEAD8 802419D8 00041840 */ sll $v1, $a0, 1 +/* EEEADC 802419DC 00641821 */ addu $v1, $v1, $a0 +/* EEEAE0 802419E0 00031880 */ sll $v1, $v1, 2 +/* EEEAE4 802419E4 00641823 */ subu $v1, $v1, $a0 +/* EEEAE8 802419E8 00431023 */ subu $v0, $v0, $v1 +/* EEEAEC 802419EC 24420005 */ addiu $v0, $v0, 5 +/* EEEAF0 802419F0 0809067F */ j .L802419FC +/* EEEAF4 802419F4 A602008E */ sh $v0, 0x8e($s0) +.L802419F8: +/* EEEAF8 802419F8 AE600070 */ sw $zero, 0x70($s3) +.L802419FC: +/* EEEAFC 802419FC 8FBF0054 */ lw $ra, 0x54($sp) +/* EEEB00 80241A00 8FB40050 */ lw $s4, 0x50($sp) +/* EEEB04 80241A04 8FB3004C */ lw $s3, 0x4c($sp) +/* EEEB08 80241A08 8FB20048 */ lw $s2, 0x48($sp) +/* EEEB0C 80241A0C 8FB10044 */ lw $s1, 0x44($sp) +/* EEEB10 80241A10 8FB00040 */ lw $s0, 0x40($sp) +/* EEEB14 80241A14 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* EEEB18 80241A18 D7B80068 */ ldc1 $f24, 0x68($sp) +/* EEEB1C 80241A1C D7B60060 */ ldc1 $f22, 0x60($sp) +/* EEEB20 80241A20 D7B40058 */ ldc1 $f20, 0x58($sp) +/* EEEB24 80241A24 03E00008 */ jr $ra +/* EEEB28 80241A28 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/code_EEDF50/func_80241A2C_EEEB2C.s b/asm/nonmatchings/code_EEDF50/func_80241A2C_EEEB2C.s new file mode 100644 index 0000000000..dabbbd895a --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80241A2C_EEEB2C.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A2C_EEEB2C +/* EEEB2C 80241A2C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EEEB30 80241A30 AFB20018 */ sw $s2, 0x18($sp) +/* EEEB34 80241A34 0080902D */ daddu $s2, $a0, $zero +/* EEEB38 80241A38 AFBF001C */ sw $ra, 0x1c($sp) +/* EEEB3C 80241A3C AFB10014 */ sw $s1, 0x14($sp) +/* EEEB40 80241A40 AFB00010 */ sw $s0, 0x10($sp) +/* EEEB44 80241A44 8E510148 */ lw $s1, 0x148($s2) +/* EEEB48 80241A48 0C00F92F */ jal func_8003E4BC +/* EEEB4C 80241A4C 86240008 */ lh $a0, 8($s1) +/* EEEB50 80241A50 0040802D */ daddu $s0, $v0, $zero +/* EEEB54 80241A54 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EEEB58 80241A58 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EEEB5C 80241A5C C60C0038 */ lwc1 $f12, 0x38($s0) +/* EEEB60 80241A60 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EEEB64 80241A64 A600008E */ sh $zero, 0x8e($s0) +/* EEEB68 80241A68 8C460028 */ lw $a2, 0x28($v0) +/* EEEB6C 80241A6C 0C00ABDC */ jal fio_validate_header_checksums +/* EEEB70 80241A70 8C470030 */ lw $a3, 0x30($v0) +/* EEEB74 80241A74 E600000C */ swc1 $f0, 0xc($s0) +/* EEEB78 80241A78 8E2200CC */ lw $v0, 0xcc($s1) +/* EEEB7C 80241A7C 8C420020 */ lw $v0, 0x20($v0) +/* EEEB80 80241A80 AE020028 */ sw $v0, 0x28($s0) +/* EEEB84 80241A84 2402000B */ addiu $v0, $zero, 0xb +/* EEEB88 80241A88 AE420070 */ sw $v0, 0x70($s2) +/* EEEB8C 80241A8C 8FBF001C */ lw $ra, 0x1c($sp) +/* EEEB90 80241A90 8FB20018 */ lw $s2, 0x18($sp) +/* EEEB94 80241A94 8FB10014 */ lw $s1, 0x14($sp) +/* EEEB98 80241A98 8FB00010 */ lw $s0, 0x10($sp) +/* EEEB9C 80241A9C 03E00008 */ jr $ra +/* EEEBA0 80241AA0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EEDF50/func_80241AA4_EEEBA4.s b/asm/nonmatchings/code_EEDF50/func_80241AA4_EEEBA4.s new file mode 100644 index 0000000000..6c1107e485 --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80241AA4_EEEBA4.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AA4_EEEBA4 +/* EEEBA4 80241AA4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EEEBA8 80241AA8 AFB00010 */ sw $s0, 0x10($sp) +/* EEEBAC 80241AAC 0080802D */ daddu $s0, $a0, $zero +/* EEEBB0 80241AB0 AFBF0014 */ sw $ra, 0x14($sp) +/* EEEBB4 80241AB4 8E020148 */ lw $v0, 0x148($s0) +/* EEEBB8 80241AB8 0C00F92F */ jal func_8003E4BC +/* EEEBBC 80241ABC 84440008 */ lh $a0, 8($v0) +/* EEEBC0 80241AC0 9443008E */ lhu $v1, 0x8e($v0) +/* EEEBC4 80241AC4 C440003C */ lwc1 $f0, 0x3c($v0) +/* EEEBC8 80241AC8 24640001 */ addiu $a0, $v1, 1 +/* EEEBCC 80241ACC 00031C00 */ sll $v1, $v1, 0x10 +/* EEEBD0 80241AD0 00031B83 */ sra $v1, $v1, 0xe +/* EEEBD4 80241AD4 A444008E */ sh $a0, 0x8e($v0) +/* EEEBD8 80241AD8 3C018024 */ lui $at, %hi(D_80244070) +/* EEEBDC 80241ADC 00230821 */ addu $at, $at, $v1 +/* EEEBE0 80241AE0 C4224070 */ lwc1 $f2, %lo(D_80244070)($at) +/* EEEBE4 80241AE4 8443008E */ lh $v1, 0x8e($v0) +/* EEEBE8 80241AE8 46020000 */ add.s $f0, $f0, $f2 +/* EEEBEC 80241AEC 28630005 */ slti $v1, $v1, 5 +/* EEEBF0 80241AF0 14600003 */ bnez $v1, .L80241B00 +/* EEEBF4 80241AF4 E440003C */ swc1 $f0, 0x3c($v0) +/* EEEBF8 80241AF8 2402000C */ addiu $v0, $zero, 0xc +/* EEEBFC 80241AFC AE020070 */ sw $v0, 0x70($s0) +.L80241B00: +/* EEEC00 80241B00 8FBF0014 */ lw $ra, 0x14($sp) +/* EEEC04 80241B04 8FB00010 */ lw $s0, 0x10($sp) +/* EEEC08 80241B08 03E00008 */ jr $ra +/* EEEC0C 80241B0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s b/asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s new file mode 100644 index 0000000000..e98b879e11 --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B10_EEEC10 +/* EEEC10 80241B10 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EEEC14 80241B14 AFB3001C */ sw $s3, 0x1c($sp) +/* EEEC18 80241B18 0080982D */ daddu $s3, $a0, $zero +/* EEEC1C 80241B1C AFBF0020 */ sw $ra, 0x20($sp) +/* EEEC20 80241B20 AFB20018 */ sw $s2, 0x18($sp) +/* EEEC24 80241B24 AFB10014 */ sw $s1, 0x14($sp) +/* EEEC28 80241B28 AFB00010 */ sw $s0, 0x10($sp) +/* EEEC2C 80241B2C 8E720148 */ lw $s2, 0x148($s3) +/* EEEC30 80241B30 86440008 */ lh $a0, 8($s2) +/* EEEC34 80241B34 0C00F92F */ jal func_8003E4BC +/* EEEC38 80241B38 00A0802D */ daddu $s0, $a1, $zero +/* EEEC3C 80241B3C 0040882D */ daddu $s1, $v0, $zero +/* EEEC40 80241B40 C6420080 */ lwc1 $f2, 0x80($s2) +/* EEEC44 80241B44 468010A0 */ cvt.s.w $f2, $f2 +/* EEEC48 80241B48 460010A1 */ cvt.d.s $f2, $f2 +/* EEEC4C 80241B4C C6400084 */ lwc1 $f0, 0x84($s2) +/* EEEC50 80241B50 46800020 */ cvt.s.w $f0, $f0 +/* EEEC54 80241B54 46000021 */ cvt.d.s $f0, $f0 +/* EEEC58 80241B58 3C014059 */ lui $at, 0x4059 +/* EEEC5C 80241B5C 44812800 */ mtc1 $at, $f5 +/* EEEC60 80241B60 44802000 */ mtc1 $zero, $f4 +/* EEEC64 80241B64 8E4200CC */ lw $v0, 0xcc($s2) +/* EEEC68 80241B68 C62C0038 */ lwc1 $f12, 0x38($s1) +/* EEEC6C 80241B6C C62E0040 */ lwc1 $f14, 0x40($s1) +/* EEEC70 80241B70 46241083 */ div.d $f2, $f2, $f4 +/* EEEC74 80241B74 462010A0 */ cvt.s.d $f2, $f2 +/* EEEC78 80241B78 46240003 */ div.d $f0, $f0, $f4 +/* EEEC7C 80241B7C 8C420020 */ lw $v0, 0x20($v0) +/* EEEC80 80241B80 46200020 */ cvt.s.d $f0, $f0 +/* EEEC84 80241B84 E622001C */ swc1 $f2, 0x1c($s1) +/* EEEC88 80241B88 E6200014 */ swc1 $f0, 0x14($s1) +/* EEEC8C 80241B8C AE220028 */ sw $v0, 0x28($s1) +/* EEEC90 80241B90 C6000018 */ lwc1 $f0, 0x18($s0) +/* EEEC94 80241B94 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EEEC98 80241B98 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EEEC9C 80241B9C E6200018 */ swc1 $f0, 0x18($s1) +/* EEECA0 80241BA0 8C460028 */ lw $a2, 0x28($v0) +/* EEECA4 80241BA4 0C00ABDC */ jal fio_validate_header_checksums +/* EEECA8 80241BA8 8C470030 */ lw $a3, 0x30($v0) +/* EEECAC 80241BAC E620000C */ swc1 $f0, 0xc($s1) +/* EEECB0 80241BB0 8E420018 */ lw $v0, 0x18($s2) +/* EEECB4 80241BB4 AE400074 */ sw $zero, 0x74($s2) +/* EEECB8 80241BB8 9442002A */ lhu $v0, 0x2a($v0) +/* EEECBC 80241BBC 30420002 */ andi $v0, $v0, 2 +/* EEECC0 80241BC0 10400005 */ beqz $v0, .L80241BD8 +/* EEECC4 80241BC4 24020003 */ addiu $v0, $zero, 3 +/* EEECC8 80241BC8 A622008E */ sh $v0, 0x8e($s1) +/* EEECCC 80241BCC 2402000D */ addiu $v0, $zero, 0xd +/* EEECD0 80241BD0 0809070A */ j .L80241C28 +/* EEECD4 80241BD4 AE620070 */ sw $v0, 0x70($s3) +.L80241BD8: +/* EEECD8 80241BD8 24030001 */ addiu $v1, $zero, 1 +/* EEECDC 80241BDC 2402000E */ addiu $v0, $zero, 0xe +/* EEECE0 80241BE0 A623008E */ sh $v1, 0x8e($s1) +/* EEECE4 80241BE4 AE620070 */ sw $v0, 0x70($s3) +/* EEECE8 80241BE8 C6200038 */ lwc1 $f0, 0x38($s1) +/* EEECEC 80241BEC 4600018D */ trunc.w.s $f6, $f0 +/* EEECF0 80241BF0 44023000 */ mfc1 $v0, $f6 +/* EEECF4 80241BF4 00000000 */ nop +/* EEECF8 80241BF8 A6420010 */ sh $v0, 0x10($s2) +/* EEECFC 80241BFC C620003C */ lwc1 $f0, 0x3c($s1) +/* EEED00 80241C00 4600018D */ trunc.w.s $f6, $f0 +/* EEED04 80241C04 44023000 */ mfc1 $v0, $f6 +/* EEED08 80241C08 00000000 */ nop +/* EEED0C 80241C0C A6420012 */ sh $v0, 0x12($s2) +/* EEED10 80241C10 C6200040 */ lwc1 $f0, 0x40($s1) +/* EEED14 80241C14 A2430007 */ sb $v1, 7($s2) +/* EEED18 80241C18 4600018D */ trunc.w.s $f6, $f0 +/* EEED1C 80241C1C 44023000 */ mfc1 $v0, $f6 +/* EEED20 80241C20 00000000 */ nop +/* EEED24 80241C24 A6420014 */ sh $v0, 0x14($s2) +.L80241C28: +/* EEED28 80241C28 8FBF0020 */ lw $ra, 0x20($sp) +/* EEED2C 80241C2C 8FB3001C */ lw $s3, 0x1c($sp) +/* EEED30 80241C30 8FB20018 */ lw $s2, 0x18($sp) +/* EEED34 80241C34 8FB10014 */ lw $s1, 0x14($sp) +/* EEED38 80241C38 8FB00010 */ lw $s0, 0x10($sp) +/* EEED3C 80241C3C 03E00008 */ jr $ra +/* EEED40 80241C40 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EEDF50/func_80241C44_EEED44.s b/asm/nonmatchings/code_EEDF50/func_80241C44_EEED44.s new file mode 100644 index 0000000000..b119d704e1 --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80241C44_EEED44.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C44_EEED44 +/* EEED44 80241C44 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EEED48 80241C48 AFB00010 */ sw $s0, 0x10($sp) +/* EEED4C 80241C4C 0080802D */ daddu $s0, $a0, $zero +/* EEED50 80241C50 AFBF0014 */ sw $ra, 0x14($sp) +/* EEED54 80241C54 8E020148 */ lw $v0, 0x148($s0) +/* EEED58 80241C58 0C00F92F */ jal func_8003E4BC +/* EEED5C 80241C5C 84440008 */ lh $a0, 8($v0) +/* EEED60 80241C60 0040202D */ daddu $a0, $v0, $zero +/* EEED64 80241C64 8482008E */ lh $v0, 0x8e($a0) +/* EEED68 80241C68 9483008E */ lhu $v1, 0x8e($a0) +/* EEED6C 80241C6C 18400005 */ blez $v0, .L80241C84 +/* EEED70 80241C70 2462FFFF */ addiu $v0, $v1, -1 +/* EEED74 80241C74 A482008E */ sh $v0, 0x8e($a0) +/* EEED78 80241C78 00021400 */ sll $v0, $v0, 0x10 +/* EEED7C 80241C7C 1C400006 */ bgtz $v0, .L80241C98 +/* EEED80 80241C80 00000000 */ nop +.L80241C84: +/* EEED84 80241C84 8482008C */ lh $v0, 0x8c($a0) +/* EEED88 80241C88 14400003 */ bnez $v0, .L80241C98 +/* EEED8C 80241C8C 2402000E */ addiu $v0, $zero, 0xe +/* EEED90 80241C90 A480008E */ sh $zero, 0x8e($a0) +/* EEED94 80241C94 AE020070 */ sw $v0, 0x70($s0) +.L80241C98: +/* EEED98 80241C98 8FBF0014 */ lw $ra, 0x14($sp) +/* EEED9C 80241C9C 8FB00010 */ lw $s0, 0x10($sp) +/* EEEDA0 80241CA0 03E00008 */ jr $ra +/* EEEDA4 80241CA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EEDF50/func_80241CA8_EEEDA8.s b/asm/nonmatchings/code_EEDF50/func_80241CA8_EEEDA8.s new file mode 100644 index 0000000000..bc6dc9901c --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80241CA8_EEEDA8.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CA8_EEEDA8 +/* EEEDA8 80241CA8 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EEEDAC 80241CAC AFB20030 */ sw $s2, 0x30($sp) +/* EEEDB0 80241CB0 0080902D */ daddu $s2, $a0, $zero +/* EEEDB4 80241CB4 AFBF0038 */ sw $ra, 0x38($sp) +/* EEEDB8 80241CB8 AFB30034 */ sw $s3, 0x34($sp) +/* EEEDBC 80241CBC AFB1002C */ sw $s1, 0x2c($sp) +/* EEEDC0 80241CC0 AFB00028 */ sw $s0, 0x28($sp) +/* EEEDC4 80241CC4 F7B60048 */ sdc1 $f22, 0x48($sp) +/* EEEDC8 80241CC8 F7B40040 */ sdc1 $f20, 0x40($sp) +/* EEEDCC 80241CCC 8E510148 */ lw $s1, 0x148($s2) +/* EEEDD0 80241CD0 86240008 */ lh $a0, 8($s1) +/* EEEDD4 80241CD4 0C00F92F */ jal func_8003E4BC +/* EEEDD8 80241CD8 00A0982D */ daddu $s3, $a1, $zero +/* EEEDDC 80241CDC 0040802D */ daddu $s0, $v0, $zero +/* EEEDE0 80241CE0 0200202D */ daddu $a0, $s0, $zero +/* EEEDE4 80241CE4 C6220088 */ lwc1 $f2, 0x88($s1) +/* EEEDE8 80241CE8 468010A0 */ cvt.s.w $f2, $f2 +/* EEEDEC 80241CEC 460010A1 */ cvt.d.s $f2, $f2 +/* EEEDF0 80241CF0 C604001C */ lwc1 $f4, 0x1c($s0) +/* EEEDF4 80241CF4 C6000014 */ lwc1 $f0, 0x14($s0) +/* EEEDF8 80241CF8 8E050018 */ lw $a1, 0x18($s0) +/* EEEDFC 80241CFC 46002100 */ add.s $f4, $f4, $f0 +/* EEEE00 80241D00 8E06000C */ lw $a2, 0xc($s0) +/* EEEE04 80241D04 C6200078 */ lwc1 $f0, 0x78($s1) +/* EEEE08 80241D08 46800020 */ cvt.s.w $f0, $f0 +/* EEEE0C 80241D0C E604001C */ swc1 $f4, 0x1c($s0) +/* EEEE10 80241D10 3C014059 */ lui $at, 0x4059 +/* EEEE14 80241D14 44812800 */ mtc1 $at, $f5 +/* EEEE18 80241D18 44802000 */ mtc1 $zero, $f4 +/* EEEE1C 80241D1C 46000021 */ cvt.d.s $f0, $f0 +/* EEEE20 80241D20 46240003 */ div.d $f0, $f0, $f4 +/* EEEE24 80241D24 46200520 */ cvt.s.d $f20, $f0 +/* EEEE28 80241D28 46241083 */ div.d $f2, $f2, $f4 +/* EEEE2C 80241D2C 0C00F909 */ jal func_8003E424 +/* EEEE30 80241D30 462015A0 */ cvt.s.d $f22, $f2 +/* EEEE34 80241D34 C604001C */ lwc1 $f4, 0x1c($s0) +/* EEEE38 80241D38 44801000 */ mtc1 $zero, $f2 +/* EEEE3C 80241D3C 44801800 */ mtc1 $zero, $f3 +/* EEEE40 80241D40 46002021 */ cvt.d.s $f0, $f4 +/* EEEE44 80241D44 4620103E */ c.le.d $f2, $f0 +/* EEEE48 80241D48 00000000 */ nop +/* EEEE4C 80241D4C 45000030 */ bc1f .L80241E10 +/* EEEE50 80241D50 00000000 */ nop +/* EEEE54 80241D54 C600003C */ lwc1 $f0, 0x3c($s0) +/* EEEE58 80241D58 46040000 */ add.s $f0, $f0, $f4 +/* EEEE5C 80241D5C E600003C */ swc1 $f0, 0x3c($s0) +/* EEEE60 80241D60 8E2200CC */ lw $v0, 0xcc($s1) +/* EEEE64 80241D64 8C420024 */ lw $v0, 0x24($v0) +/* EEEE68 80241D68 AE020028 */ sw $v0, 0x28($s0) +/* EEEE6C 80241D6C A2200007 */ sb $zero, 7($s1) +/* EEEE70 80241D70 8E020000 */ lw $v0, ($s0) +/* EEEE74 80241D74 30420008 */ andi $v0, $v0, 8 +/* EEEE78 80241D78 14400011 */ bnez $v0, .L80241DC0 +/* EEEE7C 80241D7C 0000102D */ daddu $v0, $zero, $zero +/* EEEE80 80241D80 27A50018 */ addiu $a1, $sp, 0x18 +/* EEEE84 80241D84 27A6001C */ addiu $a2, $sp, 0x1c +/* EEEE88 80241D88 C6000038 */ lwc1 $f0, 0x38($s0) +/* EEEE8C 80241D8C C602003C */ lwc1 $f2, 0x3c($s0) +/* EEEE90 80241D90 C6040040 */ lwc1 $f4, 0x40($s0) +/* EEEE94 80241D94 3C01447A */ lui $at, 0x447a +/* EEEE98 80241D98 44813000 */ mtc1 $at, $f6 +/* EEEE9C 80241D9C 27A20024 */ addiu $v0, $sp, 0x24 +/* EEEEA0 80241DA0 E7A00018 */ swc1 $f0, 0x18($sp) +/* EEEEA4 80241DA4 E7A2001C */ swc1 $f2, 0x1c($sp) +/* EEEEA8 80241DA8 E7A40020 */ swc1 $f4, 0x20($sp) +/* EEEEAC 80241DAC E7A60024 */ swc1 $f6, 0x24($sp) +/* EEEEB0 80241DB0 AFA20010 */ sw $v0, 0x10($sp) +/* EEEEB4 80241DB4 8E040080 */ lw $a0, 0x80($s0) +/* EEEEB8 80241DB8 0C03908F */ jal func_800E423C +/* EEEEBC 80241DBC 27A70020 */ addiu $a3, $sp, 0x20 +.L80241DC0: +/* EEEEC0 80241DC0 1040000B */ beqz $v0, .L80241DF0 +/* EEEEC4 80241DC4 00000000 */ nop +/* EEEEC8 80241DC8 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EEEECC 80241DCC 46140080 */ add.s $f2, $f0, $f20 +/* EEEED0 80241DD0 C600003C */ lwc1 $f0, 0x3c($s0) +/* EEEED4 80241DD4 4600103E */ c.le.s $f2, $f0 +/* EEEED8 80241DD8 00000000 */ nop +/* EEEEDC 80241DDC 4500008D */ bc1f .L80242014 +/* EEEEE0 80241DE0 00000000 */ nop +/* EEEEE4 80241DE4 E602003C */ swc1 $f2, 0x3c($s0) +/* EEEEE8 80241DE8 08090805 */ j .L80242014 +/* EEEEEC 80241DEC AE400070 */ sw $zero, 0x70($s2) +.L80241DF0: +/* EEEEF0 80241DF0 C602003C */ lwc1 $f2, 0x3c($s0) +/* EEEEF4 80241DF4 C6000064 */ lwc1 $f0, 0x64($s0) +/* EEEEF8 80241DF8 4602003E */ c.le.s $f0, $f2 +/* EEEEFC 80241DFC 00000000 */ nop +/* EEEF00 80241E00 45030084 */ bc1tl .L80242014 +/* EEEF04 80241E04 AE400070 */ sw $zero, 0x70($s2) +/* EEEF08 80241E08 08090805 */ j .L80242014 +/* EEEF0C 80241E0C 00000000 */ nop +.L80241E10: +/* EEEF10 80241E10 4622003C */ c.lt.d $f0, $f2 +/* EEEF14 80241E14 00000000 */ nop +/* EEEF18 80241E18 4500007E */ bc1f .L80242014 +/* EEEF1C 80241E1C 00000000 */ nop +/* EEEF20 80241E20 9602008E */ lhu $v0, 0x8e($s0) +/* EEEF24 80241E24 24420001 */ addiu $v0, $v0, 1 +/* EEEF28 80241E28 A602008E */ sh $v0, 0x8e($s0) +/* EEEF2C 80241E2C 00021400 */ sll $v0, $v0, 0x10 +/* EEEF30 80241E30 8E630020 */ lw $v1, 0x20($s3) +/* EEEF34 80241E34 00021403 */ sra $v0, $v0, 0x10 +/* EEEF38 80241E38 0043102A */ slt $v0, $v0, $v1 +/* EEEF3C 80241E3C 14400026 */ bnez $v0, .L80241ED8 +/* EEEF40 80241E40 00000000 */ nop +/* EEEF44 80241E44 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EEEF48 80241E48 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EEEF4C 80241E4C 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EEEF50 80241E50 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EEEF54 80241E54 A600008E */ sh $zero, 0x8e($s0) +/* EEEF58 80241E58 8C460028 */ lw $a2, 0x28($v0) +/* EEEF5C 80241E5C 0C00ABDC */ jal fio_validate_header_checksums +/* EEEF60 80241E60 8C470030 */ lw $a3, 0x30($v0) +/* EEEF64 80241E64 46000506 */ mov.s $f20, $f0 +/* EEEF68 80241E68 C60C000C */ lwc1 $f12, 0xc($s0) +/* EEEF6C 80241E6C 0C00ABC6 */ jal func_8002AF18 +/* EEEF70 80241E70 4600A386 */ mov.s $f14, $f20 +/* EEEF74 80241E74 46000086 */ mov.s $f2, $f0 +/* EEEF78 80241E78 8E62001C */ lw $v0, 0x1c($s3) +/* EEEF7C 80241E7C 46001005 */ abs.s $f0, $f2 +/* EEEF80 80241E80 44822000 */ mtc1 $v0, $f4 +/* EEEF84 80241E84 00000000 */ nop +/* EEEF88 80241E88 46802120 */ cvt.s.w $f4, $f4 +/* EEEF8C 80241E8C 4600203C */ c.lt.s $f4, $f0 +/* EEEF90 80241E90 00000000 */ nop +/* EEEF94 80241E94 4500000D */ bc1f .L80241ECC +/* EEEF98 80241E98 00000000 */ nop +/* EEEF9C 80241E9C 44800000 */ mtc1 $zero, $f0 +/* EEEFA0 80241EA0 C614000C */ lwc1 $f20, 0xc($s0) +/* EEEFA4 80241EA4 4600103C */ c.lt.s $f2, $f0 +/* EEEFA8 80241EA8 00000000 */ nop +/* EEEFAC 80241EAC 45000006 */ bc1f .L80241EC8 +/* EEEFB0 80241EB0 00021023 */ negu $v0, $v0 +/* EEEFB4 80241EB4 44820000 */ mtc1 $v0, $f0 +/* EEEFB8 80241EB8 00000000 */ nop +/* EEEFBC 80241EBC 46800020 */ cvt.s.w $f0, $f0 +/* EEEFC0 80241EC0 080907B3 */ j .L80241ECC +/* EEEFC4 80241EC4 4600A500 */ add.s $f20, $f20, $f0 +.L80241EC8: +/* EEEFC8 80241EC8 4604A500 */ add.s $f20, $f20, $f4 +.L80241ECC: +/* EEEFCC 80241ECC 0C00AB85 */ jal func_8002AE14 +/* EEEFD0 80241ED0 4600A306 */ mov.s $f12, $f20 +/* EEEFD4 80241ED4 E600000C */ swc1 $f0, 0xc($s0) +.L80241ED8: +/* EEEFD8 80241ED8 8E020000 */ lw $v0, ($s0) +/* EEEFDC 80241EDC 30420008 */ andi $v0, $v0, 8 +/* EEEFE0 80241EE0 1040000A */ beqz $v0, .L80241F0C +/* EEEFE4 80241EE4 27A50018 */ addiu $a1, $sp, 0x18 +/* EEEFE8 80241EE8 C602003C */ lwc1 $f2, 0x3c($s0) +/* EEEFEC 80241EEC C600001C */ lwc1 $f0, 0x1c($s0) +/* EEEFF0 80241EF0 46001080 */ add.s $f2, $f2, $f0 +/* EEEFF4 80241EF4 4616103C */ c.lt.s $f2, $f22 +/* EEEFF8 80241EF8 00000000 */ nop +/* EEEFFC 80241EFC 45020045 */ bc1fl .L80242014 +/* EEF000 80241F00 E602003C */ swc1 $f2, 0x3c($s0) +/* EEF004 80241F04 08090804 */ j .L80242010 +/* EEF008 80241F08 E616003C */ swc1 $f22, 0x3c($s0) +.L80241F0C: +/* EEF00C 80241F0C C6000038 */ lwc1 $f0, 0x38($s0) +/* EEF010 80241F10 27A6001C */ addiu $a2, $sp, 0x1c +/* EEF014 80241F14 E7A00018 */ swc1 $f0, 0x18($sp) +/* EEF018 80241F18 860200A8 */ lh $v0, 0xa8($s0) +/* EEF01C 80241F1C C600001C */ lwc1 $f0, 0x1c($s0) +/* EEF020 80241F20 C604003C */ lwc1 $f4, 0x3c($s0) +/* EEF024 80241F24 44821000 */ mtc1 $v0, $f2 +/* EEF028 80241F28 00000000 */ nop +/* EEF02C 80241F2C 468010A0 */ cvt.s.w $f2, $f2 +/* EEF030 80241F30 46000005 */ abs.s $f0, $f0 +/* EEF034 80241F34 46020000 */ add.s $f0, $f0, $f2 +/* EEF038 80241F38 C6060040 */ lwc1 $f6, 0x40($s0) +/* EEF03C 80241F3C 27A20024 */ addiu $v0, $sp, 0x24 +/* EEF040 80241F40 46022100 */ add.s $f4, $f4, $f2 +/* EEF044 80241F44 3C014024 */ lui $at, 0x4024 +/* EEF048 80241F48 44811800 */ mtc1 $at, $f3 +/* EEF04C 80241F4C 44801000 */ mtc1 $zero, $f2 +/* EEF050 80241F50 46000021 */ cvt.d.s $f0, $f0 +/* EEF054 80241F54 46220000 */ add.d $f0, $f0, $f2 +/* EEF058 80241F58 E7A60020 */ swc1 $f6, 0x20($sp) +/* EEF05C 80241F5C E7A4001C */ swc1 $f4, 0x1c($sp) +/* EEF060 80241F60 46200020 */ cvt.s.d $f0, $f0 +/* EEF064 80241F64 E7A00024 */ swc1 $f0, 0x24($sp) +/* EEF068 80241F68 AFA20010 */ sw $v0, 0x10($sp) +/* EEF06C 80241F6C 8E040080 */ lw $a0, 0x80($s0) +/* EEF070 80241F70 0C03908F */ jal func_800E423C +/* EEF074 80241F74 27A70020 */ addiu $a3, $sp, 0x20 +/* EEF078 80241F78 10400015 */ beqz $v0, .L80241FD0 +/* EEF07C 80241F7C 00000000 */ nop +/* EEF080 80241F80 860200A8 */ lh $v0, 0xa8($s0) +/* EEF084 80241F84 C604001C */ lwc1 $f4, 0x1c($s0) +/* EEF088 80241F88 44820000 */ mtc1 $v0, $f0 +/* EEF08C 80241F8C 00000000 */ nop +/* EEF090 80241F90 46800020 */ cvt.s.w $f0, $f0 +/* EEF094 80241F94 46002085 */ abs.s $f2, $f4 +/* EEF098 80241F98 46020000 */ add.s $f0, $f0, $f2 +/* EEF09C 80241F9C C7A20024 */ lwc1 $f2, 0x24($sp) +/* EEF0A0 80241FA0 4600103E */ c.le.s $f2, $f0 +/* EEF0A4 80241FA4 00000000 */ nop +/* EEF0A8 80241FA8 45000005 */ bc1f .L80241FC0 +/* EEF0AC 80241FAC 00000000 */ nop +/* EEF0B0 80241FB0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EEF0B4 80241FB4 AE00001C */ sw $zero, 0x1c($s0) +/* EEF0B8 80241FB8 08090805 */ j .L80242014 +/* EEF0BC 80241FBC E600003C */ swc1 $f0, 0x3c($s0) +.L80241FC0: +/* EEF0C0 80241FC0 C600003C */ lwc1 $f0, 0x3c($s0) +/* EEF0C4 80241FC4 46040000 */ add.s $f0, $f0, $f4 +/* EEF0C8 80241FC8 08090805 */ j .L80242014 +/* EEF0CC 80241FCC E600003C */ swc1 $f0, 0x3c($s0) +.L80241FD0: +/* EEF0D0 80241FD0 C606003C */ lwc1 $f6, 0x3c($s0) +/* EEF0D4 80241FD4 860200A8 */ lh $v0, 0xa8($s0) +/* EEF0D8 80241FD8 46163081 */ sub.s $f2, $f6, $f22 +/* EEF0DC 80241FDC 44820000 */ mtc1 $v0, $f0 +/* EEF0E0 80241FE0 00000000 */ nop +/* EEF0E4 80241FE4 46800020 */ cvt.s.w $f0, $f0 +/* EEF0E8 80241FE8 46001080 */ add.s $f2, $f2, $f0 +/* EEF0EC 80241FEC C604001C */ lwc1 $f4, 0x1c($s0) +/* EEF0F0 80241FF0 46002005 */ abs.s $f0, $f4 +/* EEF0F4 80241FF4 4602003C */ c.lt.s $f0, $f2 +/* EEF0F8 80241FF8 00000000 */ nop +/* EEF0FC 80241FFC 45020005 */ bc1fl .L80242014 +/* EEF100 80242000 AE00001C */ sw $zero, 0x1c($s0) +/* EEF104 80242004 46043000 */ add.s $f0, $f6, $f4 +/* EEF108 80242008 08090805 */ j .L80242014 +/* EEF10C 8024200C E600003C */ swc1 $f0, 0x3c($s0) +.L80242010: +/* EEF110 80242010 AE00001C */ sw $zero, 0x1c($s0) +.L80242014: +/* EEF114 80242014 8FBF0038 */ lw $ra, 0x38($sp) +/* EEF118 80242018 8FB30034 */ lw $s3, 0x34($sp) +/* EEF11C 8024201C 8FB20030 */ lw $s2, 0x30($sp) +/* EEF120 80242020 8FB1002C */ lw $s1, 0x2c($sp) +/* EEF124 80242024 8FB00028 */ lw $s0, 0x28($sp) +/* EEF128 80242028 D7B60048 */ ldc1 $f22, 0x48($sp) +/* EEF12C 8024202C D7B40040 */ ldc1 $f20, 0x40($sp) +/* EEF130 80242030 03E00008 */ jr $ra +/* EEF134 80242034 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EEDF50/func_80242038_EEF138.s b/asm/nonmatchings/code_EEDF50/func_80242038_EEF138.s new file mode 100644 index 0000000000..fd4d73f136 --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80242038_EEF138.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242038_EEF138 +/* EEF138 80242038 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EEF13C 8024203C AFB00028 */ sw $s0, 0x28($sp) +/* EEF140 80242040 00A0802D */ daddu $s0, $a1, $zero +/* EEF144 80242044 AFB1002C */ sw $s1, 0x2c($sp) +/* EEF148 80242048 00C0882D */ daddu $s1, $a2, $zero +/* EEF14C 8024204C AFBF0034 */ sw $ra, 0x34($sp) +/* EEF150 80242050 AFB20030 */ sw $s2, 0x30($sp) +/* EEF154 80242054 AE200070 */ sw $zero, 0x70($s1) +/* EEF158 80242058 8C830000 */ lw $v1, ($a0) +/* EEF15C 8024205C 2402FDFF */ addiu $v0, $zero, -0x201 +/* EEF160 80242060 A480008E */ sh $zero, 0x8e($a0) +/* EEF164 80242064 00621824 */ and $v1, $v1, $v0 +/* EEF168 80242068 34650800 */ ori $a1, $v1, 0x800 +/* EEF16C 8024206C AC850000 */ sw $a1, ($a0) +/* EEF170 80242070 8E0200D0 */ lw $v0, 0xd0($s0) +/* EEF174 80242074 8C420034 */ lw $v0, 0x34($v0) +/* EEF178 80242078 10400003 */ beqz $v0, .L80242088 +/* EEF17C 8024207C 00E0902D */ daddu $s2, $a3, $zero +/* EEF180 80242080 08090824 */ j .L80242090 +/* EEF184 80242084 34620808 */ ori $v0, $v1, 0x808 +.L80242088: +/* EEF188 80242088 2402FFF7 */ addiu $v0, $zero, -9 +/* EEF18C 8024208C 00A21024 */ and $v0, $a1, $v0 +.L80242090: +/* EEF190 80242090 AC820000 */ sw $v0, ($a0) +/* EEF194 80242094 27A20024 */ addiu $v0, $sp, 0x24 +/* EEF198 80242098 27A50018 */ addiu $a1, $sp, 0x18 +/* EEF19C 8024209C C4800038 */ lwc1 $f0, 0x38($a0) +/* EEF1A0 802420A0 C482003C */ lwc1 $f2, 0x3c($a0) +/* EEF1A4 802420A4 C4840040 */ lwc1 $f4, 0x40($a0) +/* EEF1A8 802420A8 3C01447A */ lui $at, 0x447a +/* EEF1AC 802420AC 44813000 */ mtc1 $at, $f6 +/* EEF1B0 802420B0 27A6001C */ addiu $a2, $sp, 0x1c +/* EEF1B4 802420B4 E7A00018 */ swc1 $f0, 0x18($sp) +/* EEF1B8 802420B8 E7A2001C */ swc1 $f2, 0x1c($sp) +/* EEF1BC 802420BC E7A40020 */ swc1 $f4, 0x20($sp) +/* EEF1C0 802420C0 E7A60024 */ swc1 $f6, 0x24($sp) +/* EEF1C4 802420C4 AFA20010 */ sw $v0, 0x10($sp) +/* EEF1C8 802420C8 8C840080 */ lw $a0, 0x80($a0) +/* EEF1CC 802420CC 0C03908F */ jal func_800E423C +/* EEF1D0 802420D0 27A70020 */ addiu $a3, $sp, 0x20 +/* EEF1D4 802420D4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* EEF1D8 802420D8 3C014059 */ lui $at, 0x4059 +/* EEF1DC 802420DC 44812800 */ mtc1 $at, $f5 +/* EEF1E0 802420E0 44802000 */ mtc1 $zero, $f4 +/* EEF1E4 802420E4 460010A1 */ cvt.d.s $f2, $f2 +/* EEF1E8 802420E8 46241082 */ mul.d $f2, $f2, $f4 +/* EEF1EC 802420EC 00000000 */ nop +/* EEF1F0 802420F0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EEF1F4 802420F4 46000021 */ cvt.d.s $f0, $f0 +/* EEF1F8 802420F8 46240002 */ mul.d $f0, $f0, $f4 +/* EEF1FC 802420FC 00000000 */ nop +/* EEF200 80242100 3C013FE0 */ lui $at, 0x3fe0 +/* EEF204 80242104 44812800 */ mtc1 $at, $f5 +/* EEF208 80242108 44802000 */ mtc1 $zero, $f4 +/* EEF20C 8024210C 00000000 */ nop +/* EEF210 80242110 46241080 */ add.d $f2, $f2, $f4 +/* EEF214 80242114 AE000074 */ sw $zero, 0x74($s0) +/* EEF218 80242118 46240000 */ add.d $f0, $f0, $f4 +/* EEF21C 8024211C AE000090 */ sw $zero, 0x90($s0) +/* EEF220 80242120 4620120D */ trunc.w.d $f8, $f2 +/* EEF224 80242124 E6080078 */ swc1 $f8, 0x78($s0) +/* EEF228 80242128 4620020D */ trunc.w.d $f8, $f0 +/* EEF22C 8024212C E6080088 */ swc1 $f8, 0x88($s0) +/* EEF230 80242130 8E420014 */ lw $v0, 0x14($s2) +/* EEF234 80242134 AE220074 */ sw $v0, 0x74($s1) +/* EEF238 80242138 8E0200B0 */ lw $v0, 0xb0($s0) +/* EEF23C 8024213C 34420010 */ ori $v0, $v0, 0x10 +/* EEF240 80242140 AE0200B0 */ sw $v0, 0xb0($s0) +/* EEF244 80242144 8FBF0034 */ lw $ra, 0x34($sp) +/* EEF248 80242148 8FB20030 */ lw $s2, 0x30($sp) +/* EEF24C 8024214C 8FB1002C */ lw $s1, 0x2c($sp) +/* EEF250 80242150 8FB00028 */ lw $s0, 0x28($sp) +/* EEF254 80242154 03E00008 */ jr $ra +/* EEF258 80242158 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s b/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s new file mode 100644 index 0000000000..47e208c36a --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024215C_EEF25C +/* EEF25C 8024215C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EEF260 80242160 AFB50044 */ sw $s5, 0x44($sp) +/* EEF264 80242164 0080A82D */ daddu $s5, $a0, $zero +/* EEF268 80242168 AFBF0048 */ sw $ra, 0x48($sp) +/* EEF26C 8024216C AFB40040 */ sw $s4, 0x40($sp) +/* EEF270 80242170 AFB3003C */ sw $s3, 0x3c($sp) +/* EEF274 80242174 AFB20038 */ sw $s2, 0x38($sp) +/* EEF278 80242178 AFB10034 */ sw $s1, 0x34($sp) +/* EEF27C 8024217C AFB00030 */ sw $s0, 0x30($sp) +/* EEF280 80242180 8EB20148 */ lw $s2, 0x148($s5) +/* EEF284 80242184 86440008 */ lh $a0, 8($s2) +/* EEF288 80242188 8EB0000C */ lw $s0, 0xc($s5) +/* EEF28C 8024218C 0C00F92F */ jal func_8003E4BC +/* EEF290 80242190 00A0882D */ daddu $s1, $a1, $zero +/* EEF294 80242194 02A0202D */ daddu $a0, $s5, $zero +/* EEF298 80242198 8E050000 */ lw $a1, ($s0) +/* EEF29C 8024219C 0C0B53A3 */ jal func_802D4E8C +/* EEF2A0 802421A0 0040A02D */ daddu $s4, $v0, $zero +/* EEF2A4 802421A4 AFA00010 */ sw $zero, 0x10($sp) +/* EEF2A8 802421A8 8E4300D0 */ lw $v1, 0xd0($s2) +/* EEF2AC 802421AC 8C630030 */ lw $v1, 0x30($v1) +/* EEF2B0 802421B0 AFA30014 */ sw $v1, 0x14($sp) +/* EEF2B4 802421B4 8E4300D0 */ lw $v1, 0xd0($s2) +/* EEF2B8 802421B8 8C63001C */ lw $v1, 0x1c($v1) +/* EEF2BC 802421BC AFA30018 */ sw $v1, 0x18($sp) +/* EEF2C0 802421C0 8E4300D0 */ lw $v1, 0xd0($s2) +/* EEF2C4 802421C4 8C630024 */ lw $v1, 0x24($v1) +/* EEF2C8 802421C8 AFA3001C */ sw $v1, 0x1c($sp) +/* EEF2CC 802421CC 8E4300D0 */ lw $v1, 0xd0($s2) +/* EEF2D0 802421D0 8C630028 */ lw $v1, 0x28($v1) +/* EEF2D4 802421D4 AFA30020 */ sw $v1, 0x20($sp) +/* EEF2D8 802421D8 8E4300D0 */ lw $v1, 0xd0($s2) +/* EEF2DC 802421DC 3C0142F0 */ lui $at, 0x42f0 +/* EEF2E0 802421E0 44810000 */ mtc1 $at, $f0 +/* EEF2E4 802421E4 8C63002C */ lw $v1, 0x2c($v1) +/* EEF2E8 802421E8 E7A00028 */ swc1 $f0, 0x28($sp) +/* EEF2EC 802421EC A7A0002C */ sh $zero, 0x2c($sp) +/* EEF2F0 802421F0 AFA30024 */ sw $v1, 0x24($sp) +/* EEF2F4 802421F4 C6800038 */ lwc1 $f0, 0x38($s4) +/* EEF2F8 802421F8 E6400108 */ swc1 $f0, 0x108($s2) +/* EEF2FC 802421FC C680003C */ lwc1 $f0, 0x3c($s4) +/* EEF300 80242200 27B30010 */ addiu $s3, $sp, 0x10 +/* EEF304 80242204 E640010C */ swc1 $f0, 0x10c($s2) +/* EEF308 80242208 3C0138D1 */ lui $at, 0x38d1 +/* EEF30C 8024220C 3421B717 */ ori $at, $at, 0xb717 +/* EEF310 80242210 44810000 */ mtc1 $at, $f0 +/* EEF314 80242214 C6820040 */ lwc1 $f2, 0x40($s4) +/* EEF318 80242218 0040802D */ daddu $s0, $v0, $zero +/* EEF31C 8024221C E6400114 */ swc1 $f0, 0x114($s2) +/* EEF320 80242220 E6400118 */ swc1 $f0, 0x118($s2) +/* EEF324 80242224 12200006 */ beqz $s1, .L80242240 +/* EEF328 80242228 E6420110 */ swc1 $f2, 0x110($s2) +/* EEF32C 8024222C 0280202D */ daddu $a0, $s4, $zero +/* EEF330 80242230 0240282D */ daddu $a1, $s2, $zero +/* EEF334 80242234 02A0302D */ daddu $a2, $s5, $zero +/* EEF338 80242238 0C09080E */ jal func_80242038_EEF138 +/* EEF33C 8024223C 0200382D */ daddu $a3, $s0, $zero +.L80242240: +/* EEF340 80242240 2402FFFE */ addiu $v0, $zero, -2 +/* EEF344 80242244 A28200AB */ sb $v0, 0xab($s4) +/* EEF348 80242248 8E4300B0 */ lw $v1, 0xb0($s2) +/* EEF34C 8024224C 30620004 */ andi $v0, $v1, 4 +/* EEF350 80242250 10400007 */ beqz $v0, .L80242270 +/* EEF354 80242254 00000000 */ nop +/* EEF358 80242258 824200B4 */ lb $v0, 0xb4($s2) +/* EEF35C 8024225C 1440003C */ bnez $v0, .L80242350 +/* EEF360 80242260 0000102D */ daddu $v0, $zero, $zero +/* EEF364 80242264 2402FFFB */ addiu $v0, $zero, -5 +/* EEF368 80242268 00621024 */ and $v0, $v1, $v0 +/* EEF36C 8024226C AE4200B0 */ sw $v0, 0xb0($s2) +.L80242270: +/* EEF370 80242270 8EA30070 */ lw $v1, 0x70($s5) +/* EEF374 80242274 2C62000F */ sltiu $v0, $v1, 0xf +/* EEF378 80242278 10400034 */ beqz $v0, .L8024234C +/* EEF37C 8024227C 00031080 */ sll $v0, $v1, 2 +/* EEF380 80242280 3C018024 */ lui $at, %hi(D_80245468) +/* EEF384 80242284 00220821 */ addu $at, $at, $v0 +/* EEF388 80242288 8C225468 */ lw $v0, %lo(D_80245468)($at) +/* EEF38C 8024228C 00400008 */ jr $v0 +/* EEF390 80242290 00000000 */ nop +/* EEF394 80242294 02A0202D */ daddu $a0, $s5, $zero +/* EEF398 80242298 0200282D */ daddu $a1, $s0, $zero +/* EEF39C 8024229C 0C090394 */ jal func_80240E50_EEDF50 +/* EEF3A0 802422A0 0260302D */ daddu $a2, $s3, $zero +/* EEF3A4 802422A4 02A0202D */ daddu $a0, $s5, $zero +/* EEF3A8 802422A8 0200282D */ daddu $a1, $s0, $zero +/* EEF3AC 802422AC 0C090400 */ jal func_80241000_EEE100 +/* EEF3B0 802422B0 0260302D */ daddu $a2, $s3, $zero +/* EEF3B4 802422B4 080908D4 */ j .L80242350 +/* EEF3B8 802422B8 0000102D */ daddu $v0, $zero, $zero +/* EEF3BC 802422BC 02A0202D */ daddu $a0, $s5, $zero +/* EEF3C0 802422C0 0200282D */ daddu $a1, $s0, $zero +/* EEF3C4 802422C4 0C09058A */ jal func_80241628_EEE728 +/* EEF3C8 802422C8 0260302D */ daddu $a2, $s3, $zero +/* EEF3CC 802422CC 02A0202D */ daddu $a0, $s5, $zero +/* EEF3D0 802422D0 0200282D */ daddu $a1, $s0, $zero +/* EEF3D4 802422D4 0C0905BA */ jal func_802416E8_EEE7E8 +/* EEF3D8 802422D8 0260302D */ daddu $a2, $s3, $zero +/* EEF3DC 802422DC 080908D4 */ j .L80242350 +/* EEF3E0 802422E0 0000102D */ daddu $v0, $zero, $zero +/* EEF3E4 802422E4 02A0202D */ daddu $a0, $s5, $zero +/* EEF3E8 802422E8 0200282D */ daddu $a1, $s0, $zero +/* EEF3EC 802422EC 0C09068B */ jal func_80241A2C_EEEB2C +/* EEF3F0 802422F0 0260302D */ daddu $a2, $s3, $zero +/* EEF3F4 802422F4 02A0202D */ daddu $a0, $s5, $zero +/* EEF3F8 802422F8 0200282D */ daddu $a1, $s0, $zero +/* EEF3FC 802422FC 0C0906A9 */ jal func_80241AA4_EEEBA4 +/* EEF400 80242300 0260302D */ daddu $a2, $s3, $zero +/* EEF404 80242304 080908D4 */ j .L80242350 +/* EEF408 80242308 0000102D */ daddu $v0, $zero, $zero +/* EEF40C 8024230C 02A0202D */ daddu $a0, $s5, $zero +/* EEF410 80242310 0200282D */ daddu $a1, $s0, $zero +/* EEF414 80242314 0C0906C4 */ jal func_80241B10_EEEC10 +/* EEF418 80242318 0260302D */ daddu $a2, $s3, $zero +/* EEF41C 8024231C 080908D4 */ j .L80242350 +/* EEF420 80242320 0000102D */ daddu $v0, $zero, $zero +/* EEF424 80242324 02A0202D */ daddu $a0, $s5, $zero +/* EEF428 80242328 0200282D */ daddu $a1, $s0, $zero +/* EEF42C 8024232C 0C090711 */ jal func_80241C44_EEED44 +/* EEF430 80242330 0260302D */ daddu $a2, $s3, $zero +/* EEF434 80242334 080908D4 */ j .L80242350 +/* EEF438 80242338 0000102D */ daddu $v0, $zero, $zero +/* EEF43C 8024233C 02A0202D */ daddu $a0, $s5, $zero +/* EEF440 80242340 0200282D */ daddu $a1, $s0, $zero +/* EEF444 80242344 0C09072A */ jal func_80241CA8_EEEDA8 +/* EEF448 80242348 0260302D */ daddu $a2, $s3, $zero +.L8024234C: +/* EEF44C 8024234C 0000102D */ daddu $v0, $zero, $zero +.L80242350: +/* EEF450 80242350 8FBF0048 */ lw $ra, 0x48($sp) +/* EEF454 80242354 8FB50044 */ lw $s5, 0x44($sp) +/* EEF458 80242358 8FB40040 */ lw $s4, 0x40($sp) +/* EEF45C 8024235C 8FB3003C */ lw $s3, 0x3c($sp) +/* EEF460 80242360 8FB20038 */ lw $s2, 0x38($sp) +/* EEF464 80242364 8FB10034 */ lw $s1, 0x34($sp) +/* EEF468 80242368 8FB00030 */ lw $s0, 0x30($sp) +/* EEF46C 8024236C 03E00008 */ jr $ra +/* EEF470 80242370 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EEDF50/func_80242374_EEF474.s b/asm/nonmatchings/code_EEDF50/func_80242374_EEF474.s new file mode 100644 index 0000000000..db2716e46a --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80242374_EEF474.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242374_EEF474 +/* EEF474 80242374 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EEF478 80242378 AFB3001C */ sw $s3, 0x1c($sp) +/* EEF47C 8024237C 0080982D */ daddu $s3, $a0, $zero +/* EEF480 80242380 AFBF0020 */ sw $ra, 0x20($sp) +/* EEF484 80242384 AFB20018 */ sw $s2, 0x18($sp) +/* EEF488 80242388 AFB10014 */ sw $s1, 0x14($sp) +/* EEF48C 8024238C AFB00010 */ sw $s0, 0x10($sp) +/* EEF490 80242390 F7B40028 */ sdc1 $f20, 0x28($sp) +/* EEF494 80242394 8E710148 */ lw $s1, 0x148($s3) +/* EEF498 80242398 86240008 */ lh $a0, 8($s1) +/* EEF49C 8024239C 0C00F92F */ jal func_8003E4BC +/* EEF4A0 802423A0 00A0802D */ daddu $s0, $a1, $zero +/* EEF4A4 802423A4 8E040020 */ lw $a0, 0x20($s0) +/* EEF4A8 802423A8 0040902D */ daddu $s2, $v0, $zero +/* EEF4AC 802423AC 00041FC2 */ srl $v1, $a0, 0x1f +/* EEF4B0 802423B0 00832021 */ addu $a0, $a0, $v1 +/* EEF4B4 802423B4 00042043 */ sra $a0, $a0, 1 +/* EEF4B8 802423B8 0C00AB3B */ jal func_8002ACEC +/* EEF4BC 802423BC 24840001 */ addiu $a0, $a0, 1 +/* EEF4C0 802423C0 8E030020 */ lw $v1, 0x20($s0) +/* EEF4C4 802423C4 C64C0038 */ lwc1 $f12, 0x38($s2) +/* EEF4C8 802423C8 000327C2 */ srl $a0, $v1, 0x1f +/* EEF4CC 802423CC 00641821 */ addu $v1, $v1, $a0 +/* EEF4D0 802423D0 00031843 */ sra $v1, $v1, 1 +/* EEF4D4 802423D4 00621821 */ addu $v1, $v1, $v0 +/* EEF4D8 802423D8 A643008E */ sh $v1, 0x8e($s2) +/* EEF4DC 802423DC 8E2200CC */ lw $v0, 0xcc($s1) +/* EEF4E0 802423E0 C64E0040 */ lwc1 $f14, 0x40($s2) +/* EEF4E4 802423E4 8C42000C */ lw $v0, 0xc($v0) +/* EEF4E8 802423E8 AE420028 */ sw $v0, 0x28($s2) +/* EEF4EC 802423EC C6000018 */ lwc1 $f0, 0x18($s0) +/* EEF4F0 802423F0 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EEF4F4 802423F4 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EEF4F8 802423F8 E6400018 */ swc1 $f0, 0x18($s2) +/* EEF4FC 802423FC 8C460028 */ lw $a2, 0x28($v0) +/* EEF500 80242400 0C00ABDC */ jal fio_validate_header_checksums +/* EEF504 80242404 8C470030 */ lw $a3, 0x30($v0) +/* EEF508 80242408 46000506 */ mov.s $f20, $f0 +/* EEF50C 8024240C C64C000C */ lwc1 $f12, 0xc($s2) +/* EEF510 80242410 0C00ABC6 */ jal func_8002AF18 +/* EEF514 80242414 4600A386 */ mov.s $f14, $f20 +/* EEF518 80242418 46000086 */ mov.s $f2, $f0 +/* EEF51C 8024241C 8E02001C */ lw $v0, 0x1c($s0) +/* EEF520 80242420 46001005 */ abs.s $f0, $f2 +/* EEF524 80242424 44822000 */ mtc1 $v0, $f4 +/* EEF528 80242428 00000000 */ nop +/* EEF52C 8024242C 46802120 */ cvt.s.w $f4, $f4 +/* EEF530 80242430 4600203C */ c.lt.s $f4, $f0 +/* EEF534 80242434 00000000 */ nop +/* EEF538 80242438 4500000D */ bc1f .L80242470 +/* EEF53C 8024243C 00000000 */ nop +/* EEF540 80242440 44800000 */ mtc1 $zero, $f0 +/* EEF544 80242444 C654000C */ lwc1 $f20, 0xc($s2) +/* EEF548 80242448 4600103C */ c.lt.s $f2, $f0 +/* EEF54C 8024244C 00000000 */ nop +/* EEF550 80242450 45000006 */ bc1f .L8024246C +/* EEF554 80242454 00021023 */ negu $v0, $v0 +/* EEF558 80242458 44820000 */ mtc1 $v0, $f0 +/* EEF55C 8024245C 00000000 */ nop +/* EEF560 80242460 46800020 */ cvt.s.w $f0, $f0 +/* EEF564 80242464 0809091C */ j .L80242470 +/* EEF568 80242468 4600A500 */ add.s $f20, $f20, $f0 +.L8024246C: +/* EEF56C 8024246C 4604A500 */ add.s $f20, $f20, $f4 +.L80242470: +/* EEF570 80242470 0C00AB85 */ jal func_8002AE14 +/* EEF574 80242474 4600A306 */ mov.s $f12, $f20 +/* EEF578 80242478 2402000D */ addiu $v0, $zero, 0xd +/* EEF57C 8024247C E640000C */ swc1 $f0, 0xc($s2) +/* EEF580 80242480 AE620070 */ sw $v0, 0x70($s3) +/* EEF584 80242484 8FBF0020 */ lw $ra, 0x20($sp) +/* EEF588 80242488 8FB3001C */ lw $s3, 0x1c($sp) +/* EEF58C 8024248C 8FB20018 */ lw $s2, 0x18($sp) +/* EEF590 80242490 8FB10014 */ lw $s1, 0x14($sp) +/* EEF594 80242494 8FB00010 */ lw $s0, 0x10($sp) +/* EEF598 80242498 D7B40028 */ ldc1 $f20, 0x28($sp) +/* EEF59C 8024249C 03E00008 */ jr $ra +/* EEF5A0 802424A0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EEDF50/func_802424A4_EEF5A4.s b/asm/nonmatchings/code_EEDF50/func_802424A4_EEF5A4.s new file mode 100644 index 0000000000..bdb552b586 --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_802424A4_EEF5A4.s @@ -0,0 +1,172 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424A4_EEF5A4 +/* EEF5A4 802424A4 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* EEF5A8 802424A8 AFB3004C */ sw $s3, 0x4c($sp) +/* EEF5AC 802424AC 0080982D */ daddu $s3, $a0, $zero +/* EEF5B0 802424B0 AFBF0050 */ sw $ra, 0x50($sp) +/* EEF5B4 802424B4 AFB20048 */ sw $s2, 0x48($sp) +/* EEF5B8 802424B8 AFB10044 */ sw $s1, 0x44($sp) +/* EEF5BC 802424BC AFB00040 */ sw $s0, 0x40($sp) +/* EEF5C0 802424C0 8E720148 */ lw $s2, 0x148($s3) +/* EEF5C4 802424C4 00A0882D */ daddu $s1, $a1, $zero +/* EEF5C8 802424C8 86440008 */ lh $a0, 8($s2) +/* EEF5CC 802424CC 0C00F92F */ jal func_8003E4BC +/* EEF5D0 802424D0 00C0802D */ daddu $s0, $a2, $zero +/* EEF5D4 802424D4 0200202D */ daddu $a0, $s0, $zero +/* EEF5D8 802424D8 0240282D */ daddu $a1, $s2, $zero +/* EEF5DC 802424DC 24030001 */ addiu $v1, $zero, 1 +/* EEF5E0 802424E0 AFA30010 */ sw $v1, 0x10($sp) +/* EEF5E4 802424E4 8E260024 */ lw $a2, 0x24($s1) +/* EEF5E8 802424E8 8E270028 */ lw $a3, 0x28($s1) +/* EEF5EC 802424EC 0C013469 */ jal func_8004D1A4 +/* EEF5F0 802424F0 0040802D */ daddu $s0, $v0, $zero +/* EEF5F4 802424F4 14400020 */ bnez $v0, .L80242578 +/* EEF5F8 802424F8 24040002 */ addiu $a0, $zero, 2 +/* EEF5FC 802424FC 0200282D */ daddu $a1, $s0, $zero +/* EEF600 80242500 0000302D */ daddu $a2, $zero, $zero +/* EEF604 80242504 860300A8 */ lh $v1, 0xa8($s0) +/* EEF608 80242508 3C013F80 */ lui $at, 0x3f80 +/* EEF60C 8024250C 44810000 */ mtc1 $at, $f0 +/* EEF610 80242510 3C014000 */ lui $at, 0x4000 +/* EEF614 80242514 44811000 */ mtc1 $at, $f2 +/* EEF618 80242518 3C01C1A0 */ lui $at, 0xc1a0 +/* EEF61C 8024251C 44812000 */ mtc1 $at, $f4 +/* EEF620 80242520 2402000F */ addiu $v0, $zero, 0xf +/* EEF624 80242524 AFA2001C */ sw $v0, 0x1c($sp) +/* EEF628 80242528 44834000 */ mtc1 $v1, $f8 +/* EEF62C 8024252C 00000000 */ nop +/* EEF630 80242530 46804220 */ cvt.s.w $f8, $f8 +/* EEF634 80242534 44074000 */ mfc1 $a3, $f8 +/* EEF638 80242538 27A20028 */ addiu $v0, $sp, 0x28 +/* EEF63C 8024253C AFA20020 */ sw $v0, 0x20($sp) +/* EEF640 80242540 E7A00010 */ swc1 $f0, 0x10($sp) +/* EEF644 80242544 E7A20014 */ swc1 $f2, 0x14($sp) +/* EEF648 80242548 0C01D444 */ jal func_80075110 +/* EEF64C 8024254C E7A40018 */ swc1 $f4, 0x18($sp) +/* EEF650 80242550 8E4200CC */ lw $v0, 0xcc($s2) +/* EEF654 80242554 8C430000 */ lw $v1, ($v0) +/* EEF658 80242558 2402001E */ addiu $v0, $zero, 0x1e +/* EEF65C 8024255C A602008E */ sh $v0, 0x8e($s0) +/* EEF660 80242560 24020014 */ addiu $v0, $zero, 0x14 +/* EEF664 80242564 AE030028 */ sw $v1, 0x28($s0) +/* EEF668 80242568 AE620070 */ sw $v0, 0x70($s3) +/* EEF66C 8024256C 2402001E */ addiu $v0, $zero, 0x1e +/* EEF670 80242570 080909C2 */ j .L80242708 +/* EEF674 80242574 AE420090 */ sw $v0, 0x90($s2) +.L80242578: +/* EEF678 80242578 8E050018 */ lw $a1, 0x18($s0) +/* EEF67C 8024257C 8E06000C */ lw $a2, 0xc($s0) +/* EEF680 80242580 0C00F909 */ jal func_8003E424 +/* EEF684 80242584 0200202D */ daddu $a0, $s0, $zero +/* EEF688 80242588 8E020000 */ lw $v0, ($s0) +/* EEF68C 8024258C 30420008 */ andi $v0, $v0, 8 +/* EEF690 80242590 14400028 */ bnez $v0, .L80242634 +/* EEF694 80242594 0000882D */ daddu $s1, $zero, $zero +/* EEF698 80242598 27A5002C */ addiu $a1, $sp, 0x2c +/* EEF69C 8024259C 27A60030 */ addiu $a2, $sp, 0x30 +/* EEF6A0 802425A0 860200A8 */ lh $v0, 0xa8($s0) +/* EEF6A4 802425A4 C6000038 */ lwc1 $f0, 0x38($s0) +/* EEF6A8 802425A8 44821000 */ mtc1 $v0, $f2 +/* EEF6AC 802425AC 00000000 */ nop +/* EEF6B0 802425B0 468010A0 */ cvt.s.w $f2, $f2 +/* EEF6B4 802425B4 E7A0002C */ swc1 $f0, 0x2c($sp) +/* EEF6B8 802425B8 860200A8 */ lh $v0, 0xa8($s0) +/* EEF6BC 802425BC C604003C */ lwc1 $f4, 0x3c($s0) +/* EEF6C0 802425C0 C6060040 */ lwc1 $f6, 0x40($s0) +/* EEF6C4 802425C4 44820000 */ mtc1 $v0, $f0 +/* EEF6C8 802425C8 00000000 */ nop +/* EEF6CC 802425CC 46800021 */ cvt.d.w $f0, $f0 +/* EEF6D0 802425D0 46022100 */ add.s $f4, $f4, $f2 +/* EEF6D4 802425D4 3C014008 */ lui $at, 0x4008 +/* EEF6D8 802425D8 44811800 */ mtc1 $at, $f3 +/* EEF6DC 802425DC 44801000 */ mtc1 $zero, $f2 +/* EEF6E0 802425E0 27A20038 */ addiu $v0, $sp, 0x38 +/* EEF6E4 802425E4 46220000 */ add.d $f0, $f0, $f2 +/* EEF6E8 802425E8 E7A60034 */ swc1 $f6, 0x34($sp) +/* EEF6EC 802425EC E7A40030 */ swc1 $f4, 0x30($sp) +/* EEF6F0 802425F0 46200020 */ cvt.s.d $f0, $f0 +/* EEF6F4 802425F4 E7A00038 */ swc1 $f0, 0x38($sp) +/* EEF6F8 802425F8 AFA20010 */ sw $v0, 0x10($sp) +/* EEF6FC 802425FC 8E040080 */ lw $a0, 0x80($s0) +/* EEF700 80242600 0C03908F */ jal func_800E423C +/* EEF704 80242604 27A70034 */ addiu $a3, $sp, 0x34 +/* EEF708 80242608 1040000A */ beqz $v0, .L80242634 +/* EEF70C 8024260C 00000000 */ nop +/* EEF710 80242610 860200A8 */ lh $v0, 0xa8($s0) +/* EEF714 80242614 C7A20038 */ lwc1 $f2, 0x38($sp) +/* EEF718 80242618 44820000 */ mtc1 $v0, $f0 +/* EEF71C 8024261C 00000000 */ nop +/* EEF720 80242620 46800020 */ cvt.s.w $f0, $f0 +/* EEF724 80242624 4600103C */ c.lt.s $f2, $f0 +/* EEF728 80242628 00000000 */ nop +/* EEF72C 8024262C 45030001 */ bc1tl .L80242634 +/* EEF730 80242630 24110001 */ addiu $s1, $zero, 1 +.L80242634: +/* EEF734 80242634 12200008 */ beqz $s1, .L80242658 +/* EEF738 80242638 00000000 */ nop +/* EEF73C 8024263C C7A00030 */ lwc1 $f0, 0x30($sp) +/* EEF740 80242640 3C013FF0 */ lui $at, 0x3ff0 +/* EEF744 80242644 44811800 */ mtc1 $at, $f3 +/* EEF748 80242648 44801000 */ mtc1 $zero, $f2 +/* EEF74C 8024264C 46000021 */ cvt.d.s $f0, $f0 +/* EEF750 80242650 080909B8 */ j .L802426E0 +/* EEF754 80242654 46220000 */ add.d $f0, $f0, $f2 +.L80242658: +/* EEF758 80242658 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EEF75C 8024265C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EEF760 80242660 3C014018 */ lui $at, 0x4018 +/* EEF764 80242664 44811800 */ mtc1 $at, $f3 +/* EEF768 80242668 44801000 */ mtc1 $zero, $f2 +/* EEF76C 8024266C C440002C */ lwc1 $f0, 0x2c($v0) +/* EEF770 80242670 C604003C */ lwc1 $f4, 0x3c($s0) +/* EEF774 80242674 46000021 */ cvt.d.s $f0, $f0 +/* EEF778 80242678 46220000 */ add.d $f0, $f0, $f2 +/* EEF77C 8024267C 46002121 */ cvt.d.s $f4, $f4 +/* EEF780 80242680 46202001 */ sub.d $f0, $f4, $f0 +/* EEF784 80242684 462001A0 */ cvt.s.d $f6, $f0 +/* EEF788 80242688 44800000 */ mtc1 $zero, $f0 +/* EEF78C 8024268C 44800800 */ mtc1 $zero, $f1 +/* EEF790 80242690 460030A1 */ cvt.d.s $f2, $f6 +/* EEF794 80242694 4620103C */ c.lt.d $f2, $f0 +/* EEF798 80242698 00000000 */ nop +/* EEF79C 8024269C 45010009 */ bc1t .L802426C4 +/* EEF7A0 802426A0 00000000 */ nop +/* EEF7A4 802426A4 3C014010 */ lui $at, 0x4010 +/* EEF7A8 802426A8 44810800 */ mtc1 $at, $f1 +/* EEF7AC 802426AC 44800000 */ mtc1 $zero, $f0 +/* EEF7B0 802426B0 00000000 */ nop +/* EEF7B4 802426B4 4622003C */ c.lt.d $f0, $f2 +/* EEF7B8 802426B8 00000000 */ nop +/* EEF7BC 802426BC 4500000A */ bc1f .L802426E8 +/* EEF7C0 802426C0 00000000 */ nop +.L802426C4: +/* EEF7C4 802426C4 3C018024 */ lui $at, %hi(D_802454A8) +/* EEF7C8 802426C8 D42254A8 */ ldc1 $f2, %lo(D_802454A8)($at) +/* EEF7CC 802426CC 46003187 */ neg.s $f6, $f6 +/* EEF7D0 802426D0 46003021 */ cvt.d.s $f0, $f6 +/* EEF7D4 802426D4 46220002 */ mul.d $f0, $f0, $f2 +/* EEF7D8 802426D8 00000000 */ nop +/* EEF7DC 802426DC 46202000 */ add.d $f0, $f4, $f0 +.L802426E0: +/* EEF7E0 802426E0 46200020 */ cvt.s.d $f0, $f0 +/* EEF7E4 802426E4 E600003C */ swc1 $f0, 0x3c($s0) +.L802426E8: +/* EEF7E8 802426E8 8602008E */ lh $v0, 0x8e($s0) +/* EEF7EC 802426EC 9603008E */ lhu $v1, 0x8e($s0) +/* EEF7F0 802426F0 18400003 */ blez $v0, .L80242700 +/* EEF7F4 802426F4 2462FFFF */ addiu $v0, $v1, -1 +/* EEF7F8 802426F8 080909C2 */ j .L80242708 +/* EEF7FC 802426FC A602008E */ sh $v0, 0x8e($s0) +.L80242700: +/* EEF800 80242700 2402000C */ addiu $v0, $zero, 0xc +/* EEF804 80242704 AE620070 */ sw $v0, 0x70($s3) +.L80242708: +/* EEF808 80242708 8FBF0050 */ lw $ra, 0x50($sp) +/* EEF80C 8024270C 8FB3004C */ lw $s3, 0x4c($sp) +/* EEF810 80242710 8FB20048 */ lw $s2, 0x48($sp) +/* EEF814 80242714 8FB10044 */ lw $s1, 0x44($sp) +/* EEF818 80242718 8FB00040 */ lw $s0, 0x40($sp) +/* EEF81C 8024271C 03E00008 */ jr $ra +/* EEF820 80242720 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/code_EEDF50/func_80242724_EEF824.s b/asm/nonmatchings/code_EEDF50/func_80242724_EEF824.s new file mode 100644 index 0000000000..bf5455e928 --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80242724_EEF824.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242724_EEF824 +/* EEF824 80242724 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EEF828 80242728 AFB10014 */ sw $s1, 0x14($sp) +/* EEF82C 8024272C 0080882D */ daddu $s1, $a0, $zero +/* EEF830 80242730 AFBF0018 */ sw $ra, 0x18($sp) +/* EEF834 80242734 AFB00010 */ sw $s0, 0x10($sp) +/* EEF838 80242738 8E300148 */ lw $s0, 0x148($s1) +/* EEF83C 8024273C 0C00F92F */ jal func_8003E4BC +/* EEF840 80242740 86040008 */ lh $a0, 8($s0) +/* EEF844 80242744 0040182D */ daddu $v1, $v0, $zero +/* EEF848 80242748 9462008E */ lhu $v0, 0x8e($v1) +/* EEF84C 8024274C 2442FFFF */ addiu $v0, $v0, -1 +/* EEF850 80242750 A462008E */ sh $v0, 0x8e($v1) +/* EEF854 80242754 00021400 */ sll $v0, $v0, 0x10 +/* EEF858 80242758 1C400004 */ bgtz $v0, .L8024276C +/* EEF85C 8024275C 00000000 */ nop +/* EEF860 80242760 AE000074 */ sw $zero, 0x74($s0) +/* EEF864 80242764 A460008E */ sh $zero, 0x8e($v1) +/* EEF868 80242768 AE200070 */ sw $zero, 0x70($s1) +.L8024276C: +/* EEF86C 8024276C 8FBF0018 */ lw $ra, 0x18($sp) +/* EEF870 80242770 8FB10014 */ lw $s1, 0x14($sp) +/* EEF874 80242774 8FB00010 */ lw $s0, 0x10($sp) +/* EEF878 80242778 03E00008 */ jr $ra +/* EEF87C 8024277C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s b/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s new file mode 100644 index 0000000000..add6dd1d19 --- /dev/null +++ b/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242780_EEF880 +/* EEF880 80242780 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EEF884 80242784 AFB40040 */ sw $s4, 0x40($sp) +/* EEF888 80242788 0080A02D */ daddu $s4, $a0, $zero +/* EEF88C 8024278C AFBF0048 */ sw $ra, 0x48($sp) +/* EEF890 80242790 AFB50044 */ sw $s5, 0x44($sp) +/* EEF894 80242794 AFB3003C */ sw $s3, 0x3c($sp) +/* EEF898 80242798 AFB20038 */ sw $s2, 0x38($sp) +/* EEF89C 8024279C AFB10034 */ sw $s1, 0x34($sp) +/* EEF8A0 802427A0 AFB00030 */ sw $s0, 0x30($sp) +/* EEF8A4 802427A4 8E920148 */ lw $s2, 0x148($s4) +/* EEF8A8 802427A8 86440008 */ lh $a0, 8($s2) +/* EEF8AC 802427AC 8E90000C */ lw $s0, 0xc($s4) +/* EEF8B0 802427B0 0C00F92F */ jal func_8003E4BC +/* EEF8B4 802427B4 00A0882D */ daddu $s1, $a1, $zero +/* EEF8B8 802427B8 0280202D */ daddu $a0, $s4, $zero +/* EEF8BC 802427BC 8E050000 */ lw $a1, ($s0) +/* EEF8C0 802427C0 0C0B53A3 */ jal func_802D4E8C +/* EEF8C4 802427C4 0040A82D */ daddu $s5, $v0, $zero +/* EEF8C8 802427C8 AFA00010 */ sw $zero, 0x10($sp) +/* EEF8CC 802427CC 8E4300D0 */ lw $v1, 0xd0($s2) +/* EEF8D0 802427D0 8C630030 */ lw $v1, 0x30($v1) +/* EEF8D4 802427D4 AFA30014 */ sw $v1, 0x14($sp) +/* EEF8D8 802427D8 8E4300D0 */ lw $v1, 0xd0($s2) +/* EEF8DC 802427DC 8C63001C */ lw $v1, 0x1c($v1) +/* EEF8E0 802427E0 AFA30018 */ sw $v1, 0x18($sp) +/* EEF8E4 802427E4 8E4300D0 */ lw $v1, 0xd0($s2) +/* EEF8E8 802427E8 8C630024 */ lw $v1, 0x24($v1) +/* EEF8EC 802427EC AFA3001C */ sw $v1, 0x1c($sp) +/* EEF8F0 802427F0 8E4300D0 */ lw $v1, 0xd0($s2) +/* EEF8F4 802427F4 8C630028 */ lw $v1, 0x28($v1) +/* EEF8F8 802427F8 AFA30020 */ sw $v1, 0x20($sp) +/* EEF8FC 802427FC 8E4300D0 */ lw $v1, 0xd0($s2) +/* EEF900 80242800 3C0142F0 */ lui $at, 0x42f0 +/* EEF904 80242804 44810000 */ mtc1 $at, $f0 +/* EEF908 80242808 8C63002C */ lw $v1, 0x2c($v1) +/* EEF90C 8024280C E7A00028 */ swc1 $f0, 0x28($sp) +/* EEF910 80242810 A7A0002C */ sh $zero, 0x2c($sp) +/* EEF914 80242814 AFA30024 */ sw $v1, 0x24($sp) +/* EEF918 80242818 C6A00038 */ lwc1 $f0, 0x38($s5) +/* EEF91C 8024281C E6400108 */ swc1 $f0, 0x108($s2) +/* EEF920 80242820 C6A0003C */ lwc1 $f0, 0x3c($s5) +/* EEF924 80242824 27B30010 */ addiu $s3, $sp, 0x10 +/* EEF928 80242828 E640010C */ swc1 $f0, 0x10c($s2) +/* EEF92C 8024282C 3C0138D1 */ lui $at, 0x38d1 +/* EEF930 80242830 3421B717 */ ori $at, $at, 0xb717 +/* EEF934 80242834 44810000 */ mtc1 $at, $f0 +/* EEF938 80242838 C6A20040 */ lwc1 $f2, 0x40($s5) +/* EEF93C 8024283C 0040802D */ daddu $s0, $v0, $zero +/* EEF940 80242840 E6400114 */ swc1 $f0, 0x114($s2) +/* EEF944 80242844 E6400118 */ swc1 $f0, 0x118($s2) +/* EEF948 80242848 12200007 */ beqz $s1, .L80242868 +/* EEF94C 8024284C E6420110 */ swc1 $f2, 0x110($s2) +/* EEF950 80242850 02A0202D */ daddu $a0, $s5, $zero +/* EEF954 80242854 0240282D */ daddu $a1, $s2, $zero +/* EEF958 80242858 0280302D */ daddu $a2, $s4, $zero +/* EEF95C 8024285C 0C09080E */ jal func_80242038_EEF138 +/* EEF960 80242860 0200382D */ daddu $a3, $s0, $zero +/* EEF964 80242864 AE800070 */ sw $zero, 0x70($s4) +.L80242868: +/* EEF968 80242868 2402FFFE */ addiu $v0, $zero, -2 +/* EEF96C 8024286C A2A200AB */ sb $v0, 0xab($s5) +/* EEF970 80242870 8E4300B0 */ lw $v1, 0xb0($s2) +/* EEF974 80242874 30620004 */ andi $v0, $v1, 4 +/* EEF978 80242878 10400007 */ beqz $v0, .L80242898 +/* EEF97C 8024287C 00000000 */ nop +/* EEF980 80242880 824200B4 */ lb $v0, 0xb4($s2) +/* EEF984 80242884 1440003A */ bnez $v0, .L80242970 +/* EEF988 80242888 0000102D */ daddu $v0, $zero, $zero +/* EEF98C 8024288C 2402FFFB */ addiu $v0, $zero, -5 +/* EEF990 80242890 00621024 */ and $v0, $v1, $v0 +/* EEF994 80242894 AE4200B0 */ sw $v0, 0xb0($s2) +.L80242898: +/* EEF998 80242898 8E830070 */ lw $v1, 0x70($s4) +/* EEF99C 8024289C 2C620015 */ sltiu $v0, $v1, 0x15 +/* EEF9A0 802428A0 10400032 */ beqz $v0, .L8024296C +/* EEF9A4 802428A4 00031080 */ sll $v0, $v1, 2 +/* EEF9A8 802428A8 3C018024 */ lui $at, %hi(D_802454B0) +/* EEF9AC 802428AC 00220821 */ addu $at, $at, $v0 +/* EEF9B0 802428B0 8C2254B0 */ lw $v0, %lo(D_802454B0)($at) +/* EEF9B4 802428B4 00400008 */ jr $v0 +/* EEF9B8 802428B8 00000000 */ nop +/* EEF9BC 802428BC 0280202D */ daddu $a0, $s4, $zero +/* EEF9C0 802428C0 0200282D */ daddu $a1, $s0, $zero +/* EEF9C4 802428C4 0C090394 */ jal func_80240E50_EEDF50 +/* EEF9C8 802428C8 0260302D */ daddu $a2, $s3, $zero +/* EEF9CC 802428CC 0280202D */ daddu $a0, $s4, $zero +/* EEF9D0 802428D0 0200282D */ daddu $a1, $s0, $zero +/* EEF9D4 802428D4 0C090400 */ jal func_80241000_EEE100 +/* EEF9D8 802428D8 0260302D */ daddu $a2, $s3, $zero +/* EEF9DC 802428DC 08090A5C */ j .L80242970 +/* EEF9E0 802428E0 0000102D */ daddu $v0, $zero, $zero +/* EEF9E4 802428E4 0280202D */ daddu $a0, $s4, $zero +/* EEF9E8 802428E8 0200282D */ daddu $a1, $s0, $zero +/* EEF9EC 802428EC 0C09058A */ jal func_80241628_EEE728 +/* EEF9F0 802428F0 0260302D */ daddu $a2, $s3, $zero +/* EEF9F4 802428F4 0280202D */ daddu $a0, $s4, $zero +/* EEF9F8 802428F8 0200282D */ daddu $a1, $s0, $zero +/* EEF9FC 802428FC 0C0905BA */ jal func_802416E8_EEE7E8 +/* EEFA00 80242900 0260302D */ daddu $a2, $s3, $zero +/* EEFA04 80242904 08090A5C */ j .L80242970 +/* EEFA08 80242908 0000102D */ daddu $v0, $zero, $zero +/* EEFA0C 8024290C 0280202D */ daddu $a0, $s4, $zero +/* EEFA10 80242910 0200282D */ daddu $a1, $s0, $zero +/* EEFA14 80242914 0C09068B */ jal func_80241A2C_EEEB2C +/* EEFA18 80242918 0260302D */ daddu $a2, $s3, $zero +/* EEFA1C 8024291C 0280202D */ daddu $a0, $s4, $zero +/* EEFA20 80242920 0200282D */ daddu $a1, $s0, $zero +/* EEFA24 80242924 0C0906A9 */ jal func_80241AA4_EEEBA4 +/* EEFA28 80242928 0260302D */ daddu $a2, $s3, $zero +/* EEFA2C 8024292C 08090A5C */ j .L80242970 +/* EEFA30 80242930 0000102D */ daddu $v0, $zero, $zero +/* EEFA34 80242934 0280202D */ daddu $a0, $s4, $zero +/* EEFA38 80242938 0200282D */ daddu $a1, $s0, $zero +/* EEFA3C 8024293C 0C0908DD */ jal func_80242374_EEF474 +/* EEFA40 80242940 0260302D */ daddu $a2, $s3, $zero +/* EEFA44 80242944 0280202D */ daddu $a0, $s4, $zero +/* EEFA48 80242948 0200282D */ daddu $a1, $s0, $zero +/* EEFA4C 8024294C 0C090929 */ jal func_802424A4_EEF5A4 +/* EEFA50 80242950 0260302D */ daddu $a2, $s3, $zero +/* EEFA54 80242954 08090A5C */ j .L80242970 +/* EEFA58 80242958 0000102D */ daddu $v0, $zero, $zero +/* EEFA5C 8024295C 0280202D */ daddu $a0, $s4, $zero +/* EEFA60 80242960 0200282D */ daddu $a1, $s0, $zero +/* EEFA64 80242964 0C0909C9 */ jal func_80242724_EEF824 +/* EEFA68 80242968 0260302D */ daddu $a2, $s3, $zero +.L8024296C: +/* EEFA6C 8024296C 0000102D */ daddu $v0, $zero, $zero +.L80242970: +/* EEFA70 80242970 8FBF0048 */ lw $ra, 0x48($sp) +/* EEFA74 80242974 8FB50044 */ lw $s5, 0x44($sp) +/* EEFA78 80242978 8FB40040 */ lw $s4, 0x40($sp) +/* EEFA7C 8024297C 8FB3003C */ lw $s3, 0x3c($sp) +/* EEFA80 80242980 8FB20038 */ lw $s2, 0x38($sp) +/* EEFA84 80242984 8FB10034 */ lw $s1, 0x34($sp) +/* EEFA88 80242988 8FB00030 */ lw $s0, 0x30($sp) +/* EEFA8C 8024298C 03E00008 */ jr $ra +/* EEFA90 80242990 27BD0050 */ addiu $sp, $sp, 0x50 +/* EEFA94 80242994 00000000 */ nop +/* EEFA98 80242998 00000000 */ nop +/* EEFA9C 8024299C 00000000 */ nop diff --git a/asm/nonmatchings/code_EEFAA0/func_802429A0_EEFAA0.s b/asm/nonmatchings/code_EEFAA0/func_802429A0_EEFAA0.s new file mode 100644 index 0000000000..acb623cdaf --- /dev/null +++ b/asm/nonmatchings/code_EEFAA0/func_802429A0_EEFAA0.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802429A0_EEFAA0 +/* EEFAA0 802429A0 AC800084 */ sw $zero, 0x84($a0) +/* EEFAA4 802429A4 3C038011 */ lui $v1, %hi(D_8011762C) +/* EEFAA8 802429A8 8063762C */ lb $v1, %lo(D_8011762C)($v1) +/* EEFAAC 802429AC 2402000E */ addiu $v0, $zero, 0xe +/* EEFAB0 802429B0 10620004 */ beq $v1, $v0, .L802429C4 +/* EEFAB4 802429B4 24020001 */ addiu $v0, $zero, 1 +/* EEFAB8 802429B8 24020010 */ addiu $v0, $zero, 0x10 +/* EEFABC 802429BC 14620002 */ bne $v1, $v0, .L802429C8 +/* EEFAC0 802429C0 24020001 */ addiu $v0, $zero, 1 +.L802429C4: +/* EEFAC4 802429C4 AC820084 */ sw $v0, 0x84($a0) +.L802429C8: +/* EEFAC8 802429C8 03E00008 */ jr $ra +/* EEFACC 802429CC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EF2610/func_80240000_EF2610.s b/asm/nonmatchings/code_EF2610/func_80240000_EF2610.s new file mode 100644 index 0000000000..4ace432f51 --- /dev/null +++ b/asm/nonmatchings/code_EF2610/func_80240000_EF2610.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EF2610 +/* EF2610 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EF2614 80240004 24040001 */ addiu $a0, $zero, 1 +/* EF2618 80240008 0000282D */ daddu $a1, $zero, $zero +/* EF261C 8024000C 00A0302D */ daddu $a2, $a1, $zero +/* EF2620 80240010 00A0382D */ daddu $a3, $a1, $zero +/* EF2624 80240014 AFBF0018 */ sw $ra, 0x18($sp) +/* EF2628 80240018 AFA00010 */ sw $zero, 0x10($sp) +/* EF262C 8024001C 0C01DEF4 */ jal func_80077BD0 +/* EF2630 80240020 AFA00014 */ sw $zero, 0x14($sp) +/* EF2634 80240024 8FBF0018 */ lw $ra, 0x18($sp) +/* EF2638 80240028 24020002 */ addiu $v0, $zero, 2 +/* EF263C 8024002C 03E00008 */ jr $ra +/* EF2640 80240030 27BD0020 */ addiu $sp, $sp, 0x20 +/* EF2644 80240034 00000000 */ nop +/* EF2648 80240038 00000000 */ nop +/* EF264C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EF2650/func_80240040_EF2650.s b/asm/nonmatchings/code_EF2650/func_80240040_EF2650.s new file mode 100644 index 0000000000..274355acaa --- /dev/null +++ b/asm/nonmatchings/code_EF2650/func_80240040_EF2650.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240040_EF2650 +/* EF2650 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EF2654 80240044 AFBF0010 */ sw $ra, 0x10($sp) +/* EF2658 80240048 8C82000C */ lw $v0, 0xc($a0) +/* EF265C 8024004C 3C068017 */ lui $a2, %hi(D_80169B16) +/* EF2660 80240050 84C69B16 */ lh $a2, %lo(D_80169B16)($a2) +/* EF2664 80240054 0C0B551A */ jal func_802D5468 +/* EF2668 80240058 8C450000 */ lw $a1, ($v0) +/* EF266C 8024005C 8FBF0010 */ lw $ra, 0x10($sp) +/* EF2670 80240060 24020002 */ addiu $v0, $zero, 2 +/* EF2674 80240064 03E00008 */ jr $ra +/* EF2678 80240068 27BD0018 */ addiu $sp, $sp, 0x18 +/* EF267C 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/code_EF2680/func_80240070_EF2680.s b/asm/nonmatchings/code_EF2680/func_80240070_EF2680.s new file mode 100644 index 0000000000..c51bd7504a --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80240070_EF2680.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240070_EF2680 +/* EF2680 80240070 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EF2684 80240074 AFB3002C */ sw $s3, 0x2c($sp) +/* EF2688 80240078 0080982D */ daddu $s3, $a0, $zero +/* EF268C 8024007C AFBF0030 */ sw $ra, 0x30($sp) +/* EF2690 80240080 AFB20028 */ sw $s2, 0x28($sp) +/* EF2694 80240084 AFB10024 */ sw $s1, 0x24($sp) +/* EF2698 80240088 AFB00020 */ sw $s0, 0x20($sp) +/* EF269C 8024008C 8E710148 */ lw $s1, 0x148($s3) +/* EF26A0 80240090 86240008 */ lh $a0, 8($s1) +/* EF26A4 80240094 0C00F92F */ jal func_8003E4BC +/* EF26A8 80240098 00A0902D */ daddu $s2, $a1, $zero +/* EF26AC 8024009C 8E440004 */ lw $a0, 4($s2) +/* EF26B0 802400A0 0040802D */ daddu $s0, $v0, $zero +/* EF26B4 802400A4 00041FC2 */ srl $v1, $a0, 0x1f +/* EF26B8 802400A8 00832021 */ addu $a0, $a0, $v1 +/* EF26BC 802400AC 00042043 */ sra $a0, $a0, 1 +/* EF26C0 802400B0 0C00AB3B */ jal func_8002ACEC +/* EF26C4 802400B4 24840001 */ addiu $a0, $a0, 1 +/* EF26C8 802400B8 8E430004 */ lw $v1, 4($s2) +/* EF26CC 802400BC 000327C2 */ srl $a0, $v1, 0x1f +/* EF26D0 802400C0 00641821 */ addu $v1, $v1, $a0 +/* EF26D4 802400C4 00031843 */ sra $v1, $v1, 1 +/* EF26D8 802400C8 00621821 */ addu $v1, $v1, $v0 +/* EF26DC 802400CC A603008E */ sh $v1, 0x8e($s0) +/* EF26E0 802400D0 8E2300D0 */ lw $v1, 0xd0($s1) +/* EF26E4 802400D4 C6000040 */ lwc1 $f0, 0x40($s0) +/* EF26E8 802400D8 C4640000 */ lwc1 $f4, ($v1) +/* EF26EC 802400DC 46802120 */ cvt.s.w $f4, $f4 +/* EF26F0 802400E0 C4620008 */ lwc1 $f2, 8($v1) +/* EF26F4 802400E4 468010A0 */ cvt.s.w $f2, $f2 +/* EF26F8 802400E8 E7A00010 */ swc1 $f0, 0x10($sp) +/* EF26FC 802400EC 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF2700 802400F0 44061000 */ mfc1 $a2, $f2 +/* EF2704 802400F4 C440000C */ lwc1 $f0, 0xc($v0) +/* EF2708 802400F8 46800020 */ cvt.s.w $f0, $f0 +/* EF270C 802400FC E7A00014 */ swc1 $f0, 0x14($sp) +/* EF2710 80240100 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF2714 80240104 44052000 */ mfc1 $a1, $f4 +/* EF2718 80240108 C4400010 */ lwc1 $f0, 0x10($v0) +/* EF271C 8024010C 46800020 */ cvt.s.w $f0, $f0 +/* EF2720 80240110 E7A00018 */ swc1 $f0, 0x18($sp) +/* EF2724 80240114 8C640018 */ lw $a0, 0x18($v1) +/* EF2728 80240118 0C013431 */ jal func_8004D0C4 +/* EF272C 8024011C 8E070038 */ lw $a3, 0x38($s0) +/* EF2730 80240120 1040000E */ beqz $v0, .L8024015C +/* EF2734 80240124 00000000 */ nop +/* EF2738 80240128 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF273C 8024012C C60C0038 */ lwc1 $f12, 0x38($s0) +/* EF2740 80240130 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EF2744 80240134 C4460000 */ lwc1 $f6, ($v0) +/* EF2748 80240138 468031A0 */ cvt.s.w $f6, $f6 +/* EF274C 8024013C 44063000 */ mfc1 $a2, $f6 +/* EF2750 80240140 C4460008 */ lwc1 $f6, 8($v0) +/* EF2754 80240144 468031A0 */ cvt.s.w $f6, $f6 +/* EF2758 80240148 44073000 */ mfc1 $a3, $f6 +/* EF275C 8024014C 0C00ABDC */ jal fio_validate_header_checksums +/* EF2760 80240150 00000000 */ nop +/* EF2764 80240154 08090063 */ j .L8024018C +/* EF2768 80240158 E600000C */ swc1 $f0, 0xc($s0) +.L8024015C: +/* EF276C 8024015C 0C00AB3B */ jal func_8002ACEC +/* EF2770 80240160 2404003C */ addiu $a0, $zero, 0x3c +/* EF2774 80240164 C60C000C */ lwc1 $f12, 0xc($s0) +/* EF2778 80240168 44820000 */ mtc1 $v0, $f0 +/* EF277C 8024016C 00000000 */ nop +/* EF2780 80240170 46800020 */ cvt.s.w $f0, $f0 +/* EF2784 80240174 46006300 */ add.s $f12, $f12, $f0 +/* EF2788 80240178 3C0141F0 */ lui $at, 0x41f0 +/* EF278C 8024017C 44810000 */ mtc1 $at, $f0 +/* EF2790 80240180 0C00AB85 */ jal func_8002AE14 +/* EF2794 80240184 46006301 */ sub.s $f12, $f12, $f0 +/* EF2798 80240188 E600000C */ swc1 $f0, 0xc($s0) +.L8024018C: +/* EF279C 8024018C 8E2200CC */ lw $v0, 0xcc($s1) +/* EF27A0 80240190 8C420004 */ lw $v0, 4($v0) +/* EF27A4 80240194 AE020028 */ sw $v0, 0x28($s0) +/* EF27A8 80240198 AE600074 */ sw $zero, 0x74($s3) +/* EF27AC 8024019C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF27B0 802401A0 8C420014 */ lw $v0, 0x14($v0) +/* EF27B4 802401A4 04410004 */ bgez $v0, .L802401B8 +/* EF27B8 802401A8 00000000 */ nop +/* EF27BC 802401AC C6400000 */ lwc1 $f0, ($s2) +/* EF27C0 802401B0 08090076 */ j .L802401D8 +/* EF27C4 802401B4 E6000018 */ swc1 $f0, 0x18($s0) +.L802401B8: +/* EF27C8 802401B8 3C018024 */ lui $at, %hi(D_802453B0) +/* EF27CC 802401BC D42253B0 */ ldc1 $f2, %lo(D_802453B0)($at) +/* EF27D0 802401C0 44820000 */ mtc1 $v0, $f0 +/* EF27D4 802401C4 00000000 */ nop +/* EF27D8 802401C8 46800021 */ cvt.d.w $f0, $f0 +/* EF27DC 802401CC 46220003 */ div.d $f0, $f0, $f2 +/* EF27E0 802401D0 46200020 */ cvt.s.d $f0, $f0 +/* EF27E4 802401D4 E6000018 */ swc1 $f0, 0x18($s0) +.L802401D8: +/* EF27E8 802401D8 C600003C */ lwc1 $f0, 0x3c($s0) +/* EF27EC 802401DC 3C014059 */ lui $at, 0x4059 +/* EF27F0 802401E0 44811800 */ mtc1 $at, $f3 +/* EF27F4 802401E4 44801000 */ mtc1 $zero, $f2 +/* EF27F8 802401E8 46000021 */ cvt.d.s $f0, $f0 +/* EF27FC 802401EC 46220002 */ mul.d $f0, $f0, $f2 +/* EF2800 802401F0 00000000 */ nop +/* EF2804 802401F4 24020001 */ addiu $v0, $zero, 1 +/* EF2808 802401F8 4620018D */ trunc.w.d $f6, $f0 +/* EF280C 802401FC E626007C */ swc1 $f6, 0x7c($s1) +/* EF2810 80240200 AE620070 */ sw $v0, 0x70($s3) +/* EF2814 80240204 8FBF0030 */ lw $ra, 0x30($sp) +/* EF2818 80240208 8FB3002C */ lw $s3, 0x2c($sp) +/* EF281C 8024020C 8FB20028 */ lw $s2, 0x28($sp) +/* EF2820 80240210 8FB10024 */ lw $s1, 0x24($sp) +/* EF2824 80240214 8FB00020 */ lw $s0, 0x20($sp) +/* EF2828 80240218 03E00008 */ jr $ra +/* EF282C 8024021C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EF2680/func_80240220_EF2830.s b/asm/nonmatchings/code_EF2680/func_80240220_EF2830.s new file mode 100644 index 0000000000..704775af35 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80240220_EF2830.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240220_EF2830 +/* EF2830 80240220 27BDFF80 */ addiu $sp, $sp, -0x80 +/* EF2834 80240224 AFB3004C */ sw $s3, 0x4c($sp) +/* EF2838 80240228 0080982D */ daddu $s3, $a0, $zero +/* EF283C 8024022C AFBF0058 */ sw $ra, 0x58($sp) +/* EF2840 80240230 AFB50054 */ sw $s5, 0x54($sp) +/* EF2844 80240234 AFB40050 */ sw $s4, 0x50($sp) +/* EF2848 80240238 AFB20048 */ sw $s2, 0x48($sp) +/* EF284C 8024023C AFB10044 */ sw $s1, 0x44($sp) +/* EF2850 80240240 AFB00040 */ sw $s0, 0x40($sp) +/* EF2854 80240244 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* EF2858 80240248 F7B80070 */ sdc1 $f24, 0x70($sp) +/* EF285C 8024024C F7B60068 */ sdc1 $f22, 0x68($sp) +/* EF2860 80240250 F7B40060 */ sdc1 $f20, 0x60($sp) +/* EF2864 80240254 8E710148 */ lw $s1, 0x148($s3) +/* EF2868 80240258 00A0902D */ daddu $s2, $a1, $zero +/* EF286C 8024025C 86240008 */ lh $a0, 8($s1) +/* EF2870 80240260 0C00F92F */ jal func_8003E4BC +/* EF2874 80240264 00C0A82D */ daddu $s5, $a2, $zero +/* EF2878 80240268 0040802D */ daddu $s0, $v0, $zero +/* EF287C 8024026C 0000A02D */ daddu $s4, $zero, $zero +/* EF2880 80240270 C624007C */ lwc1 $f4, 0x7c($s1) +/* EF2884 80240274 46802120 */ cvt.s.w $f4, $f4 +/* EF2888 80240278 C6220088 */ lwc1 $f2, 0x88($s1) +/* EF288C 8024027C 468010A0 */ cvt.s.w $f2, $f2 +/* EF2890 80240280 460010A1 */ cvt.d.s $f2, $f2 +/* EF2894 80240284 46002121 */ cvt.d.s $f4, $f4 +/* EF2898 80240288 C600003C */ lwc1 $f0, 0x3c($s0) +/* EF289C 8024028C 3C014059 */ lui $at, 0x4059 +/* EF28A0 80240290 44813800 */ mtc1 $at, $f7 +/* EF28A4 80240294 44803000 */ mtc1 $zero, $f6 +/* EF28A8 80240298 46000021 */ cvt.d.s $f0, $f0 +/* EF28AC 8024029C 46260002 */ mul.d $f0, $f0, $f6 +/* EF28B0 802402A0 00000000 */ nop +/* EF28B4 802402A4 24020001 */ addiu $v0, $zero, 1 +/* EF28B8 802402A8 8E24006C */ lw $a0, 0x6c($s1) +/* EF28BC 802402AC 46261083 */ div.d $f2, $f2, $f6 +/* EF28C0 802402B0 462010A0 */ cvt.s.d $f2, $f2 +/* EF28C4 802402B4 46262103 */ div.d $f4, $f4, $f6 +/* EF28C8 802402B8 46202520 */ cvt.s.d $f20, $f4 +/* EF28CC 802402BC 30830011 */ andi $v1, $a0, 0x11 +/* EF28D0 802402C0 4620020D */ trunc.w.d $f8, $f0 +/* EF28D4 802402C4 E628007C */ swc1 $f8, 0x7c($s1) +/* EF28D8 802402C8 C6200078 */ lwc1 $f0, 0x78($s1) +/* EF28DC 802402CC 46800020 */ cvt.s.w $f0, $f0 +/* EF28E0 802402D0 46000021 */ cvt.d.s $f0, $f0 +/* EF28E4 802402D4 46260003 */ div.d $f0, $f0, $f6 +/* EF28E8 802402D8 462006A0 */ cvt.s.d $f26, $f0 +/* EF28EC 802402DC C6200070 */ lwc1 $f0, 0x70($s1) +/* EF28F0 802402E0 46800020 */ cvt.s.w $f0, $f0 +/* EF28F4 802402E4 46000021 */ cvt.d.s $f0, $f0 +/* EF28F8 802402E8 46260003 */ div.d $f0, $f0, $f6 +/* EF28FC 802402EC 462005A0 */ cvt.s.d $f22, $f0 +/* EF2900 802402F0 14620025 */ bne $v1, $v0, .L80240388 +/* EF2904 802402F4 4602D600 */ add.s $f24, $f26, $f2 +/* EF2908 802402F8 8E020000 */ lw $v0, ($s0) +/* EF290C 802402FC 30420008 */ andi $v0, $v0, 8 +/* EF2910 80240300 10400009 */ beqz $v0, .L80240328 +/* EF2914 80240304 27A50028 */ addiu $a1, $sp, 0x28 +/* EF2918 80240308 C600003C */ lwc1 $f0, 0x3c($s0) +/* EF291C 8024030C 4600C001 */ sub.s $f0, $f24, $f0 +/* EF2920 80240310 4600B03C */ c.lt.s $f22, $f0 +/* EF2924 80240314 00000000 */ nop +/* EF2928 80240318 4500001B */ bc1f .L80240388 +/* EF292C 8024031C 34820010 */ ori $v0, $a0, 0x10 +/* EF2930 80240320 080900E2 */ j .L80240388 +/* EF2934 80240324 AE22006C */ sw $v0, 0x6c($s1) +.L80240328: +/* EF2938 80240328 27A6002C */ addiu $a2, $sp, 0x2c +/* EF293C 8024032C C6000038 */ lwc1 $f0, 0x38($s0) +/* EF2940 80240330 C602003C */ lwc1 $f2, 0x3c($s0) +/* EF2944 80240334 C6040040 */ lwc1 $f4, 0x40($s0) +/* EF2948 80240338 3C01447A */ lui $at, 0x447a +/* EF294C 8024033C 44813000 */ mtc1 $at, $f6 +/* EF2950 80240340 27A20034 */ addiu $v0, $sp, 0x34 +/* EF2954 80240344 E7A00028 */ swc1 $f0, 0x28($sp) +/* EF2958 80240348 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EF295C 8024034C E7A40030 */ swc1 $f4, 0x30($sp) +/* EF2960 80240350 E7A60034 */ swc1 $f6, 0x34($sp) +/* EF2964 80240354 AFA20010 */ sw $v0, 0x10($sp) +/* EF2968 80240358 8E040080 */ lw $a0, 0x80($s0) +/* EF296C 8024035C 0C03908F */ jal func_800E423C +/* EF2970 80240360 27A70030 */ addiu $a3, $sp, 0x30 +/* EF2974 80240364 C7A00034 */ lwc1 $f0, 0x34($sp) +/* EF2978 80240368 4600D001 */ sub.s $f0, $f26, $f0 +/* EF297C 8024036C 4600B03C */ c.lt.s $f22, $f0 +/* EF2980 80240370 00000000 */ nop +/* EF2984 80240374 45000004 */ bc1f .L80240388 +/* EF2988 80240378 00000000 */ nop +/* EF298C 8024037C 8E22006C */ lw $v0, 0x6c($s1) +/* EF2990 80240380 34420010 */ ori $v0, $v0, 0x10 +/* EF2994 80240384 AE22006C */ sw $v0, 0x6c($s1) +.L80240388: +/* EF2998 80240388 8E22006C */ lw $v0, 0x6c($s1) +/* EF299C 8024038C 24030011 */ addiu $v1, $zero, 0x11 +/* EF29A0 80240390 30420011 */ andi $v0, $v0, 0x11 +/* EF29A4 80240394 14430039 */ bne $v0, $v1, .L8024047C +/* EF29A8 80240398 00000000 */ nop +/* EF29AC 8024039C 8E020000 */ lw $v0, ($s0) +/* EF29B0 802403A0 30420008 */ andi $v0, $v0, 8 +/* EF29B4 802403A4 1040000A */ beqz $v0, .L802403D0 +/* EF29B8 802403A8 4600C106 */ mov.s $f4, $f24 +/* EF29BC 802403AC 4614C081 */ sub.s $f2, $f24, $f20 +/* EF29C0 802403B0 3C018024 */ lui $at, %hi(D_802453B8) +/* EF29C4 802403B4 D42053B8 */ ldc1 $f0, %lo(D_802453B8)($at) +/* EF29C8 802403B8 460010A1 */ cvt.d.s $f2, $f2 +/* EF29CC 802403BC 46201082 */ mul.d $f2, $f2, $f0 +/* EF29D0 802403C0 00000000 */ nop +/* EF29D4 802403C4 4600A021 */ cvt.d.s $f0, $f20 +/* EF29D8 802403C8 0809010D */ j .L80240434 +/* EF29DC 802403CC 46220000 */ add.d $f0, $f0, $f2 +.L802403D0: +/* EF29E0 802403D0 27A50028 */ addiu $a1, $sp, 0x28 +/* EF29E4 802403D4 27A6002C */ addiu $a2, $sp, 0x2c +/* EF29E8 802403D8 C6000038 */ lwc1 $f0, 0x38($s0) +/* EF29EC 802403DC C6020040 */ lwc1 $f2, 0x40($s0) +/* EF29F0 802403E0 3C01447A */ lui $at, 0x447a +/* EF29F4 802403E4 44812000 */ mtc1 $at, $f4 +/* EF29F8 802403E8 27A20034 */ addiu $v0, $sp, 0x34 +/* EF29FC 802403EC E7B4002C */ swc1 $f20, 0x2c($sp) +/* EF2A00 802403F0 E7A00028 */ swc1 $f0, 0x28($sp) +/* EF2A04 802403F4 E7A20030 */ swc1 $f2, 0x30($sp) +/* EF2A08 802403F8 E7A40034 */ swc1 $f4, 0x34($sp) +/* EF2A0C 802403FC AFA20010 */ sw $v0, 0x10($sp) +/* EF2A10 80240400 8E040080 */ lw $a0, 0x80($s0) +/* EF2A14 80240404 0C03908F */ jal func_800E423C +/* EF2A18 80240408 27A70030 */ addiu $a3, $sp, 0x30 +/* EF2A1C 8024040C C7A4002C */ lwc1 $f4, 0x2c($sp) +/* EF2A20 80240410 461A2100 */ add.s $f4, $f4, $f26 +/* EF2A24 80240414 46142081 */ sub.s $f2, $f4, $f20 +/* EF2A28 80240418 3C018024 */ lui $at, %hi(D_802453C0) +/* EF2A2C 8024041C D42053C0 */ ldc1 $f0, %lo(D_802453C0)($at) +/* EF2A30 80240420 460010A1 */ cvt.d.s $f2, $f2 +/* EF2A34 80240424 46201082 */ mul.d $f2, $f2, $f0 +/* EF2A38 80240428 00000000 */ nop +/* EF2A3C 8024042C 4600A021 */ cvt.d.s $f0, $f20 +/* EF2A40 80240430 46220000 */ add.d $f0, $f0, $f2 +.L80240434: +/* EF2A44 80240434 46200020 */ cvt.s.d $f0, $f0 +/* EF2A48 80240438 E600003C */ swc1 $f0, 0x3c($s0) +/* EF2A4C 8024043C C600003C */ lwc1 $f0, 0x3c($s0) +/* EF2A50 80240440 46002001 */ sub.s $f0, $f4, $f0 +/* EF2A54 80240444 3C013FF0 */ lui $at, 0x3ff0 +/* EF2A58 80240448 44811800 */ mtc1 $at, $f3 +/* EF2A5C 8024044C 44801000 */ mtc1 $zero, $f2 +/* EF2A60 80240450 46000005 */ abs.s $f0, $f0 +/* EF2A64 80240454 46000021 */ cvt.d.s $f0, $f0 +/* EF2A68 80240458 4622003C */ c.lt.d $f0, $f2 +/* EF2A6C 8024045C 00000000 */ nop +/* EF2A70 80240460 45000036 */ bc1f .L8024053C +/* EF2A74 80240464 2403FFEF */ addiu $v1, $zero, -0x11 +/* EF2A78 80240468 E604003C */ swc1 $f4, 0x3c($s0) +/* EF2A7C 8024046C 8E22006C */ lw $v0, 0x6c($s1) +/* EF2A80 80240470 00431024 */ and $v0, $v0, $v1 +/* EF2A84 80240474 0809014F */ j .L8024053C +/* EF2A88 80240478 AE22006C */ sw $v0, 0x6c($s1) +.L8024047C: +/* EF2A8C 8024047C 8E220070 */ lw $v0, 0x70($s1) +/* EF2A90 80240480 1840002E */ blez $v0, .L8024053C +/* EF2A94 80240484 00000000 */ nop +/* EF2A98 80240488 C62C0074 */ lwc1 $f12, 0x74($s1) +/* EF2A9C 8024048C 0C00AD77 */ jal func_8002B5DC +/* EF2AA0 80240490 46806320 */ cvt.s.w $f12, $f12 +/* EF2AA4 80240494 8E020000 */ lw $v0, ($s0) +/* EF2AA8 80240498 30420008 */ andi $v0, $v0, 8 +/* EF2AAC 8024049C 10400003 */ beqz $v0, .L802404AC +/* EF2AB0 802404A0 46000506 */ mov.s $f20, $f0 +/* EF2AB4 802404A4 0809013B */ j .L802404EC +/* EF2AB8 802404A8 0000102D */ daddu $v0, $zero, $zero +.L802404AC: +/* EF2ABC 802404AC 27A50028 */ addiu $a1, $sp, 0x28 +/* EF2AC0 802404B0 27A6002C */ addiu $a2, $sp, 0x2c +/* EF2AC4 802404B4 C6000038 */ lwc1 $f0, 0x38($s0) +/* EF2AC8 802404B8 C602003C */ lwc1 $f2, 0x3c($s0) +/* EF2ACC 802404BC C6040040 */ lwc1 $f4, 0x40($s0) +/* EF2AD0 802404C0 3C01447A */ lui $at, 0x447a +/* EF2AD4 802404C4 44813000 */ mtc1 $at, $f6 +/* EF2AD8 802404C8 27A20034 */ addiu $v0, $sp, 0x34 +/* EF2ADC 802404CC E7A00028 */ swc1 $f0, 0x28($sp) +/* EF2AE0 802404D0 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EF2AE4 802404D4 E7A40030 */ swc1 $f4, 0x30($sp) +/* EF2AE8 802404D8 E7A60034 */ swc1 $f6, 0x34($sp) +/* EF2AEC 802404DC AFA20010 */ sw $v0, 0x10($sp) +/* EF2AF0 802404E0 8E040080 */ lw $a0, 0x80($s0) +/* EF2AF4 802404E4 0C03908F */ jal func_800E423C +/* EF2AF8 802404E8 27A70030 */ addiu $a3, $sp, 0x30 +.L802404EC: +/* EF2AFC 802404EC 10400007 */ beqz $v0, .L8024050C +/* EF2B00 802404F0 00000000 */ nop +/* EF2B04 802404F4 4616A082 */ mul.s $f2, $f20, $f22 +/* EF2B08 802404F8 00000000 */ nop +/* EF2B0C 802404FC C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EF2B10 80240500 461A0000 */ add.s $f0, $f0, $f26 +/* EF2B14 80240504 08090146 */ j .L80240518 +/* EF2B18 80240508 46020000 */ add.s $f0, $f0, $f2 +.L8024050C: +/* EF2B1C 8024050C 4616A002 */ mul.s $f0, $f20, $f22 +/* EF2B20 80240510 00000000 */ nop +/* EF2B24 80240514 4600C000 */ add.s $f0, $f24, $f0 +.L80240518: +/* EF2B28 80240518 E600003C */ swc1 $f0, 0x3c($s0) +/* EF2B2C 8024051C 8E220074 */ lw $v0, 0x74($s1) +/* EF2B30 80240520 2442000A */ addiu $v0, $v0, 0xa +/* EF2B34 80240524 44826000 */ mtc1 $v0, $f12 +/* EF2B38 80240528 00000000 */ nop +/* EF2B3C 8024052C 0C00AB85 */ jal func_8002AE14 +/* EF2B40 80240530 46806320 */ cvt.s.w $f12, $f12 +/* EF2B44 80240534 4600020D */ trunc.w.s $f8, $f0 +/* EF2B48 80240538 E6280074 */ swc1 $f8, 0x74($s1) +.L8024053C: +/* EF2B4C 8024053C 8E220090 */ lw $v0, 0x90($s1) +/* EF2B50 80240540 1C40004A */ bgtz $v0, .L8024066C +/* EF2B54 80240544 2442FFFF */ addiu $v0, $v0, -1 +/* EF2B58 80240548 8E430014 */ lw $v1, 0x14($s2) +/* EF2B5C 8024054C 04600048 */ bltz $v1, .L80240670 +/* EF2B60 80240550 00000000 */ nop +/* EF2B64 80240554 8E620074 */ lw $v0, 0x74($s3) +/* EF2B68 80240558 1C400042 */ bgtz $v0, .L80240664 +/* EF2B6C 8024055C 2442FFFF */ addiu $v0, $v0, -1 +/* EF2B70 80240560 AE630074 */ sw $v1, 0x74($s3) +/* EF2B74 80240564 860200A8 */ lh $v0, 0xa8($s0) +/* EF2B78 80240568 C602003C */ lwc1 $f2, 0x3c($s0) +/* EF2B7C 8024056C 44820000 */ mtc1 $v0, $f0 +/* EF2B80 80240570 00000000 */ nop +/* EF2B84 80240574 46800020 */ cvt.s.w $f0, $f0 +/* EF2B88 80240578 46001080 */ add.s $f2, $f2, $f0 +/* EF2B8C 8024057C 3C014024 */ lui $at, 0x4024 +/* EF2B90 80240580 44810800 */ mtc1 $at, $f1 +/* EF2B94 80240584 44800000 */ mtc1 $zero, $f0 +/* EF2B98 80240588 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EF2B9C 8024058C 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EF2BA0 80240590 460010A1 */ cvt.d.s $f2, $f2 +/* EF2BA4 80240594 46201080 */ add.d $f2, $f2, $f0 +/* EF2BA8 80240598 C440002C */ lwc1 $f0, 0x2c($v0) +/* EF2BAC 8024059C 46000021 */ cvt.d.s $f0, $f0 +/* EF2BB0 802405A0 4622003C */ c.lt.d $f0, $f2 +/* EF2BB4 802405A4 00000000 */ nop +/* EF2BB8 802405A8 4500002C */ bc1f .L8024065C +/* EF2BBC 802405AC 02A0202D */ daddu $a0, $s5, $zero +/* EF2BC0 802405B0 AFA00010 */ sw $zero, 0x10($sp) +/* EF2BC4 802405B4 8E46000C */ lw $a2, 0xc($s2) +/* EF2BC8 802405B8 8E470010 */ lw $a3, 0x10($s2) +/* EF2BCC 802405BC 0C013469 */ jal func_8004D1A4 +/* EF2BD0 802405C0 0220282D */ daddu $a1, $s1, $zero +/* EF2BD4 802405C4 10400025 */ beqz $v0, .L8024065C +/* EF2BD8 802405C8 0000202D */ daddu $a0, $zero, $zero +/* EF2BDC 802405CC 0200282D */ daddu $a1, $s0, $zero +/* EF2BE0 802405D0 0000302D */ daddu $a2, $zero, $zero +/* EF2BE4 802405D4 2412000C */ addiu $s2, $zero, 0xc +/* EF2BE8 802405D8 860300A8 */ lh $v1, 0xa8($s0) +/* EF2BEC 802405DC 3C013F80 */ lui $at, 0x3f80 +/* EF2BF0 802405E0 44810000 */ mtc1 $at, $f0 +/* EF2BF4 802405E4 3C014000 */ lui $at, 0x4000 +/* EF2BF8 802405E8 44811000 */ mtc1 $at, $f2 +/* EF2BFC 802405EC 3C01C1A0 */ lui $at, 0xc1a0 +/* EF2C00 802405F0 44812000 */ mtc1 $at, $f4 +/* EF2C04 802405F4 44834000 */ mtc1 $v1, $f8 +/* EF2C08 802405F8 00000000 */ nop +/* EF2C0C 802405FC 46804220 */ cvt.s.w $f8, $f8 +/* EF2C10 80240600 44074000 */ mfc1 $a3, $f8 +/* EF2C14 80240604 27A20038 */ addiu $v0, $sp, 0x38 +/* EF2C18 80240608 AFB2001C */ sw $s2, 0x1c($sp) +/* EF2C1C 8024060C AFA20020 */ sw $v0, 0x20($sp) +/* EF2C20 80240610 E7A00010 */ swc1 $f0, 0x10($sp) +/* EF2C24 80240614 E7A20014 */ swc1 $f2, 0x14($sp) +/* EF2C28 80240618 0C01D444 */ jal func_80075110 +/* EF2C2C 8024061C E7A40018 */ swc1 $f4, 0x18($sp) +/* EF2C30 80240620 0200202D */ daddu $a0, $s0, $zero +/* EF2C34 80240624 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EF2C38 80240628 C480003C */ lwc1 $f0, 0x3c($a0) +/* EF2C3C 8024062C 3C060020 */ lui $a2, 0x20 +/* EF2C40 80240630 0C013600 */ jal func_8004D800 +/* EF2C44 80240634 E4800064 */ swc1 $f0, 0x64($a0) +/* EF2C48 80240638 8E220018 */ lw $v0, 0x18($s1) +/* EF2C4C 8024063C 9442002A */ lhu $v0, 0x2a($v0) +/* EF2C50 80240640 30420001 */ andi $v0, $v0, 1 +/* EF2C54 80240644 10400003 */ beqz $v0, .L80240654 +/* EF2C58 80240648 2402000A */ addiu $v0, $zero, 0xa +/* EF2C5C 8024064C 08090205 */ j .L80240814 +/* EF2C60 80240650 AE620070 */ sw $v0, 0x70($s3) +.L80240654: +/* EF2C64 80240654 08090205 */ j .L80240814 +/* EF2C68 80240658 AE720070 */ sw $s2, 0x70($s3) +.L8024065C: +/* EF2C6C 8024065C 8E620074 */ lw $v0, 0x74($s3) +/* EF2C70 80240660 2442FFFF */ addiu $v0, $v0, -1 +.L80240664: +/* EF2C74 80240664 0809019C */ j .L80240670 +/* EF2C78 80240668 AE620074 */ sw $v0, 0x74($s3) +.L8024066C: +/* EF2C7C 8024066C AE220090 */ sw $v0, 0x90($s1) +.L80240670: +/* EF2C80 80240670 8E2300D0 */ lw $v1, 0xd0($s1) +/* EF2C84 80240674 C6000040 */ lwc1 $f0, 0x40($s0) +/* EF2C88 80240678 C4620000 */ lwc1 $f2, ($v1) +/* EF2C8C 8024067C 468010A0 */ cvt.s.w $f2, $f2 +/* EF2C90 80240680 C4640008 */ lwc1 $f4, 8($v1) +/* EF2C94 80240684 46802120 */ cvt.s.w $f4, $f4 +/* EF2C98 80240688 E7A00010 */ swc1 $f0, 0x10($sp) +/* EF2C9C 8024068C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF2CA0 80240690 44051000 */ mfc1 $a1, $f2 +/* EF2CA4 80240694 C440000C */ lwc1 $f0, 0xc($v0) +/* EF2CA8 80240698 46800020 */ cvt.s.w $f0, $f0 +/* EF2CAC 8024069C E7A00014 */ swc1 $f0, 0x14($sp) +/* EF2CB0 802406A0 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF2CB4 802406A4 44062000 */ mfc1 $a2, $f4 +/* EF2CB8 802406A8 C4400010 */ lwc1 $f0, 0x10($v0) +/* EF2CBC 802406AC 46800020 */ cvt.s.w $f0, $f0 +/* EF2CC0 802406B0 E7A00018 */ swc1 $f0, 0x18($sp) +/* EF2CC4 802406B4 8C640018 */ lw $a0, 0x18($v1) +/* EF2CC8 802406B8 0C013431 */ jal func_8004D0C4 +/* EF2CCC 802406BC 8E070038 */ lw $a3, 0x38($s0) +/* EF2CD0 802406C0 1040001A */ beqz $v0, .L8024072C +/* EF2CD4 802406C4 00000000 */ nop +/* EF2CD8 802406C8 8E060038 */ lw $a2, 0x38($s0) +/* EF2CDC 802406CC 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF2CE0 802406D0 8E070040 */ lw $a3, 0x40($s0) +/* EF2CE4 802406D4 C44C0000 */ lwc1 $f12, ($v0) +/* EF2CE8 802406D8 46806320 */ cvt.s.w $f12, $f12 +/* EF2CEC 802406DC C44E0008 */ lwc1 $f14, 8($v0) +/* EF2CF0 802406E0 0C00AC71 */ jal func_8002B1C4 +/* EF2CF4 802406E4 468073A0 */ cvt.s.w $f14, $f14 +/* EF2CF8 802406E8 C6020018 */ lwc1 $f2, 0x18($s0) +/* EF2CFC 802406EC 4600103C */ c.lt.s $f2, $f0 +/* EF2D00 802406F0 00000000 */ nop +/* EF2D04 802406F4 4500000D */ bc1f .L8024072C +/* EF2D08 802406F8 E7A00034 */ swc1 $f0, 0x34($sp) +/* EF2D0C 802406FC C60C0038 */ lwc1 $f12, 0x38($s0) +/* EF2D10 80240700 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF2D14 80240704 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EF2D18 80240708 C4480000 */ lwc1 $f8, ($v0) +/* EF2D1C 8024070C 46804220 */ cvt.s.w $f8, $f8 +/* EF2D20 80240710 44064000 */ mfc1 $a2, $f8 +/* EF2D24 80240714 C4480008 */ lwc1 $f8, 8($v0) +/* EF2D28 80240718 46804220 */ cvt.s.w $f8, $f8 +/* EF2D2C 8024071C 44074000 */ mfc1 $a3, $f8 +/* EF2D30 80240720 0C00ABDC */ jal fio_validate_header_checksums +/* EF2D34 80240724 24140001 */ addiu $s4, $zero, 1 +/* EF2D38 80240728 E600000C */ swc1 $f0, 0xc($s0) +.L8024072C: +/* EF2D3C 8024072C 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF2D40 80240730 8C43000C */ lw $v1, 0xc($v0) +/* EF2D44 80240734 8C420010 */ lw $v0, 0x10($v0) +/* EF2D48 80240738 00621825 */ or $v1, $v1, $v0 +/* EF2D4C 8024073C 00741825 */ or $v1, $v1, $s4 +/* EF2D50 80240740 10600008 */ beqz $v1, .L80240764 +/* EF2D54 80240744 00000000 */ nop +/* EF2D58 80240748 8602008C */ lh $v0, 0x8c($s0) +/* EF2D5C 8024074C 14400031 */ bnez $v0, .L80240814 +/* EF2D60 80240750 00000000 */ nop +/* EF2D64 80240754 8E050018 */ lw $a1, 0x18($s0) +/* EF2D68 80240758 8E06000C */ lw $a2, 0xc($s0) +/* EF2D6C 8024075C 0C00F909 */ jal func_8003E424 +/* EF2D70 80240760 0200202D */ daddu $a0, $s0, $zero +.L80240764: +/* EF2D74 80240764 C600003C */ lwc1 $f0, 0x3c($s0) +/* EF2D78 80240768 3C014059 */ lui $at, 0x4059 +/* EF2D7C 8024076C 44811800 */ mtc1 $at, $f3 +/* EF2D80 80240770 44801000 */ mtc1 $zero, $f2 +/* EF2D84 80240774 46000021 */ cvt.d.s $f0, $f0 +/* EF2D88 80240778 46220002 */ mul.d $f0, $f0, $f2 +/* EF2D8C 8024077C 00000000 */ nop +/* EF2D90 80240780 4620020D */ trunc.w.d $f8, $f0 +/* EF2D94 80240784 E628007C */ swc1 $f8, 0x7c($s1) +/* EF2D98 80240788 8E420004 */ lw $v0, 4($s2) +/* EF2D9C 8024078C 18400021 */ blez $v0, .L80240814 +/* EF2DA0 80240790 00000000 */ nop +/* EF2DA4 80240794 8602008E */ lh $v0, 0x8e($s0) +/* EF2DA8 80240798 9603008E */ lhu $v1, 0x8e($s0) +/* EF2DAC 8024079C 18400005 */ blez $v0, .L802407B4 +/* EF2DB0 802407A0 2462FFFF */ addiu $v0, $v1, -1 +/* EF2DB4 802407A4 A602008E */ sh $v0, 0x8e($s0) +/* EF2DB8 802407A8 00021400 */ sll $v0, $v0, 0x10 +/* EF2DBC 802407AC 1C400019 */ bgtz $v0, .L80240814 +/* EF2DC0 802407B0 00000000 */ nop +.L802407B4: +/* EF2DC4 802407B4 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EF2DC8 802407B8 24020002 */ addiu $v0, $zero, 2 +/* EF2DCC 802407BC 0C00AB3B */ jal func_8002ACEC +/* EF2DD0 802407C0 AE620070 */ sw $v0, 0x70($s3) +/* EF2DD4 802407C4 3C035555 */ lui $v1, 0x5555 +/* EF2DD8 802407C8 34635556 */ ori $v1, $v1, 0x5556 +/* EF2DDC 802407CC 00430018 */ mult $v0, $v1 +/* EF2DE0 802407D0 000227C3 */ sra $a0, $v0, 0x1f +/* EF2DE4 802407D4 00004010 */ mfhi $t0 +/* EF2DE8 802407D8 01042023 */ subu $a0, $t0, $a0 +/* EF2DEC 802407DC 00041840 */ sll $v1, $a0, 1 +/* EF2DF0 802407E0 00641821 */ addu $v1, $v1, $a0 +/* EF2DF4 802407E4 00431023 */ subu $v0, $v0, $v1 +/* EF2DF8 802407E8 24430002 */ addiu $v1, $v0, 2 +/* EF2DFC 802407EC AE630074 */ sw $v1, 0x74($s3) +/* EF2E00 802407F0 8E42002C */ lw $v0, 0x2c($s2) +/* EF2E04 802407F4 58400007 */ blezl $v0, .L80240814 +/* EF2E08 802407F8 AE600070 */ sw $zero, 0x70($s3) +/* EF2E0C 802407FC 8E420008 */ lw $v0, 8($s2) +/* EF2E10 80240800 18400003 */ blez $v0, .L80240810 +/* EF2E14 80240804 28620003 */ slti $v0, $v1, 3 +/* EF2E18 80240808 10400002 */ beqz $v0, .L80240814 +/* EF2E1C 8024080C 00000000 */ nop +.L80240810: +/* EF2E20 80240810 AE600070 */ sw $zero, 0x70($s3) +.L80240814: +/* EF2E24 80240814 8FBF0058 */ lw $ra, 0x58($sp) +/* EF2E28 80240818 8FB50054 */ lw $s5, 0x54($sp) +/* EF2E2C 8024081C 8FB40050 */ lw $s4, 0x50($sp) +/* EF2E30 80240820 8FB3004C */ lw $s3, 0x4c($sp) +/* EF2E34 80240824 8FB20048 */ lw $s2, 0x48($sp) +/* EF2E38 80240828 8FB10044 */ lw $s1, 0x44($sp) +/* EF2E3C 8024082C 8FB00040 */ lw $s0, 0x40($sp) +/* EF2E40 80240830 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* EF2E44 80240834 D7B80070 */ ldc1 $f24, 0x70($sp) +/* EF2E48 80240838 D7B60068 */ ldc1 $f22, 0x68($sp) +/* EF2E4C 8024083C D7B40060 */ ldc1 $f20, 0x60($sp) +/* EF2E50 80240840 03E00008 */ jr $ra +/* EF2E54 80240844 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/code_EF2680/func_80240848_EF2E58.s b/asm/nonmatchings/code_EF2680/func_80240848_EF2E58.s new file mode 100644 index 0000000000..9ae482182a --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80240848_EF2E58.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240848_EF2E58 +/* EF2E58 80240848 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EF2E5C 8024084C AFB3001C */ sw $s3, 0x1c($sp) +/* EF2E60 80240850 0080982D */ daddu $s3, $a0, $zero +/* EF2E64 80240854 AFBF0020 */ sw $ra, 0x20($sp) +/* EF2E68 80240858 AFB20018 */ sw $s2, 0x18($sp) +/* EF2E6C 8024085C AFB10014 */ sw $s1, 0x14($sp) +/* EF2E70 80240860 AFB00010 */ sw $s0, 0x10($sp) +/* EF2E74 80240864 8E720148 */ lw $s2, 0x148($s3) +/* EF2E78 80240868 86440008 */ lh $a0, 8($s2) +/* EF2E7C 8024086C 0C00F92F */ jal func_8003E4BC +/* EF2E80 80240870 00A0882D */ daddu $s1, $a1, $zero +/* EF2E84 80240874 8E240008 */ lw $a0, 8($s1) +/* EF2E88 80240878 0040802D */ daddu $s0, $v0, $zero +/* EF2E8C 8024087C 00041FC2 */ srl $v1, $a0, 0x1f +/* EF2E90 80240880 00832021 */ addu $a0, $a0, $v1 +/* EF2E94 80240884 00042043 */ sra $a0, $a0, 1 +/* EF2E98 80240888 0C00AB3B */ jal func_8002ACEC +/* EF2E9C 8024088C 24840001 */ addiu $a0, $a0, 1 +/* EF2EA0 80240890 8E230008 */ lw $v1, 8($s1) +/* EF2EA4 80240894 240400B4 */ addiu $a0, $zero, 0xb4 +/* EF2EA8 80240898 00032FC2 */ srl $a1, $v1, 0x1f +/* EF2EAC 8024089C 00651821 */ addu $v1, $v1, $a1 +/* EF2EB0 802408A0 00031843 */ sra $v1, $v1, 1 +/* EF2EB4 802408A4 00621821 */ addu $v1, $v1, $v0 +/* EF2EB8 802408A8 0C00AB3B */ jal func_8002ACEC +/* EF2EBC 802408AC A603008E */ sh $v1, 0x8e($s0) +/* EF2EC0 802408B0 C60C000C */ lwc1 $f12, 0xc($s0) +/* EF2EC4 802408B4 44820000 */ mtc1 $v0, $f0 +/* EF2EC8 802408B8 00000000 */ nop +/* EF2ECC 802408BC 46800020 */ cvt.s.w $f0, $f0 +/* EF2ED0 802408C0 46006300 */ add.s $f12, $f12, $f0 +/* EF2ED4 802408C4 3C0142B4 */ lui $at, 0x42b4 +/* EF2ED8 802408C8 44810000 */ mtc1 $at, $f0 +/* EF2EDC 802408CC 0C00AB85 */ jal func_8002AE14 +/* EF2EE0 802408D0 46006301 */ sub.s $f12, $f12, $f0 +/* EF2EE4 802408D4 E600000C */ swc1 $f0, 0xc($s0) +/* EF2EE8 802408D8 8E4200CC */ lw $v0, 0xcc($s2) +/* EF2EEC 802408DC 8C420000 */ lw $v0, ($v0) +/* EF2EF0 802408E0 AE020028 */ sw $v0, 0x28($s0) +/* EF2EF4 802408E4 24020003 */ addiu $v0, $zero, 3 +/* EF2EF8 802408E8 AE620070 */ sw $v0, 0x70($s3) +/* EF2EFC 802408EC 8FBF0020 */ lw $ra, 0x20($sp) +/* EF2F00 802408F0 8FB3001C */ lw $s3, 0x1c($sp) +/* EF2F04 802408F4 8FB20018 */ lw $s2, 0x18($sp) +/* EF2F08 802408F8 8FB10014 */ lw $s1, 0x14($sp) +/* EF2F0C 802408FC 8FB00010 */ lw $s0, 0x10($sp) +/* EF2F10 80240900 03E00008 */ jr $ra +/* EF2F14 80240904 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EF2680/func_80240908_EF2F18.s b/asm/nonmatchings/code_EF2680/func_80240908_EF2F18.s new file mode 100644 index 0000000000..336d390d54 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80240908_EF2F18.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240908_EF2F18 +/* EF2F18 80240908 27BDFF88 */ addiu $sp, $sp, -0x78 +/* EF2F1C 8024090C AFB3004C */ sw $s3, 0x4c($sp) +/* EF2F20 80240910 0080982D */ daddu $s3, $a0, $zero +/* EF2F24 80240914 AFBF0054 */ sw $ra, 0x54($sp) +/* EF2F28 80240918 AFB40050 */ sw $s4, 0x50($sp) +/* EF2F2C 8024091C AFB20048 */ sw $s2, 0x48($sp) +/* EF2F30 80240920 AFB10044 */ sw $s1, 0x44($sp) +/* EF2F34 80240924 AFB00040 */ sw $s0, 0x40($sp) +/* EF2F38 80240928 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* EF2F3C 8024092C F7B80068 */ sdc1 $f24, 0x68($sp) +/* EF2F40 80240930 F7B60060 */ sdc1 $f22, 0x60($sp) +/* EF2F44 80240934 F7B40058 */ sdc1 $f20, 0x58($sp) +/* EF2F48 80240938 8E710148 */ lw $s1, 0x148($s3) +/* EF2F4C 8024093C 00A0902D */ daddu $s2, $a1, $zero +/* EF2F50 80240940 86240008 */ lh $a0, 8($s1) +/* EF2F54 80240944 0C00F92F */ jal func_8003E4BC +/* EF2F58 80240948 00C0A02D */ daddu $s4, $a2, $zero +/* EF2F5C 8024094C 0040802D */ daddu $s0, $v0, $zero +/* EF2F60 80240950 C6200078 */ lwc1 $f0, 0x78($s1) +/* EF2F64 80240954 46800020 */ cvt.s.w $f0, $f0 +/* EF2F68 80240958 46000021 */ cvt.d.s $f0, $f0 +/* EF2F6C 8024095C 3C014059 */ lui $at, 0x4059 +/* EF2F70 80240960 44811800 */ mtc1 $at, $f3 +/* EF2F74 80240964 44801000 */ mtc1 $zero, $f2 +/* EF2F78 80240968 8602008E */ lh $v0, 0x8e($s0) +/* EF2F7C 8024096C 9603008E */ lhu $v1, 0x8e($s0) +/* EF2F80 80240970 46220003 */ div.d $f0, $f0, $f2 +/* EF2F84 80240974 46200620 */ cvt.s.d $f24, $f0 +/* EF2F88 80240978 C6200088 */ lwc1 $f0, 0x88($s1) +/* EF2F8C 8024097C 46800020 */ cvt.s.w $f0, $f0 +/* EF2F90 80240980 46000021 */ cvt.d.s $f0, $f0 +/* EF2F94 80240984 46220003 */ div.d $f0, $f0, $f2 +/* EF2F98 80240988 46200020 */ cvt.s.d $f0, $f0 +/* EF2F9C 8024098C 18400003 */ blez $v0, .L8024099C +/* EF2FA0 80240990 4600C680 */ add.s $f26, $f24, $f0 +/* EF2FA4 80240994 2462FFFF */ addiu $v0, $v1, -1 +/* EF2FA8 80240998 A602008E */ sh $v0, 0x8e($s0) +.L8024099C: +/* EF2FAC 8024099C 8E220070 */ lw $v0, 0x70($s1) +/* EF2FB0 802409A0 18400034 */ blez $v0, .L80240A74 +/* EF2FB4 802409A4 00000000 */ nop +/* EF2FB8 802409A8 C62C0074 */ lwc1 $f12, 0x74($s1) +/* EF2FBC 802409AC 46806320 */ cvt.s.w $f12, $f12 +/* EF2FC0 802409B0 44820000 */ mtc1 $v0, $f0 +/* EF2FC4 802409B4 00000000 */ nop +/* EF2FC8 802409B8 46800020 */ cvt.s.w $f0, $f0 +/* EF2FCC 802409BC 46000021 */ cvt.d.s $f0, $f0 +/* EF2FD0 802409C0 46220003 */ div.d $f0, $f0, $f2 +/* EF2FD4 802409C4 0C00AD77 */ jal func_8002B5DC +/* EF2FD8 802409C8 462005A0 */ cvt.s.d $f22, $f0 +/* EF2FDC 802409CC 8E020000 */ lw $v0, ($s0) +/* EF2FE0 802409D0 30420008 */ andi $v0, $v0, 8 +/* EF2FE4 802409D4 10400003 */ beqz $v0, .L802409E4 +/* EF2FE8 802409D8 46000506 */ mov.s $f20, $f0 +/* EF2FEC 802409DC 08090289 */ j .L80240A24 +/* EF2FF0 802409E0 0000102D */ daddu $v0, $zero, $zero +.L802409E4: +/* EF2FF4 802409E4 27A50028 */ addiu $a1, $sp, 0x28 +/* EF2FF8 802409E8 27A6002C */ addiu $a2, $sp, 0x2c +/* EF2FFC 802409EC C6000038 */ lwc1 $f0, 0x38($s0) +/* EF3000 802409F0 C602003C */ lwc1 $f2, 0x3c($s0) +/* EF3004 802409F4 C6040040 */ lwc1 $f4, 0x40($s0) +/* EF3008 802409F8 3C01447A */ lui $at, 0x447a +/* EF300C 802409FC 44813000 */ mtc1 $at, $f6 +/* EF3010 80240A00 27A20034 */ addiu $v0, $sp, 0x34 +/* EF3014 80240A04 E7A00028 */ swc1 $f0, 0x28($sp) +/* EF3018 80240A08 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EF301C 80240A0C E7A40030 */ swc1 $f4, 0x30($sp) +/* EF3020 80240A10 E7A60034 */ swc1 $f6, 0x34($sp) +/* EF3024 80240A14 AFA20010 */ sw $v0, 0x10($sp) +/* EF3028 80240A18 8E040080 */ lw $a0, 0x80($s0) +/* EF302C 80240A1C 0C03908F */ jal func_800E423C +/* EF3030 80240A20 27A70030 */ addiu $a3, $sp, 0x30 +.L80240A24: +/* EF3034 80240A24 10400007 */ beqz $v0, .L80240A44 +/* EF3038 80240A28 00000000 */ nop +/* EF303C 80240A2C 4616A082 */ mul.s $f2, $f20, $f22 +/* EF3040 80240A30 00000000 */ nop +/* EF3044 80240A34 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EF3048 80240A38 46180000 */ add.s $f0, $f0, $f24 +/* EF304C 80240A3C 08090294 */ j .L80240A50 +/* EF3050 80240A40 46020000 */ add.s $f0, $f0, $f2 +.L80240A44: +/* EF3054 80240A44 4616A002 */ mul.s $f0, $f20, $f22 +/* EF3058 80240A48 00000000 */ nop +/* EF305C 80240A4C 4600D000 */ add.s $f0, $f26, $f0 +.L80240A50: +/* EF3060 80240A50 E600003C */ swc1 $f0, 0x3c($s0) +/* EF3064 80240A54 8E220074 */ lw $v0, 0x74($s1) +/* EF3068 80240A58 2442000A */ addiu $v0, $v0, 0xa +/* EF306C 80240A5C 44826000 */ mtc1 $v0, $f12 +/* EF3070 80240A60 00000000 */ nop +/* EF3074 80240A64 0C00AB85 */ jal func_8002AE14 +/* EF3078 80240A68 46806320 */ cvt.s.w $f12, $f12 +/* EF307C 80240A6C 4600020D */ trunc.w.s $f8, $f0 +/* EF3080 80240A70 E6280074 */ swc1 $f8, 0x74($s1) +.L80240A74: +/* EF3084 80240A74 8E220090 */ lw $v0, 0x90($s1) +/* EF3088 80240A78 1C400040 */ bgtz $v0, .L80240B7C +/* EF308C 80240A7C 2442FFFF */ addiu $v0, $v0, -1 +/* EF3090 80240A80 860200A8 */ lh $v0, 0xa8($s0) +/* EF3094 80240A84 C600003C */ lwc1 $f0, 0x3c($s0) +/* EF3098 80240A88 44821000 */ mtc1 $v0, $f2 +/* EF309C 80240A8C 00000000 */ nop +/* EF30A0 80240A90 468010A0 */ cvt.s.w $f2, $f2 +/* EF30A4 80240A94 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EF30A8 80240A98 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EF30AC 80240A9C 46020000 */ add.s $f0, $f0, $f2 +/* EF30B0 80240AA0 3C014024 */ lui $at, 0x4024 +/* EF30B4 80240AA4 44812800 */ mtc1 $at, $f5 +/* EF30B8 80240AA8 44802000 */ mtc1 $zero, $f4 +/* EF30BC 80240AAC C442002C */ lwc1 $f2, 0x2c($v0) +/* EF30C0 80240AB0 46000021 */ cvt.d.s $f0, $f0 +/* EF30C4 80240AB4 46240000 */ add.d $f0, $f0, $f4 +/* EF30C8 80240AB8 460010A1 */ cvt.d.s $f2, $f2 +/* EF30CC 80240ABC 4620103C */ c.lt.d $f2, $f0 +/* EF30D0 80240AC0 00000000 */ nop +/* EF30D4 80240AC4 4500002E */ bc1f .L80240B80 +/* EF30D8 80240AC8 0280202D */ daddu $a0, $s4, $zero +/* EF30DC 80240ACC 24020001 */ addiu $v0, $zero, 1 +/* EF30E0 80240AD0 AFA20010 */ sw $v0, 0x10($sp) +/* EF30E4 80240AD4 8E460024 */ lw $a2, 0x24($s2) +/* EF30E8 80240AD8 8E470028 */ lw $a3, 0x28($s2) +/* EF30EC 80240ADC 0C013469 */ jal func_8004D1A4 +/* EF30F0 80240AE0 0220282D */ daddu $a1, $s1, $zero +/* EF30F4 80240AE4 10400026 */ beqz $v0, .L80240B80 +/* EF30F8 80240AE8 0000202D */ daddu $a0, $zero, $zero +/* EF30FC 80240AEC 0200282D */ daddu $a1, $s0, $zero +/* EF3100 80240AF0 0000302D */ daddu $a2, $zero, $zero +/* EF3104 80240AF4 2412000C */ addiu $s2, $zero, 0xc +/* EF3108 80240AF8 860300A8 */ lh $v1, 0xa8($s0) +/* EF310C 80240AFC 3C013F80 */ lui $at, 0x3f80 +/* EF3110 80240B00 44810000 */ mtc1 $at, $f0 +/* EF3114 80240B04 3C014000 */ lui $at, 0x4000 +/* EF3118 80240B08 44811000 */ mtc1 $at, $f2 +/* EF311C 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 +/* EF3120 80240B10 44812000 */ mtc1 $at, $f4 +/* EF3124 80240B14 44834000 */ mtc1 $v1, $f8 +/* EF3128 80240B18 00000000 */ nop +/* EF312C 80240B1C 46804220 */ cvt.s.w $f8, $f8 +/* EF3130 80240B20 44074000 */ mfc1 $a3, $f8 +/* EF3134 80240B24 27A20038 */ addiu $v0, $sp, 0x38 +/* EF3138 80240B28 AFB2001C */ sw $s2, 0x1c($sp) +/* EF313C 80240B2C AFA20020 */ sw $v0, 0x20($sp) +/* EF3140 80240B30 E7A00010 */ swc1 $f0, 0x10($sp) +/* EF3144 80240B34 E7A20014 */ swc1 $f2, 0x14($sp) +/* EF3148 80240B38 0C01D444 */ jal func_80075110 +/* EF314C 80240B3C E7A40018 */ swc1 $f4, 0x18($sp) +/* EF3150 80240B40 0200202D */ daddu $a0, $s0, $zero +/* EF3154 80240B44 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EF3158 80240B48 C480003C */ lwc1 $f0, 0x3c($a0) +/* EF315C 80240B4C 3C060020 */ lui $a2, 0x20 +/* EF3160 80240B50 0C013600 */ jal func_8004D800 +/* EF3164 80240B54 E4800064 */ swc1 $f0, 0x64($a0) +/* EF3168 80240B58 8E220018 */ lw $v0, 0x18($s1) +/* EF316C 80240B5C 9442002A */ lhu $v0, 0x2a($v0) +/* EF3170 80240B60 30420001 */ andi $v0, $v0, 1 +/* EF3174 80240B64 10400003 */ beqz $v0, .L80240B74 +/* EF3178 80240B68 2402000A */ addiu $v0, $zero, 0xa +/* EF317C 80240B6C 08090307 */ j .L80240C1C +/* EF3180 80240B70 AE620070 */ sw $v0, 0x70($s3) +.L80240B74: +/* EF3184 80240B74 08090307 */ j .L80240C1C +/* EF3188 80240B78 AE720070 */ sw $s2, 0x70($s3) +.L80240B7C: +/* EF318C 80240B7C AE220090 */ sw $v0, 0x90($s1) +.L80240B80: +/* EF3190 80240B80 8602008C */ lh $v0, 0x8c($s0) +/* EF3194 80240B84 14400025 */ bnez $v0, .L80240C1C +/* EF3198 80240B88 00000000 */ nop +/* EF319C 80240B8C 8602008E */ lh $v0, 0x8e($s0) +/* EF31A0 80240B90 1C400022 */ bgtz $v0, .L80240C1C +/* EF31A4 80240B94 00000000 */ nop +/* EF31A8 80240B98 8E620074 */ lw $v0, 0x74($s3) +/* EF31AC 80240B9C 2442FFFF */ addiu $v0, $v0, -1 +/* EF31B0 80240BA0 1840001D */ blez $v0, .L80240C18 +/* EF31B4 80240BA4 AE620074 */ sw $v0, 0x74($s3) +/* EF31B8 80240BA8 8E220018 */ lw $v0, 0x18($s1) +/* EF31BC 80240BAC 9442002A */ lhu $v0, 0x2a($v0) +/* EF31C0 80240BB0 30420010 */ andi $v0, $v0, 0x10 +/* EF31C4 80240BB4 14400007 */ bnez $v0, .L80240BD4 +/* EF31C8 80240BB8 00000000 */ nop +/* EF31CC 80240BBC C600000C */ lwc1 $f0, 0xc($s0) +/* EF31D0 80240BC0 3C014334 */ lui $at, 0x4334 +/* EF31D4 80240BC4 44816000 */ mtc1 $at, $f12 +/* EF31D8 80240BC8 0C00AB85 */ jal func_8002AE14 +/* EF31DC 80240BCC 460C0300 */ add.s $f12, $f0, $f12 +/* EF31E0 80240BD0 E600000C */ swc1 $f0, 0xc($s0) +.L80240BD4: +/* EF31E4 80240BD4 0C00AB3B */ jal func_8002ACEC +/* EF31E8 80240BD8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EF31EC 80240BDC 3C032E8B */ lui $v1, 0x2e8b +/* EF31F0 80240BE0 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* EF31F4 80240BE4 00430018 */ mult $v0, $v1 +/* EF31F8 80240BE8 00021FC3 */ sra $v1, $v0, 0x1f +/* EF31FC 80240BEC 00004010 */ mfhi $t0 +/* EF3200 80240BF0 00082043 */ sra $a0, $t0, 1 +/* EF3204 80240BF4 00832023 */ subu $a0, $a0, $v1 +/* EF3208 80240BF8 00041840 */ sll $v1, $a0, 1 +/* EF320C 80240BFC 00641821 */ addu $v1, $v1, $a0 +/* EF3210 80240C00 00031880 */ sll $v1, $v1, 2 +/* EF3214 80240C04 00641823 */ subu $v1, $v1, $a0 +/* EF3218 80240C08 00431023 */ subu $v0, $v0, $v1 +/* EF321C 80240C0C 24420005 */ addiu $v0, $v0, 5 +/* EF3220 80240C10 08090307 */ j .L80240C1C +/* EF3224 80240C14 A602008E */ sh $v0, 0x8e($s0) +.L80240C18: +/* EF3228 80240C18 AE600070 */ sw $zero, 0x70($s3) +.L80240C1C: +/* EF322C 80240C1C 8FBF0054 */ lw $ra, 0x54($sp) +/* EF3230 80240C20 8FB40050 */ lw $s4, 0x50($sp) +/* EF3234 80240C24 8FB3004C */ lw $s3, 0x4c($sp) +/* EF3238 80240C28 8FB20048 */ lw $s2, 0x48($sp) +/* EF323C 80240C2C 8FB10044 */ lw $s1, 0x44($sp) +/* EF3240 80240C30 8FB00040 */ lw $s0, 0x40($sp) +/* EF3244 80240C34 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* EF3248 80240C38 D7B80068 */ ldc1 $f24, 0x68($sp) +/* EF324C 80240C3C D7B60060 */ ldc1 $f22, 0x60($sp) +/* EF3250 80240C40 D7B40058 */ ldc1 $f20, 0x58($sp) +/* EF3254 80240C44 03E00008 */ jr $ra +/* EF3258 80240C48 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/code_EF2680/func_80240C4C_EF325C.s b/asm/nonmatchings/code_EF2680/func_80240C4C_EF325C.s new file mode 100644 index 0000000000..643db2e52a --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80240C4C_EF325C.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C4C_EF325C +/* EF325C 80240C4C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EF3260 80240C50 AFB20018 */ sw $s2, 0x18($sp) +/* EF3264 80240C54 0080902D */ daddu $s2, $a0, $zero +/* EF3268 80240C58 AFBF001C */ sw $ra, 0x1c($sp) +/* EF326C 80240C5C AFB10014 */ sw $s1, 0x14($sp) +/* EF3270 80240C60 AFB00010 */ sw $s0, 0x10($sp) +/* EF3274 80240C64 8E510148 */ lw $s1, 0x148($s2) +/* EF3278 80240C68 0C00F92F */ jal func_8003E4BC +/* EF327C 80240C6C 86240008 */ lh $a0, 8($s1) +/* EF3280 80240C70 0040802D */ daddu $s0, $v0, $zero +/* EF3284 80240C74 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EF3288 80240C78 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EF328C 80240C7C C60C0038 */ lwc1 $f12, 0x38($s0) +/* EF3290 80240C80 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EF3294 80240C84 A600008E */ sh $zero, 0x8e($s0) +/* EF3298 80240C88 8C460028 */ lw $a2, 0x28($v0) +/* EF329C 80240C8C 0C00ABDC */ jal fio_validate_header_checksums +/* EF32A0 80240C90 8C470030 */ lw $a3, 0x30($v0) +/* EF32A4 80240C94 E600000C */ swc1 $f0, 0xc($s0) +/* EF32A8 80240C98 8E2200CC */ lw $v0, 0xcc($s1) +/* EF32AC 80240C9C 8C420020 */ lw $v0, 0x20($v0) +/* EF32B0 80240CA0 AE020028 */ sw $v0, 0x28($s0) +/* EF32B4 80240CA4 2402000B */ addiu $v0, $zero, 0xb +/* EF32B8 80240CA8 AE420070 */ sw $v0, 0x70($s2) +/* EF32BC 80240CAC 8FBF001C */ lw $ra, 0x1c($sp) +/* EF32C0 80240CB0 8FB20018 */ lw $s2, 0x18($sp) +/* EF32C4 80240CB4 8FB10014 */ lw $s1, 0x14($sp) +/* EF32C8 80240CB8 8FB00010 */ lw $s0, 0x10($sp) +/* EF32CC 80240CBC 03E00008 */ jr $ra +/* EF32D0 80240CC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EF2680/func_80240CC4_EF32D4.s b/asm/nonmatchings/code_EF2680/func_80240CC4_EF32D4.s new file mode 100644 index 0000000000..0f5931b229 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80240CC4_EF32D4.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CC4_EF32D4 +/* EF32D4 80240CC4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EF32D8 80240CC8 AFB00010 */ sw $s0, 0x10($sp) +/* EF32DC 80240CCC 0080802D */ daddu $s0, $a0, $zero +/* EF32E0 80240CD0 AFBF0014 */ sw $ra, 0x14($sp) +/* EF32E4 80240CD4 8E020148 */ lw $v0, 0x148($s0) +/* EF32E8 80240CD8 0C00F92F */ jal func_8003E4BC +/* EF32EC 80240CDC 84440008 */ lh $a0, 8($v0) +/* EF32F0 80240CE0 9443008E */ lhu $v1, 0x8e($v0) +/* EF32F4 80240CE4 C440003C */ lwc1 $f0, 0x3c($v0) +/* EF32F8 80240CE8 24640001 */ addiu $a0, $v1, 1 +/* EF32FC 80240CEC 00031C00 */ sll $v1, $v1, 0x10 +/* EF3300 80240CF0 00031B83 */ sra $v1, $v1, 0xe +/* EF3304 80240CF4 A444008E */ sh $a0, 0x8e($v0) +/* EF3308 80240CF8 3C018024 */ lui $at, %hi(D_802444BC) +/* EF330C 80240CFC 00230821 */ addu $at, $at, $v1 +/* EF3310 80240D00 C42244BC */ lwc1 $f2, %lo(D_802444BC)($at) +/* EF3314 80240D04 8443008E */ lh $v1, 0x8e($v0) +/* EF3318 80240D08 46020000 */ add.s $f0, $f0, $f2 +/* EF331C 80240D0C 28630005 */ slti $v1, $v1, 5 +/* EF3320 80240D10 14600003 */ bnez $v1, .L80240D20 +/* EF3324 80240D14 E440003C */ swc1 $f0, 0x3c($v0) +/* EF3328 80240D18 2402000C */ addiu $v0, $zero, 0xc +/* EF332C 80240D1C AE020070 */ sw $v0, 0x70($s0) +.L80240D20: +/* EF3330 80240D20 8FBF0014 */ lw $ra, 0x14($sp) +/* EF3334 80240D24 8FB00010 */ lw $s0, 0x10($sp) +/* EF3338 80240D28 03E00008 */ jr $ra +/* EF333C 80240D2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s b/asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s new file mode 100644 index 0000000000..a81ad579cd --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80240D30_EF3340.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D30_EF3340 +/* EF3340 80240D30 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EF3344 80240D34 AFB3001C */ sw $s3, 0x1c($sp) +/* EF3348 80240D38 0080982D */ daddu $s3, $a0, $zero +/* EF334C 80240D3C AFBF0020 */ sw $ra, 0x20($sp) +/* EF3350 80240D40 AFB20018 */ sw $s2, 0x18($sp) +/* EF3354 80240D44 AFB10014 */ sw $s1, 0x14($sp) +/* EF3358 80240D48 AFB00010 */ sw $s0, 0x10($sp) +/* EF335C 80240D4C 8E720148 */ lw $s2, 0x148($s3) +/* EF3360 80240D50 86440008 */ lh $a0, 8($s2) +/* EF3364 80240D54 0C00F92F */ jal func_8003E4BC +/* EF3368 80240D58 00A0802D */ daddu $s0, $a1, $zero +/* EF336C 80240D5C 0040882D */ daddu $s1, $v0, $zero +/* EF3370 80240D60 C6420080 */ lwc1 $f2, 0x80($s2) +/* EF3374 80240D64 468010A0 */ cvt.s.w $f2, $f2 +/* EF3378 80240D68 460010A1 */ cvt.d.s $f2, $f2 +/* EF337C 80240D6C C6400084 */ lwc1 $f0, 0x84($s2) +/* EF3380 80240D70 46800020 */ cvt.s.w $f0, $f0 +/* EF3384 80240D74 46000021 */ cvt.d.s $f0, $f0 +/* EF3388 80240D78 3C014059 */ lui $at, 0x4059 +/* EF338C 80240D7C 44812800 */ mtc1 $at, $f5 +/* EF3390 80240D80 44802000 */ mtc1 $zero, $f4 +/* EF3394 80240D84 8E4200CC */ lw $v0, 0xcc($s2) +/* EF3398 80240D88 C62C0038 */ lwc1 $f12, 0x38($s1) +/* EF339C 80240D8C C62E0040 */ lwc1 $f14, 0x40($s1) +/* EF33A0 80240D90 46241083 */ div.d $f2, $f2, $f4 +/* EF33A4 80240D94 462010A0 */ cvt.s.d $f2, $f2 +/* EF33A8 80240D98 46240003 */ div.d $f0, $f0, $f4 +/* EF33AC 80240D9C 8C420020 */ lw $v0, 0x20($v0) +/* EF33B0 80240DA0 46200020 */ cvt.s.d $f0, $f0 +/* EF33B4 80240DA4 E622001C */ swc1 $f2, 0x1c($s1) +/* EF33B8 80240DA8 E6200014 */ swc1 $f0, 0x14($s1) +/* EF33BC 80240DAC AE220028 */ sw $v0, 0x28($s1) +/* EF33C0 80240DB0 C6000018 */ lwc1 $f0, 0x18($s0) +/* EF33C4 80240DB4 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EF33C8 80240DB8 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EF33CC 80240DBC E6200018 */ swc1 $f0, 0x18($s1) +/* EF33D0 80240DC0 8C460028 */ lw $a2, 0x28($v0) +/* EF33D4 80240DC4 0C00ABDC */ jal fio_validate_header_checksums +/* EF33D8 80240DC8 8C470030 */ lw $a3, 0x30($v0) +/* EF33DC 80240DCC E620000C */ swc1 $f0, 0xc($s1) +/* EF33E0 80240DD0 8E420018 */ lw $v0, 0x18($s2) +/* EF33E4 80240DD4 AE400074 */ sw $zero, 0x74($s2) +/* EF33E8 80240DD8 9442002A */ lhu $v0, 0x2a($v0) +/* EF33EC 80240DDC 30420002 */ andi $v0, $v0, 2 +/* EF33F0 80240DE0 10400005 */ beqz $v0, .L80240DF8 +/* EF33F4 80240DE4 24020003 */ addiu $v0, $zero, 3 +/* EF33F8 80240DE8 A622008E */ sh $v0, 0x8e($s1) +/* EF33FC 80240DEC 2402000D */ addiu $v0, $zero, 0xd +/* EF3400 80240DF0 08090392 */ j .L80240E48 +/* EF3404 80240DF4 AE620070 */ sw $v0, 0x70($s3) +.L80240DF8: +/* EF3408 80240DF8 24030001 */ addiu $v1, $zero, 1 +/* EF340C 80240DFC 2402000E */ addiu $v0, $zero, 0xe +/* EF3410 80240E00 A623008E */ sh $v1, 0x8e($s1) +/* EF3414 80240E04 AE620070 */ sw $v0, 0x70($s3) +/* EF3418 80240E08 C6200038 */ lwc1 $f0, 0x38($s1) +/* EF341C 80240E0C 4600018D */ trunc.w.s $f6, $f0 +/* EF3420 80240E10 44023000 */ mfc1 $v0, $f6 +/* EF3424 80240E14 00000000 */ nop +/* EF3428 80240E18 A6420010 */ sh $v0, 0x10($s2) +/* EF342C 80240E1C C620003C */ lwc1 $f0, 0x3c($s1) +/* EF3430 80240E20 4600018D */ trunc.w.s $f6, $f0 +/* EF3434 80240E24 44023000 */ mfc1 $v0, $f6 +/* EF3438 80240E28 00000000 */ nop +/* EF343C 80240E2C A6420012 */ sh $v0, 0x12($s2) +/* EF3440 80240E30 C6200040 */ lwc1 $f0, 0x40($s1) +/* EF3444 80240E34 A2430007 */ sb $v1, 7($s2) +/* EF3448 80240E38 4600018D */ trunc.w.s $f6, $f0 +/* EF344C 80240E3C 44023000 */ mfc1 $v0, $f6 +/* EF3450 80240E40 00000000 */ nop +/* EF3454 80240E44 A6420014 */ sh $v0, 0x14($s2) +.L80240E48: +/* EF3458 80240E48 8FBF0020 */ lw $ra, 0x20($sp) +/* EF345C 80240E4C 8FB3001C */ lw $s3, 0x1c($sp) +/* EF3460 80240E50 8FB20018 */ lw $s2, 0x18($sp) +/* EF3464 80240E54 8FB10014 */ lw $s1, 0x14($sp) +/* EF3468 80240E58 8FB00010 */ lw $s0, 0x10($sp) +/* EF346C 80240E5C 03E00008 */ jr $ra +/* EF3470 80240E60 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EF2680/func_80240E64_EF3474.s b/asm/nonmatchings/code_EF2680/func_80240E64_EF3474.s new file mode 100644 index 0000000000..54783a0d41 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80240E64_EF3474.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E64_EF3474 +/* EF3474 80240E64 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EF3478 80240E68 AFB00010 */ sw $s0, 0x10($sp) +/* EF347C 80240E6C 0080802D */ daddu $s0, $a0, $zero +/* EF3480 80240E70 AFBF0014 */ sw $ra, 0x14($sp) +/* EF3484 80240E74 8E020148 */ lw $v0, 0x148($s0) +/* EF3488 80240E78 0C00F92F */ jal func_8003E4BC +/* EF348C 80240E7C 84440008 */ lh $a0, 8($v0) +/* EF3490 80240E80 0040202D */ daddu $a0, $v0, $zero +/* EF3494 80240E84 8482008E */ lh $v0, 0x8e($a0) +/* EF3498 80240E88 9483008E */ lhu $v1, 0x8e($a0) +/* EF349C 80240E8C 18400005 */ blez $v0, .L80240EA4 +/* EF34A0 80240E90 2462FFFF */ addiu $v0, $v1, -1 +/* EF34A4 80240E94 A482008E */ sh $v0, 0x8e($a0) +/* EF34A8 80240E98 00021400 */ sll $v0, $v0, 0x10 +/* EF34AC 80240E9C 1C400006 */ bgtz $v0, .L80240EB8 +/* EF34B0 80240EA0 00000000 */ nop +.L80240EA4: +/* EF34B4 80240EA4 8482008C */ lh $v0, 0x8c($a0) +/* EF34B8 80240EA8 14400003 */ bnez $v0, .L80240EB8 +/* EF34BC 80240EAC 2402000E */ addiu $v0, $zero, 0xe +/* EF34C0 80240EB0 A480008E */ sh $zero, 0x8e($a0) +/* EF34C4 80240EB4 AE020070 */ sw $v0, 0x70($s0) +.L80240EB8: +/* EF34C8 80240EB8 8FBF0014 */ lw $ra, 0x14($sp) +/* EF34CC 80240EBC 8FB00010 */ lw $s0, 0x10($sp) +/* EF34D0 80240EC0 03E00008 */ jr $ra +/* EF34D4 80240EC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EF2680/func_80240EC8_EF34D8.s b/asm/nonmatchings/code_EF2680/func_80240EC8_EF34D8.s new file mode 100644 index 0000000000..8658cc64b9 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80240EC8_EF34D8.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EC8_EF34D8 +/* EF34D8 80240EC8 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EF34DC 80240ECC AFB20030 */ sw $s2, 0x30($sp) +/* EF34E0 80240ED0 0080902D */ daddu $s2, $a0, $zero +/* EF34E4 80240ED4 AFBF0038 */ sw $ra, 0x38($sp) +/* EF34E8 80240ED8 AFB30034 */ sw $s3, 0x34($sp) +/* EF34EC 80240EDC AFB1002C */ sw $s1, 0x2c($sp) +/* EF34F0 80240EE0 AFB00028 */ sw $s0, 0x28($sp) +/* EF34F4 80240EE4 F7B60048 */ sdc1 $f22, 0x48($sp) +/* EF34F8 80240EE8 F7B40040 */ sdc1 $f20, 0x40($sp) +/* EF34FC 80240EEC 8E510148 */ lw $s1, 0x148($s2) +/* EF3500 80240EF0 86240008 */ lh $a0, 8($s1) +/* EF3504 80240EF4 0C00F92F */ jal func_8003E4BC +/* EF3508 80240EF8 00A0982D */ daddu $s3, $a1, $zero +/* EF350C 80240EFC 0040802D */ daddu $s0, $v0, $zero +/* EF3510 80240F00 0200202D */ daddu $a0, $s0, $zero +/* EF3514 80240F04 C6220088 */ lwc1 $f2, 0x88($s1) +/* EF3518 80240F08 468010A0 */ cvt.s.w $f2, $f2 +/* EF351C 80240F0C 460010A1 */ cvt.d.s $f2, $f2 +/* EF3520 80240F10 C604001C */ lwc1 $f4, 0x1c($s0) +/* EF3524 80240F14 C6000014 */ lwc1 $f0, 0x14($s0) +/* EF3528 80240F18 8E050018 */ lw $a1, 0x18($s0) +/* EF352C 80240F1C 46002100 */ add.s $f4, $f4, $f0 +/* EF3530 80240F20 8E06000C */ lw $a2, 0xc($s0) +/* EF3534 80240F24 C6200078 */ lwc1 $f0, 0x78($s1) +/* EF3538 80240F28 46800020 */ cvt.s.w $f0, $f0 +/* EF353C 80240F2C E604001C */ swc1 $f4, 0x1c($s0) +/* EF3540 80240F30 3C014059 */ lui $at, 0x4059 +/* EF3544 80240F34 44812800 */ mtc1 $at, $f5 +/* EF3548 80240F38 44802000 */ mtc1 $zero, $f4 +/* EF354C 80240F3C 46000021 */ cvt.d.s $f0, $f0 +/* EF3550 80240F40 46240003 */ div.d $f0, $f0, $f4 +/* EF3554 80240F44 46200520 */ cvt.s.d $f20, $f0 +/* EF3558 80240F48 46241083 */ div.d $f2, $f2, $f4 +/* EF355C 80240F4C 0C00F909 */ jal func_8003E424 +/* EF3560 80240F50 462015A0 */ cvt.s.d $f22, $f2 +/* EF3564 80240F54 C604001C */ lwc1 $f4, 0x1c($s0) +/* EF3568 80240F58 44801000 */ mtc1 $zero, $f2 +/* EF356C 80240F5C 44801800 */ mtc1 $zero, $f3 +/* EF3570 80240F60 46002021 */ cvt.d.s $f0, $f4 +/* EF3574 80240F64 4620103E */ c.le.d $f2, $f0 +/* EF3578 80240F68 00000000 */ nop +/* EF357C 80240F6C 45000030 */ bc1f .L80241030 +/* EF3580 80240F70 00000000 */ nop +/* EF3584 80240F74 C600003C */ lwc1 $f0, 0x3c($s0) +/* EF3588 80240F78 46040000 */ add.s $f0, $f0, $f4 +/* EF358C 80240F7C E600003C */ swc1 $f0, 0x3c($s0) +/* EF3590 80240F80 8E2200CC */ lw $v0, 0xcc($s1) +/* EF3594 80240F84 8C420024 */ lw $v0, 0x24($v0) +/* EF3598 80240F88 AE020028 */ sw $v0, 0x28($s0) +/* EF359C 80240F8C A2200007 */ sb $zero, 7($s1) +/* EF35A0 80240F90 8E020000 */ lw $v0, ($s0) +/* EF35A4 80240F94 30420008 */ andi $v0, $v0, 8 +/* EF35A8 80240F98 14400011 */ bnez $v0, .L80240FE0 +/* EF35AC 80240F9C 0000102D */ daddu $v0, $zero, $zero +/* EF35B0 80240FA0 27A50018 */ addiu $a1, $sp, 0x18 +/* EF35B4 80240FA4 27A6001C */ addiu $a2, $sp, 0x1c +/* EF35B8 80240FA8 C6000038 */ lwc1 $f0, 0x38($s0) +/* EF35BC 80240FAC C602003C */ lwc1 $f2, 0x3c($s0) +/* EF35C0 80240FB0 C6040040 */ lwc1 $f4, 0x40($s0) +/* EF35C4 80240FB4 3C01447A */ lui $at, 0x447a +/* EF35C8 80240FB8 44813000 */ mtc1 $at, $f6 +/* EF35CC 80240FBC 27A20024 */ addiu $v0, $sp, 0x24 +/* EF35D0 80240FC0 E7A00018 */ swc1 $f0, 0x18($sp) +/* EF35D4 80240FC4 E7A2001C */ swc1 $f2, 0x1c($sp) +/* EF35D8 80240FC8 E7A40020 */ swc1 $f4, 0x20($sp) +/* EF35DC 80240FCC E7A60024 */ swc1 $f6, 0x24($sp) +/* EF35E0 80240FD0 AFA20010 */ sw $v0, 0x10($sp) +/* EF35E4 80240FD4 8E040080 */ lw $a0, 0x80($s0) +/* EF35E8 80240FD8 0C03908F */ jal func_800E423C +/* EF35EC 80240FDC 27A70020 */ addiu $a3, $sp, 0x20 +.L80240FE0: +/* EF35F0 80240FE0 1040000B */ beqz $v0, .L80241010 +/* EF35F4 80240FE4 00000000 */ nop +/* EF35F8 80240FE8 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EF35FC 80240FEC 46140080 */ add.s $f2, $f0, $f20 +/* EF3600 80240FF0 C600003C */ lwc1 $f0, 0x3c($s0) +/* EF3604 80240FF4 4600103E */ c.le.s $f2, $f0 +/* EF3608 80240FF8 00000000 */ nop +/* EF360C 80240FFC 4500008D */ bc1f .L80241234 +/* EF3610 80241000 00000000 */ nop +/* EF3614 80241004 E602003C */ swc1 $f2, 0x3c($s0) +/* EF3618 80241008 0809048D */ j .L80241234 +/* EF361C 8024100C AE400070 */ sw $zero, 0x70($s2) +.L80241010: +/* EF3620 80241010 C602003C */ lwc1 $f2, 0x3c($s0) +/* EF3624 80241014 C6000064 */ lwc1 $f0, 0x64($s0) +/* EF3628 80241018 4602003E */ c.le.s $f0, $f2 +/* EF362C 8024101C 00000000 */ nop +/* EF3630 80241020 45030084 */ bc1tl .L80241234 +/* EF3634 80241024 AE400070 */ sw $zero, 0x70($s2) +/* EF3638 80241028 0809048D */ j .L80241234 +/* EF363C 8024102C 00000000 */ nop +.L80241030: +/* EF3640 80241030 4622003C */ c.lt.d $f0, $f2 +/* EF3644 80241034 00000000 */ nop +/* EF3648 80241038 4500007E */ bc1f .L80241234 +/* EF364C 8024103C 00000000 */ nop +/* EF3650 80241040 9602008E */ lhu $v0, 0x8e($s0) +/* EF3654 80241044 24420001 */ addiu $v0, $v0, 1 +/* EF3658 80241048 A602008E */ sh $v0, 0x8e($s0) +/* EF365C 8024104C 00021400 */ sll $v0, $v0, 0x10 +/* EF3660 80241050 8E630020 */ lw $v1, 0x20($s3) +/* EF3664 80241054 00021403 */ sra $v0, $v0, 0x10 +/* EF3668 80241058 0043102A */ slt $v0, $v0, $v1 +/* EF366C 8024105C 14400026 */ bnez $v0, .L802410F8 +/* EF3670 80241060 00000000 */ nop +/* EF3674 80241064 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EF3678 80241068 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EF367C 8024106C 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EF3680 80241070 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EF3684 80241074 A600008E */ sh $zero, 0x8e($s0) +/* EF3688 80241078 8C460028 */ lw $a2, 0x28($v0) +/* EF368C 8024107C 0C00ABDC */ jal fio_validate_header_checksums +/* EF3690 80241080 8C470030 */ lw $a3, 0x30($v0) +/* EF3694 80241084 46000506 */ mov.s $f20, $f0 +/* EF3698 80241088 C60C000C */ lwc1 $f12, 0xc($s0) +/* EF369C 8024108C 0C00ABC6 */ jal func_8002AF18 +/* EF36A0 80241090 4600A386 */ mov.s $f14, $f20 +/* EF36A4 80241094 46000086 */ mov.s $f2, $f0 +/* EF36A8 80241098 8E62001C */ lw $v0, 0x1c($s3) +/* EF36AC 8024109C 46001005 */ abs.s $f0, $f2 +/* EF36B0 802410A0 44822000 */ mtc1 $v0, $f4 +/* EF36B4 802410A4 00000000 */ nop +/* EF36B8 802410A8 46802120 */ cvt.s.w $f4, $f4 +/* EF36BC 802410AC 4600203C */ c.lt.s $f4, $f0 +/* EF36C0 802410B0 00000000 */ nop +/* EF36C4 802410B4 4500000D */ bc1f .L802410EC +/* EF36C8 802410B8 00000000 */ nop +/* EF36CC 802410BC 44800000 */ mtc1 $zero, $f0 +/* EF36D0 802410C0 C614000C */ lwc1 $f20, 0xc($s0) +/* EF36D4 802410C4 4600103C */ c.lt.s $f2, $f0 +/* EF36D8 802410C8 00000000 */ nop +/* EF36DC 802410CC 45000006 */ bc1f .L802410E8 +/* EF36E0 802410D0 00021023 */ negu $v0, $v0 +/* EF36E4 802410D4 44820000 */ mtc1 $v0, $f0 +/* EF36E8 802410D8 00000000 */ nop +/* EF36EC 802410DC 46800020 */ cvt.s.w $f0, $f0 +/* EF36F0 802410E0 0809043B */ j .L802410EC +/* EF36F4 802410E4 4600A500 */ add.s $f20, $f20, $f0 +.L802410E8: +/* EF36F8 802410E8 4604A500 */ add.s $f20, $f20, $f4 +.L802410EC: +/* EF36FC 802410EC 0C00AB85 */ jal func_8002AE14 +/* EF3700 802410F0 4600A306 */ mov.s $f12, $f20 +/* EF3704 802410F4 E600000C */ swc1 $f0, 0xc($s0) +.L802410F8: +/* EF3708 802410F8 8E020000 */ lw $v0, ($s0) +/* EF370C 802410FC 30420008 */ andi $v0, $v0, 8 +/* EF3710 80241100 1040000A */ beqz $v0, .L8024112C +/* EF3714 80241104 27A50018 */ addiu $a1, $sp, 0x18 +/* EF3718 80241108 C602003C */ lwc1 $f2, 0x3c($s0) +/* EF371C 8024110C C600001C */ lwc1 $f0, 0x1c($s0) +/* EF3720 80241110 46001080 */ add.s $f2, $f2, $f0 +/* EF3724 80241114 4616103C */ c.lt.s $f2, $f22 +/* EF3728 80241118 00000000 */ nop +/* EF372C 8024111C 45020045 */ bc1fl .L80241234 +/* EF3730 80241120 E602003C */ swc1 $f2, 0x3c($s0) +/* EF3734 80241124 0809048C */ j .L80241230 +/* EF3738 80241128 E616003C */ swc1 $f22, 0x3c($s0) +.L8024112C: +/* EF373C 8024112C C6000038 */ lwc1 $f0, 0x38($s0) +/* EF3740 80241130 27A6001C */ addiu $a2, $sp, 0x1c +/* EF3744 80241134 E7A00018 */ swc1 $f0, 0x18($sp) +/* EF3748 80241138 860200A8 */ lh $v0, 0xa8($s0) +/* EF374C 8024113C C600001C */ lwc1 $f0, 0x1c($s0) +/* EF3750 80241140 C604003C */ lwc1 $f4, 0x3c($s0) +/* EF3754 80241144 44821000 */ mtc1 $v0, $f2 +/* EF3758 80241148 00000000 */ nop +/* EF375C 8024114C 468010A0 */ cvt.s.w $f2, $f2 +/* EF3760 80241150 46000005 */ abs.s $f0, $f0 +/* EF3764 80241154 46020000 */ add.s $f0, $f0, $f2 +/* EF3768 80241158 C6060040 */ lwc1 $f6, 0x40($s0) +/* EF376C 8024115C 27A20024 */ addiu $v0, $sp, 0x24 +/* EF3770 80241160 46022100 */ add.s $f4, $f4, $f2 +/* EF3774 80241164 3C014024 */ lui $at, 0x4024 +/* EF3778 80241168 44811800 */ mtc1 $at, $f3 +/* EF377C 8024116C 44801000 */ mtc1 $zero, $f2 +/* EF3780 80241170 46000021 */ cvt.d.s $f0, $f0 +/* EF3784 80241174 46220000 */ add.d $f0, $f0, $f2 +/* EF3788 80241178 E7A60020 */ swc1 $f6, 0x20($sp) +/* EF378C 8024117C E7A4001C */ swc1 $f4, 0x1c($sp) +/* EF3790 80241180 46200020 */ cvt.s.d $f0, $f0 +/* EF3794 80241184 E7A00024 */ swc1 $f0, 0x24($sp) +/* EF3798 80241188 AFA20010 */ sw $v0, 0x10($sp) +/* EF379C 8024118C 8E040080 */ lw $a0, 0x80($s0) +/* EF37A0 80241190 0C03908F */ jal func_800E423C +/* EF37A4 80241194 27A70020 */ addiu $a3, $sp, 0x20 +/* EF37A8 80241198 10400015 */ beqz $v0, .L802411F0 +/* EF37AC 8024119C 00000000 */ nop +/* EF37B0 802411A0 860200A8 */ lh $v0, 0xa8($s0) +/* EF37B4 802411A4 C604001C */ lwc1 $f4, 0x1c($s0) +/* EF37B8 802411A8 44820000 */ mtc1 $v0, $f0 +/* EF37BC 802411AC 00000000 */ nop +/* EF37C0 802411B0 46800020 */ cvt.s.w $f0, $f0 +/* EF37C4 802411B4 46002085 */ abs.s $f2, $f4 +/* EF37C8 802411B8 46020000 */ add.s $f0, $f0, $f2 +/* EF37CC 802411BC C7A20024 */ lwc1 $f2, 0x24($sp) +/* EF37D0 802411C0 4600103E */ c.le.s $f2, $f0 +/* EF37D4 802411C4 00000000 */ nop +/* EF37D8 802411C8 45000005 */ bc1f .L802411E0 +/* EF37DC 802411CC 00000000 */ nop +/* EF37E0 802411D0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EF37E4 802411D4 AE00001C */ sw $zero, 0x1c($s0) +/* EF37E8 802411D8 0809048D */ j .L80241234 +/* EF37EC 802411DC E600003C */ swc1 $f0, 0x3c($s0) +.L802411E0: +/* EF37F0 802411E0 C600003C */ lwc1 $f0, 0x3c($s0) +/* EF37F4 802411E4 46040000 */ add.s $f0, $f0, $f4 +/* EF37F8 802411E8 0809048D */ j .L80241234 +/* EF37FC 802411EC E600003C */ swc1 $f0, 0x3c($s0) +.L802411F0: +/* EF3800 802411F0 C606003C */ lwc1 $f6, 0x3c($s0) +/* EF3804 802411F4 860200A8 */ lh $v0, 0xa8($s0) +/* EF3808 802411F8 46163081 */ sub.s $f2, $f6, $f22 +/* EF380C 802411FC 44820000 */ mtc1 $v0, $f0 +/* EF3810 80241200 00000000 */ nop +/* EF3814 80241204 46800020 */ cvt.s.w $f0, $f0 +/* EF3818 80241208 46001080 */ add.s $f2, $f2, $f0 +/* EF381C 8024120C C604001C */ lwc1 $f4, 0x1c($s0) +/* EF3820 80241210 46002005 */ abs.s $f0, $f4 +/* EF3824 80241214 4602003C */ c.lt.s $f0, $f2 +/* EF3828 80241218 00000000 */ nop +/* EF382C 8024121C 45020005 */ bc1fl .L80241234 +/* EF3830 80241220 AE00001C */ sw $zero, 0x1c($s0) +/* EF3834 80241224 46043000 */ add.s $f0, $f6, $f4 +/* EF3838 80241228 0809048D */ j .L80241234 +/* EF383C 8024122C E600003C */ swc1 $f0, 0x3c($s0) +.L80241230: +/* EF3840 80241230 AE00001C */ sw $zero, 0x1c($s0) +.L80241234: +/* EF3844 80241234 8FBF0038 */ lw $ra, 0x38($sp) +/* EF3848 80241238 8FB30034 */ lw $s3, 0x34($sp) +/* EF384C 8024123C 8FB20030 */ lw $s2, 0x30($sp) +/* EF3850 80241240 8FB1002C */ lw $s1, 0x2c($sp) +/* EF3854 80241244 8FB00028 */ lw $s0, 0x28($sp) +/* EF3858 80241248 D7B60048 */ ldc1 $f22, 0x48($sp) +/* EF385C 8024124C D7B40040 */ ldc1 $f20, 0x40($sp) +/* EF3860 80241250 03E00008 */ jr $ra +/* EF3864 80241254 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EF2680/func_80241258_EF3868.s b/asm/nonmatchings/code_EF2680/func_80241258_EF3868.s new file mode 100644 index 0000000000..5f6d585539 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80241258_EF3868.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241258_EF3868 +/* EF3868 80241258 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EF386C 8024125C AFB00028 */ sw $s0, 0x28($sp) +/* EF3870 80241260 00A0802D */ daddu $s0, $a1, $zero +/* EF3874 80241264 AFB1002C */ sw $s1, 0x2c($sp) +/* EF3878 80241268 00C0882D */ daddu $s1, $a2, $zero +/* EF387C 8024126C AFBF0034 */ sw $ra, 0x34($sp) +/* EF3880 80241270 AFB20030 */ sw $s2, 0x30($sp) +/* EF3884 80241274 AE200070 */ sw $zero, 0x70($s1) +/* EF3888 80241278 8C830000 */ lw $v1, ($a0) +/* EF388C 8024127C 2402FDFF */ addiu $v0, $zero, -0x201 +/* EF3890 80241280 A480008E */ sh $zero, 0x8e($a0) +/* EF3894 80241284 00621824 */ and $v1, $v1, $v0 +/* EF3898 80241288 34650800 */ ori $a1, $v1, 0x800 +/* EF389C 8024128C AC850000 */ sw $a1, ($a0) +/* EF38A0 80241290 8E0200D0 */ lw $v0, 0xd0($s0) +/* EF38A4 80241294 8C420034 */ lw $v0, 0x34($v0) +/* EF38A8 80241298 10400003 */ beqz $v0, .L802412A8 +/* EF38AC 8024129C 00E0902D */ daddu $s2, $a3, $zero +/* EF38B0 802412A0 080904AC */ j .L802412B0 +/* EF38B4 802412A4 34620808 */ ori $v0, $v1, 0x808 +.L802412A8: +/* EF38B8 802412A8 2402FFF7 */ addiu $v0, $zero, -9 +/* EF38BC 802412AC 00A21024 */ and $v0, $a1, $v0 +.L802412B0: +/* EF38C0 802412B0 AC820000 */ sw $v0, ($a0) +/* EF38C4 802412B4 27A20024 */ addiu $v0, $sp, 0x24 +/* EF38C8 802412B8 27A50018 */ addiu $a1, $sp, 0x18 +/* EF38CC 802412BC C4800038 */ lwc1 $f0, 0x38($a0) +/* EF38D0 802412C0 C482003C */ lwc1 $f2, 0x3c($a0) +/* EF38D4 802412C4 C4840040 */ lwc1 $f4, 0x40($a0) +/* EF38D8 802412C8 3C01447A */ lui $at, 0x447a +/* EF38DC 802412CC 44813000 */ mtc1 $at, $f6 +/* EF38E0 802412D0 27A6001C */ addiu $a2, $sp, 0x1c +/* EF38E4 802412D4 E7A00018 */ swc1 $f0, 0x18($sp) +/* EF38E8 802412D8 E7A2001C */ swc1 $f2, 0x1c($sp) +/* EF38EC 802412DC E7A40020 */ swc1 $f4, 0x20($sp) +/* EF38F0 802412E0 E7A60024 */ swc1 $f6, 0x24($sp) +/* EF38F4 802412E4 AFA20010 */ sw $v0, 0x10($sp) +/* EF38F8 802412E8 8C840080 */ lw $a0, 0x80($a0) +/* EF38FC 802412EC 0C03908F */ jal func_800E423C +/* EF3900 802412F0 27A70020 */ addiu $a3, $sp, 0x20 +/* EF3904 802412F4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* EF3908 802412F8 3C014059 */ lui $at, 0x4059 +/* EF390C 802412FC 44812800 */ mtc1 $at, $f5 +/* EF3910 80241300 44802000 */ mtc1 $zero, $f4 +/* EF3914 80241304 460010A1 */ cvt.d.s $f2, $f2 +/* EF3918 80241308 46241082 */ mul.d $f2, $f2, $f4 +/* EF391C 8024130C 00000000 */ nop +/* EF3920 80241310 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* EF3924 80241314 46000021 */ cvt.d.s $f0, $f0 +/* EF3928 80241318 46240002 */ mul.d $f0, $f0, $f4 +/* EF392C 8024131C 00000000 */ nop +/* EF3930 80241320 3C013FE0 */ lui $at, 0x3fe0 +/* EF3934 80241324 44812800 */ mtc1 $at, $f5 +/* EF3938 80241328 44802000 */ mtc1 $zero, $f4 +/* EF393C 8024132C 00000000 */ nop +/* EF3940 80241330 46241080 */ add.d $f2, $f2, $f4 +/* EF3944 80241334 AE000074 */ sw $zero, 0x74($s0) +/* EF3948 80241338 46240000 */ add.d $f0, $f0, $f4 +/* EF394C 8024133C AE000090 */ sw $zero, 0x90($s0) +/* EF3950 80241340 4620120D */ trunc.w.d $f8, $f2 +/* EF3954 80241344 E6080078 */ swc1 $f8, 0x78($s0) +/* EF3958 80241348 4620020D */ trunc.w.d $f8, $f0 +/* EF395C 8024134C E6080088 */ swc1 $f8, 0x88($s0) +/* EF3960 80241350 8E420014 */ lw $v0, 0x14($s2) +/* EF3964 80241354 AE220074 */ sw $v0, 0x74($s1) +/* EF3968 80241358 8E0200B0 */ lw $v0, 0xb0($s0) +/* EF396C 8024135C 34420010 */ ori $v0, $v0, 0x10 +/* EF3970 80241360 AE0200B0 */ sw $v0, 0xb0($s0) +/* EF3974 80241364 8FBF0034 */ lw $ra, 0x34($sp) +/* EF3978 80241368 8FB20030 */ lw $s2, 0x30($sp) +/* EF397C 8024136C 8FB1002C */ lw $s1, 0x2c($sp) +/* EF3980 80241370 8FB00028 */ lw $s0, 0x28($sp) +/* EF3984 80241374 03E00008 */ jr $ra +/* EF3988 80241378 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s b/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s new file mode 100644 index 0000000000..2a8780882c --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024137C_EF398C +/* EF398C 8024137C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* EF3990 80241380 AFB50044 */ sw $s5, 0x44($sp) +/* EF3994 80241384 0080A82D */ daddu $s5, $a0, $zero +/* EF3998 80241388 AFBF0048 */ sw $ra, 0x48($sp) +/* EF399C 8024138C AFB40040 */ sw $s4, 0x40($sp) +/* EF39A0 80241390 AFB3003C */ sw $s3, 0x3c($sp) +/* EF39A4 80241394 AFB20038 */ sw $s2, 0x38($sp) +/* EF39A8 80241398 AFB10034 */ sw $s1, 0x34($sp) +/* EF39AC 8024139C AFB00030 */ sw $s0, 0x30($sp) +/* EF39B0 802413A0 8EB20148 */ lw $s2, 0x148($s5) +/* EF39B4 802413A4 86440008 */ lh $a0, 8($s2) +/* EF39B8 802413A8 8EB0000C */ lw $s0, 0xc($s5) +/* EF39BC 802413AC 0C00F92F */ jal func_8003E4BC +/* EF39C0 802413B0 00A0882D */ daddu $s1, $a1, $zero +/* EF39C4 802413B4 02A0202D */ daddu $a0, $s5, $zero +/* EF39C8 802413B8 8E050000 */ lw $a1, ($s0) +/* EF39CC 802413BC 0C0B53A3 */ jal func_802D4E8C +/* EF39D0 802413C0 0040A02D */ daddu $s4, $v0, $zero +/* EF39D4 802413C4 AFA00010 */ sw $zero, 0x10($sp) +/* EF39D8 802413C8 8E4300D0 */ lw $v1, 0xd0($s2) +/* EF39DC 802413CC 8C630030 */ lw $v1, 0x30($v1) +/* EF39E0 802413D0 AFA30014 */ sw $v1, 0x14($sp) +/* EF39E4 802413D4 8E4300D0 */ lw $v1, 0xd0($s2) +/* EF39E8 802413D8 8C63001C */ lw $v1, 0x1c($v1) +/* EF39EC 802413DC AFA30018 */ sw $v1, 0x18($sp) +/* EF39F0 802413E0 8E4300D0 */ lw $v1, 0xd0($s2) +/* EF39F4 802413E4 8C630024 */ lw $v1, 0x24($v1) +/* EF39F8 802413E8 AFA3001C */ sw $v1, 0x1c($sp) +/* EF39FC 802413EC 8E4300D0 */ lw $v1, 0xd0($s2) +/* EF3A00 802413F0 8C630028 */ lw $v1, 0x28($v1) +/* EF3A04 802413F4 AFA30020 */ sw $v1, 0x20($sp) +/* EF3A08 802413F8 8E4300D0 */ lw $v1, 0xd0($s2) +/* EF3A0C 802413FC 3C0142F0 */ lui $at, 0x42f0 +/* EF3A10 80241400 44810000 */ mtc1 $at, $f0 +/* EF3A14 80241404 8C63002C */ lw $v1, 0x2c($v1) +/* EF3A18 80241408 E7A00028 */ swc1 $f0, 0x28($sp) +/* EF3A1C 8024140C A7A0002C */ sh $zero, 0x2c($sp) +/* EF3A20 80241410 AFA30024 */ sw $v1, 0x24($sp) +/* EF3A24 80241414 C6800038 */ lwc1 $f0, 0x38($s4) +/* EF3A28 80241418 E6400108 */ swc1 $f0, 0x108($s2) +/* EF3A2C 8024141C C680003C */ lwc1 $f0, 0x3c($s4) +/* EF3A30 80241420 27B30010 */ addiu $s3, $sp, 0x10 +/* EF3A34 80241424 E640010C */ swc1 $f0, 0x10c($s2) +/* EF3A38 80241428 3C0138D1 */ lui $at, 0x38d1 +/* EF3A3C 8024142C 3421B717 */ ori $at, $at, 0xb717 +/* EF3A40 80241430 44810000 */ mtc1 $at, $f0 +/* EF3A44 80241434 C6820040 */ lwc1 $f2, 0x40($s4) +/* EF3A48 80241438 0040802D */ daddu $s0, $v0, $zero +/* EF3A4C 8024143C E6400114 */ swc1 $f0, 0x114($s2) +/* EF3A50 80241440 E6400118 */ swc1 $f0, 0x118($s2) +/* EF3A54 80241444 12200006 */ beqz $s1, .L80241460 +/* EF3A58 80241448 E6420110 */ swc1 $f2, 0x110($s2) +/* EF3A5C 8024144C 0280202D */ daddu $a0, $s4, $zero +/* EF3A60 80241450 0240282D */ daddu $a1, $s2, $zero +/* EF3A64 80241454 02A0302D */ daddu $a2, $s5, $zero +/* EF3A68 80241458 0C090496 */ jal func_80241258_EF3868 +/* EF3A6C 8024145C 0200382D */ daddu $a3, $s0, $zero +.L80241460: +/* EF3A70 80241460 2402FFFE */ addiu $v0, $zero, -2 +/* EF3A74 80241464 A28200AB */ sb $v0, 0xab($s4) +/* EF3A78 80241468 8E4300B0 */ lw $v1, 0xb0($s2) +/* EF3A7C 8024146C 30620004 */ andi $v0, $v1, 4 +/* EF3A80 80241470 10400007 */ beqz $v0, .L80241490 +/* EF3A84 80241474 00000000 */ nop +/* EF3A88 80241478 824200B4 */ lb $v0, 0xb4($s2) +/* EF3A8C 8024147C 1440003C */ bnez $v0, .L80241570 +/* EF3A90 80241480 0000102D */ daddu $v0, $zero, $zero +/* EF3A94 80241484 2402FFFB */ addiu $v0, $zero, -5 +/* EF3A98 80241488 00621024 */ and $v0, $v1, $v0 +/* EF3A9C 8024148C AE4200B0 */ sw $v0, 0xb0($s2) +.L80241490: +/* EF3AA0 80241490 8EA30070 */ lw $v1, 0x70($s5) +/* EF3AA4 80241494 2C62000F */ sltiu $v0, $v1, 0xf +/* EF3AA8 80241498 10400034 */ beqz $v0, .L8024156C +/* EF3AAC 8024149C 00031080 */ sll $v0, $v1, 2 +/* EF3AB0 802414A0 3C018024 */ lui $at, %hi(D_802453C8) +/* EF3AB4 802414A4 00220821 */ addu $at, $at, $v0 +/* EF3AB8 802414A8 8C2253C8 */ lw $v0, %lo(D_802453C8)($at) +/* EF3ABC 802414AC 00400008 */ jr $v0 +/* EF3AC0 802414B0 00000000 */ nop +/* EF3AC4 802414B4 02A0202D */ daddu $a0, $s5, $zero +/* EF3AC8 802414B8 0200282D */ daddu $a1, $s0, $zero +/* EF3ACC 802414BC 0C09001C */ jal func_80240070_EF2680 +/* EF3AD0 802414C0 0260302D */ daddu $a2, $s3, $zero +/* EF3AD4 802414C4 02A0202D */ daddu $a0, $s5, $zero +/* EF3AD8 802414C8 0200282D */ daddu $a1, $s0, $zero +/* EF3ADC 802414CC 0C090088 */ jal func_80240220_EF2830 +/* EF3AE0 802414D0 0260302D */ daddu $a2, $s3, $zero +/* EF3AE4 802414D4 0809055C */ j .L80241570 +/* EF3AE8 802414D8 0000102D */ daddu $v0, $zero, $zero +/* EF3AEC 802414DC 02A0202D */ daddu $a0, $s5, $zero +/* EF3AF0 802414E0 0200282D */ daddu $a1, $s0, $zero +/* EF3AF4 802414E4 0C090212 */ jal func_80240848_EF2E58 +/* EF3AF8 802414E8 0260302D */ daddu $a2, $s3, $zero +/* EF3AFC 802414EC 02A0202D */ daddu $a0, $s5, $zero +/* EF3B00 802414F0 0200282D */ daddu $a1, $s0, $zero +/* EF3B04 802414F4 0C090242 */ jal func_80240908_EF2F18 +/* EF3B08 802414F8 0260302D */ daddu $a2, $s3, $zero +/* EF3B0C 802414FC 0809055C */ j .L80241570 +/* EF3B10 80241500 0000102D */ daddu $v0, $zero, $zero +/* EF3B14 80241504 02A0202D */ daddu $a0, $s5, $zero +/* EF3B18 80241508 0200282D */ daddu $a1, $s0, $zero +/* EF3B1C 8024150C 0C090313 */ jal func_80240C4C_EF325C +/* EF3B20 80241510 0260302D */ daddu $a2, $s3, $zero +/* EF3B24 80241514 02A0202D */ daddu $a0, $s5, $zero +/* EF3B28 80241518 0200282D */ daddu $a1, $s0, $zero +/* EF3B2C 8024151C 0C090331 */ jal func_80240CC4_EF32D4 +/* EF3B30 80241520 0260302D */ daddu $a2, $s3, $zero +/* EF3B34 80241524 0809055C */ j .L80241570 +/* EF3B38 80241528 0000102D */ daddu $v0, $zero, $zero +/* EF3B3C 8024152C 02A0202D */ daddu $a0, $s5, $zero +/* EF3B40 80241530 0200282D */ daddu $a1, $s0, $zero +/* EF3B44 80241534 0C09034C */ jal func_80240D30_EF3340 +/* EF3B48 80241538 0260302D */ daddu $a2, $s3, $zero +/* EF3B4C 8024153C 0809055C */ j .L80241570 +/* EF3B50 80241540 0000102D */ daddu $v0, $zero, $zero +/* EF3B54 80241544 02A0202D */ daddu $a0, $s5, $zero +/* EF3B58 80241548 0200282D */ daddu $a1, $s0, $zero +/* EF3B5C 8024154C 0C090399 */ jal func_80240E64_EF3474 +/* EF3B60 80241550 0260302D */ daddu $a2, $s3, $zero +/* EF3B64 80241554 0809055C */ j .L80241570 +/* EF3B68 80241558 0000102D */ daddu $v0, $zero, $zero +/* EF3B6C 8024155C 02A0202D */ daddu $a0, $s5, $zero +/* EF3B70 80241560 0200282D */ daddu $a1, $s0, $zero +/* EF3B74 80241564 0C0903B2 */ jal func_80240EC8_EF34D8 +/* EF3B78 80241568 0260302D */ daddu $a2, $s3, $zero +.L8024156C: +/* EF3B7C 8024156C 0000102D */ daddu $v0, $zero, $zero +.L80241570: +/* EF3B80 80241570 8FBF0048 */ lw $ra, 0x48($sp) +/* EF3B84 80241574 8FB50044 */ lw $s5, 0x44($sp) +/* EF3B88 80241578 8FB40040 */ lw $s4, 0x40($sp) +/* EF3B8C 8024157C 8FB3003C */ lw $s3, 0x3c($sp) +/* EF3B90 80241580 8FB20038 */ lw $s2, 0x38($sp) +/* EF3B94 80241584 8FB10034 */ lw $s1, 0x34($sp) +/* EF3B98 80241588 8FB00030 */ lw $s0, 0x30($sp) +/* EF3B9C 8024158C 03E00008 */ jr $ra +/* EF3BA0 80241590 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_EF2680/func_80241594_EF3BA4.s b/asm/nonmatchings/code_EF2680/func_80241594_EF3BA4.s new file mode 100644 index 0000000000..3b228fb3d0 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80241594_EF3BA4.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241594_EF3BA4 +/* EF3BA4 80241594 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EF3BA8 80241598 AFB00010 */ sw $s0, 0x10($sp) +/* EF3BAC 8024159C 24100032 */ addiu $s0, $zero, 0x32 +/* EF3BB0 802415A0 AFBF0014 */ sw $ra, 0x14($sp) +.L802415A4: +/* EF3BB4 802415A4 0C010ABD */ jal func_80042AF4 +/* EF3BB8 802415A8 0200202D */ daddu $a0, $s0, $zero +/* EF3BBC 802415AC 8C420094 */ lw $v0, 0x94($v0) +/* EF3BC0 802415B0 54400003 */ bnel $v0, $zero, .L802415C0 +/* EF3BC4 802415B4 26100001 */ addiu $s0, $s0, 1 +/* EF3BC8 802415B8 08090573 */ j .L802415CC +/* EF3BCC 802415BC 0200102D */ daddu $v0, $s0, $zero +.L802415C0: +/* EF3BD0 802415C0 2A020036 */ slti $v0, $s0, 0x36 +/* EF3BD4 802415C4 1440FFF7 */ bnez $v0, .L802415A4 +/* EF3BD8 802415C8 2402FFFF */ addiu $v0, $zero, -1 +.L802415CC: +/* EF3BDC 802415CC 8FBF0014 */ lw $ra, 0x14($sp) +/* EF3BE0 802415D0 8FB00010 */ lw $s0, 0x10($sp) +/* EF3BE4 802415D4 03E00008 */ jr $ra +/* EF3BE8 802415D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EF2680/func_802415DC_EF3BEC.s b/asm/nonmatchings/code_EF2680/func_802415DC_EF3BEC.s new file mode 100644 index 0000000000..133f380617 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_802415DC_EF3BEC.s @@ -0,0 +1,295 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415DC_EF3BEC +/* EF3BEC 802415DC 27BDFF78 */ addiu $sp, $sp, -0x88 +/* EF3BF0 802415E0 AFB20048 */ sw $s2, 0x48($sp) +/* EF3BF4 802415E4 0080902D */ daddu $s2, $a0, $zero +/* EF3BF8 802415E8 AFBF0064 */ sw $ra, 0x64($sp) +/* EF3BFC 802415EC AFBE0060 */ sw $fp, 0x60($sp) +/* EF3C00 802415F0 AFB7005C */ sw $s7, 0x5c($sp) +/* EF3C04 802415F4 AFB60058 */ sw $s6, 0x58($sp) +/* EF3C08 802415F8 AFB50054 */ sw $s5, 0x54($sp) +/* EF3C0C 802415FC AFB40050 */ sw $s4, 0x50($sp) +/* EF3C10 80241600 AFB3004C */ sw $s3, 0x4c($sp) +/* EF3C14 80241604 AFB10044 */ sw $s1, 0x44($sp) +/* EF3C18 80241608 AFB00040 */ sw $s0, 0x40($sp) +/* EF3C1C 8024160C F7BA0080 */ sdc1 $f26, 0x80($sp) +/* EF3C20 80241610 F7B80078 */ sdc1 $f24, 0x78($sp) +/* EF3C24 80241614 F7B60070 */ sdc1 $f22, 0x70($sp) +/* EF3C28 80241618 F7B40068 */ sdc1 $f20, 0x68($sp) +/* EF3C2C 8024161C 8E510148 */ lw $s1, 0x148($s2) +/* EF3C30 80241620 00A0B82D */ daddu $s7, $a1, $zero +/* EF3C34 80241624 86240008 */ lh $a0, 8($s1) +/* EF3C38 80241628 0C00F92F */ jal func_8003E4BC +/* EF3C3C 8024162C 00C0F02D */ daddu $fp, $a2, $zero +/* EF3C40 80241630 C620007C */ lwc1 $f0, 0x7c($s1) +/* EF3C44 80241634 46800020 */ cvt.s.w $f0, $f0 +/* EF3C48 80241638 46000021 */ cvt.d.s $f0, $f0 +/* EF3C4C 8024163C 0040802D */ daddu $s0, $v0, $zero +/* EF3C50 80241640 3C014059 */ lui $at, 0x4059 +/* EF3C54 80241644 44813800 */ mtc1 $at, $f7 +/* EF3C58 80241648 44803000 */ mtc1 $zero, $f6 +/* EF3C5C 8024164C 8602008E */ lh $v0, 0x8e($s0) +/* EF3C60 80241650 9603008E */ lhu $v1, 0x8e($s0) +/* EF3C64 80241654 46260003 */ div.d $f0, $f0, $f6 +/* EF3C68 80241658 462005A0 */ cvt.s.d $f22, $f0 +/* EF3C6C 8024165C C6200078 */ lwc1 $f0, 0x78($s1) +/* EF3C70 80241660 46800020 */ cvt.s.w $f0, $f0 +/* EF3C74 80241664 46000021 */ cvt.d.s $f0, $f0 +/* EF3C78 80241668 46260003 */ div.d $f0, $f0, $f6 +/* EF3C7C 8024166C 18400003 */ blez $v0, .L8024167C +/* EF3C80 80241670 46200620 */ cvt.s.d $f24, $f0 +/* EF3C84 80241674 2462FFFF */ addiu $v0, $v1, -1 +/* EF3C88 80241678 A602008E */ sh $v0, 0x8e($s0) +.L8024167C: +/* EF3C8C 8024167C 27B40028 */ addiu $s4, $sp, 0x28 +/* EF3C90 80241680 0280282D */ daddu $a1, $s4, $zero +/* EF3C94 80241684 27B5002C */ addiu $s5, $sp, 0x2c +/* EF3C98 80241688 02A0302D */ daddu $a2, $s5, $zero +/* EF3C9C 8024168C 27B60030 */ addiu $s6, $sp, 0x30 +/* EF3CA0 80241690 02C0382D */ daddu $a3, $s6, $zero +/* EF3CA4 80241694 C6000038 */ lwc1 $f0, 0x38($s0) +/* EF3CA8 80241698 C602003C */ lwc1 $f2, 0x3c($s0) +/* EF3CAC 8024169C C6040040 */ lwc1 $f4, 0x40($s0) +/* EF3CB0 802416A0 3C01447A */ lui $at, 0x447a +/* EF3CB4 802416A4 4481D000 */ mtc1 $at, $f26 +/* EF3CB8 802416A8 27B30034 */ addiu $s3, $sp, 0x34 +/* EF3CBC 802416AC E7A00028 */ swc1 $f0, 0x28($sp) +/* EF3CC0 802416B0 E7A2002C */ swc1 $f2, 0x2c($sp) +/* EF3CC4 802416B4 E7A40030 */ swc1 $f4, 0x30($sp) +/* EF3CC8 802416B8 E7BA0034 */ swc1 $f26, 0x34($sp) +/* EF3CCC 802416BC C6340070 */ lwc1 $f20, 0x70($s1) +/* EF3CD0 802416C0 4680A520 */ cvt.s.w $f20, $f20 +/* EF3CD4 802416C4 4600A521 */ cvt.d.s $f20, $f20 +/* EF3CD8 802416C8 4626A503 */ div.d $f20, $f20, $f6 +/* EF3CDC 802416CC AFB30010 */ sw $s3, 0x10($sp) +/* EF3CE0 802416D0 8E040080 */ lw $a0, 0x80($s0) +/* EF3CE4 802416D4 0C03908F */ jal func_800E423C +/* EF3CE8 802416D8 4620A520 */ cvt.s.d $f20, $f20 +/* EF3CEC 802416DC C62C0074 */ lwc1 $f12, 0x74($s1) +/* EF3CF0 802416E0 0C00AD77 */ jal func_8002B5DC +/* EF3CF4 802416E4 46806320 */ cvt.s.w $f12, $f12 +/* EF3CF8 802416E8 46140002 */ mul.s $f0, $f0, $f20 +/* EF3CFC 802416EC 00000000 */ nop +/* EF3D00 802416F0 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* EF3D04 802416F4 46181080 */ add.s $f2, $f2, $f24 +/* EF3D08 802416F8 46001080 */ add.s $f2, $f2, $f0 +/* EF3D0C 802416FC E602003C */ swc1 $f2, 0x3c($s0) +/* EF3D10 80241700 8E220074 */ lw $v0, 0x74($s1) +/* EF3D14 80241704 2442000C */ addiu $v0, $v0, 0xc +/* EF3D18 80241708 44826000 */ mtc1 $v0, $f12 +/* EF3D1C 8024170C 00000000 */ nop +/* EF3D20 80241710 0C00AB85 */ jal func_8002AE14 +/* EF3D24 80241714 46806320 */ cvt.s.w $f12, $f12 +/* EF3D28 80241718 4600020D */ trunc.w.s $f8, $f0 +/* EF3D2C 8024171C E6280074 */ swc1 $f8, 0x74($s1) +/* EF3D30 80241720 8EE30014 */ lw $v1, 0x14($s7) +/* EF3D34 80241724 0460003C */ bltz $v1, .L80241818 +/* EF3D38 80241728 00000000 */ nop +/* EF3D3C 8024172C 8E420074 */ lw $v0, 0x74($s2) +/* EF3D40 80241730 1C400038 */ bgtz $v0, .L80241814 +/* EF3D44 80241734 2442FFFF */ addiu $v0, $v0, -1 +/* EF3D48 80241738 03C0202D */ daddu $a0, $fp, $zero +/* EF3D4C 8024173C AE430074 */ sw $v1, 0x74($s2) +/* EF3D50 80241740 AFA00010 */ sw $zero, 0x10($sp) +/* EF3D54 80241744 8EE6000C */ lw $a2, 0xc($s7) +/* EF3D58 80241748 8EE70010 */ lw $a3, 0x10($s7) +/* EF3D5C 8024174C 0C013469 */ jal func_8004D1A4 +/* EF3D60 80241750 0220282D */ daddu $a1, $s1, $zero +/* EF3D64 80241754 1040002D */ beqz $v0, .L8024180C +/* EF3D68 80241758 0000202D */ daddu $a0, $zero, $zero +/* EF3D6C 8024175C 0200282D */ daddu $a1, $s0, $zero +/* EF3D70 80241760 0000302D */ daddu $a2, $zero, $zero +/* EF3D74 80241764 860300A8 */ lh $v1, 0xa8($s0) +/* EF3D78 80241768 3C013F80 */ lui $at, 0x3f80 +/* EF3D7C 8024176C 44810000 */ mtc1 $at, $f0 +/* EF3D80 80241770 3C014000 */ lui $at, 0x4000 +/* EF3D84 80241774 44811000 */ mtc1 $at, $f2 +/* EF3D88 80241778 3C01C1A0 */ lui $at, 0xc1a0 +/* EF3D8C 8024177C 44812000 */ mtc1 $at, $f4 +/* EF3D90 80241780 2402000F */ addiu $v0, $zero, 0xf +/* EF3D94 80241784 AFA2001C */ sw $v0, 0x1c($sp) +/* EF3D98 80241788 44834000 */ mtc1 $v1, $f8 +/* EF3D9C 8024178C 00000000 */ nop +/* EF3DA0 80241790 46804220 */ cvt.s.w $f8, $f8 +/* EF3DA4 80241794 44074000 */ mfc1 $a3, $f8 +/* EF3DA8 80241798 27A20038 */ addiu $v0, $sp, 0x38 +/* EF3DAC 8024179C AFA20020 */ sw $v0, 0x20($sp) +/* EF3DB0 802417A0 E7A00010 */ swc1 $f0, 0x10($sp) +/* EF3DB4 802417A4 E7A20014 */ swc1 $f2, 0x14($sp) +/* EF3DB8 802417A8 0C01D444 */ jal func_80075110 +/* EF3DBC 802417AC E7A40018 */ swc1 $f4, 0x18($sp) +/* EF3DC0 802417B0 0200202D */ daddu $a0, $s0, $zero +/* EF3DC4 802417B4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EF3DC8 802417B8 0C013600 */ jal func_8004D800 +/* EF3DCC 802417BC 3C060020 */ lui $a2, 0x20 +/* EF3DD0 802417C0 0280282D */ daddu $a1, $s4, $zero +/* EF3DD4 802417C4 C6000038 */ lwc1 $f0, 0x38($s0) +/* EF3DD8 802417C8 C602003C */ lwc1 $f2, 0x3c($s0) +/* EF3DDC 802417CC C6040040 */ lwc1 $f4, 0x40($s0) +/* EF3DE0 802417D0 02A0302D */ daddu $a2, $s5, $zero +/* EF3DE4 802417D4 E7BA0034 */ swc1 $f26, 0x34($sp) +/* EF3DE8 802417D8 E7A00028 */ swc1 $f0, 0x28($sp) +/* EF3DEC 802417DC E7A2002C */ swc1 $f2, 0x2c($sp) +/* EF3DF0 802417E0 E7A40030 */ swc1 $f4, 0x30($sp) +/* EF3DF4 802417E4 AFB30010 */ sw $s3, 0x10($sp) +/* EF3DF8 802417E8 8E040080 */ lw $a0, 0x80($s0) +/* EF3DFC 802417EC 0C03908F */ jal func_800E423C +/* EF3E00 802417F0 02C0382D */ daddu $a3, $s6, $zero +/* EF3E04 802417F4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EF3E08 802417F8 46180000 */ add.s $f0, $f0, $f24 +/* EF3E0C 802417FC 2402000C */ addiu $v0, $zero, 0xc +/* EF3E10 80241800 E6000064 */ swc1 $f0, 0x64($s0) +/* EF3E14 80241804 08090680 */ j .L80241A00 +/* EF3E18 80241808 AE420070 */ sw $v0, 0x70($s2) +.L8024180C: +/* EF3E1C 8024180C 8E420074 */ lw $v0, 0x74($s2) +/* EF3E20 80241810 2442FFFF */ addiu $v0, $v0, -1 +.L80241814: +/* EF3E24 80241814 AE420074 */ sw $v0, 0x74($s2) +.L80241818: +/* EF3E28 80241818 8E2300D0 */ lw $v1, 0xd0($s1) +/* EF3E2C 8024181C C6000040 */ lwc1 $f0, 0x40($s0) +/* EF3E30 80241820 C4620000 */ lwc1 $f2, ($v1) +/* EF3E34 80241824 468010A0 */ cvt.s.w $f2, $f2 +/* EF3E38 80241828 C4640008 */ lwc1 $f4, 8($v1) +/* EF3E3C 8024182C 46802120 */ cvt.s.w $f4, $f4 +/* EF3E40 80241830 E7A00010 */ swc1 $f0, 0x10($sp) +/* EF3E44 80241834 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF3E48 80241838 44051000 */ mfc1 $a1, $f2 +/* EF3E4C 8024183C C440000C */ lwc1 $f0, 0xc($v0) +/* EF3E50 80241840 46800020 */ cvt.s.w $f0, $f0 +/* EF3E54 80241844 E7A00014 */ swc1 $f0, 0x14($sp) +/* EF3E58 80241848 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF3E5C 8024184C 44062000 */ mfc1 $a2, $f4 +/* EF3E60 80241850 C4400010 */ lwc1 $f0, 0x10($v0) +/* EF3E64 80241854 46800020 */ cvt.s.w $f0, $f0 +/* EF3E68 80241858 E7A00018 */ swc1 $f0, 0x18($sp) +/* EF3E6C 8024185C 8C640018 */ lw $a0, 0x18($v1) +/* EF3E70 80241860 0C013431 */ jal func_8004D0C4 +/* EF3E74 80241864 8E070038 */ lw $a3, 0x38($s0) +/* EF3E78 80241868 1040000D */ beqz $v0, .L802418A0 +/* EF3E7C 8024186C 00000000 */ nop +/* EF3E80 80241870 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF3E84 80241874 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EF3E88 80241878 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EF3E8C 8024187C C4480000 */ lwc1 $f8, ($v0) +/* EF3E90 80241880 46804220 */ cvt.s.w $f8, $f8 +/* EF3E94 80241884 44064000 */ mfc1 $a2, $f8 +/* EF3E98 80241888 C4480008 */ lwc1 $f8, 8($v0) +/* EF3E9C 8024188C 46804220 */ cvt.s.w $f8, $f8 +/* EF3EA0 80241890 44074000 */ mfc1 $a3, $f8 +/* EF3EA4 80241894 0C00ABDC */ jal fio_validate_header_checksums +/* EF3EA8 80241898 00000000 */ nop +/* EF3EAC 8024189C E600000C */ swc1 $f0, 0xc($s0) +.L802418A0: +/* EF3EB0 802418A0 8602008C */ lh $v0, 0x8c($s0) +/* EF3EB4 802418A4 14400056 */ bnez $v0, .L80241A00 +/* EF3EB8 802418A8 00000000 */ nop +/* EF3EBC 802418AC 8602008E */ lh $v0, 0x8e($s0) +/* EF3EC0 802418B0 1840003D */ blez $v0, .L802419A8 +/* EF3EC4 802418B4 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EF3EC8 802418B8 8E050018 */ lw $a1, 0x18($s0) +/* EF3ECC 802418BC 8E06000C */ lw $a2, 0xc($s0) +/* EF3ED0 802418C0 0C00F909 */ jal func_8003E424 +/* EF3ED4 802418C4 0200202D */ daddu $a0, $s0, $zero +/* EF3ED8 802418C8 8E22006C */ lw $v0, 0x6c($s1) +/* EF3EDC 802418CC 30420001 */ andi $v0, $v0, 1 +/* EF3EE0 802418D0 10400032 */ beqz $v0, .L8024199C +/* EF3EE4 802418D4 27A50028 */ addiu $a1, $sp, 0x28 +/* EF3EE8 802418D8 27A6002C */ addiu $a2, $sp, 0x2c +/* EF3EEC 802418DC C6000038 */ lwc1 $f0, 0x38($s0) +/* EF3EF0 802418E0 C6020040 */ lwc1 $f2, 0x40($s0) +/* EF3EF4 802418E4 3C01447A */ lui $at, 0x447a +/* EF3EF8 802418E8 44812000 */ mtc1 $at, $f4 +/* EF3EFC 802418EC 27A20034 */ addiu $v0, $sp, 0x34 +/* EF3F00 802418F0 E7B6002C */ swc1 $f22, 0x2c($sp) +/* EF3F04 802418F4 E7A00028 */ swc1 $f0, 0x28($sp) +/* EF3F08 802418F8 E7A20030 */ swc1 $f2, 0x30($sp) +/* EF3F0C 802418FC E7A40034 */ swc1 $f4, 0x34($sp) +/* EF3F10 80241900 AFA20010 */ sw $v0, 0x10($sp) +/* EF3F14 80241904 8E040080 */ lw $a0, 0x80($s0) +/* EF3F18 80241908 0C03908F */ jal func_800E423C +/* EF3F1C 8024190C 27A70030 */ addiu $a3, $sp, 0x30 +/* EF3F20 80241910 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* EF3F24 80241914 46180100 */ add.s $f4, $f0, $f24 +/* EF3F28 80241918 3C014000 */ lui $at, 0x4000 +/* EF3F2C 8024191C 44813800 */ mtc1 $at, $f7 +/* EF3F30 80241920 44803000 */ mtc1 $zero, $f6 +/* EF3F34 80241924 46162001 */ sub.s $f0, $f4, $f22 +/* EF3F38 80241928 E7A4002C */ swc1 $f4, 0x2c($sp) +/* EF3F3C 8024192C 460000A1 */ cvt.d.s $f2, $f0 +/* EF3F40 80241930 4622303C */ c.lt.d $f6, $f2 +/* EF3F44 80241934 00000000 */ nop +/* EF3F48 80241938 45000005 */ bc1f .L80241950 +/* EF3F4C 8024193C E7A00034 */ swc1 $f0, 0x34($sp) +/* EF3F50 80241940 4600B021 */ cvt.d.s $f0, $f22 +/* EF3F54 80241944 46260000 */ add.d $f0, $f0, $f6 +/* EF3F58 80241948 0809065F */ j .L8024197C +/* EF3F5C 8024194C 462005A0 */ cvt.s.d $f22, $f0 +.L80241950: +/* EF3F60 80241950 3C01C000 */ lui $at, 0xc000 +/* EF3F64 80241954 44810800 */ mtc1 $at, $f1 +/* EF3F68 80241958 44800000 */ mtc1 $zero, $f0 +/* EF3F6C 8024195C 00000000 */ nop +/* EF3F70 80241960 4620103C */ c.lt.d $f2, $f0 +/* EF3F74 80241964 00000000 */ nop +/* EF3F78 80241968 45020004 */ bc1fl .L8024197C +/* EF3F7C 8024196C 46002586 */ mov.s $f22, $f4 +/* EF3F80 80241970 4600B021 */ cvt.d.s $f0, $f22 +/* EF3F84 80241974 46260001 */ sub.d $f0, $f0, $f6 +/* EF3F88 80241978 462005A0 */ cvt.s.d $f22, $f0 +.L8024197C: +/* EF3F8C 8024197C 3C014059 */ lui $at, 0x4059 +/* EF3F90 80241980 44811800 */ mtc1 $at, $f3 +/* EF3F94 80241984 44801000 */ mtc1 $zero, $f2 +/* EF3F98 80241988 4600B021 */ cvt.d.s $f0, $f22 +/* EF3F9C 8024198C 46220002 */ mul.d $f0, $f0, $f2 +/* EF3FA0 80241990 00000000 */ nop +/* EF3FA4 80241994 4620020D */ trunc.w.d $f8, $f0 +/* EF3FA8 80241998 E628007C */ swc1 $f8, 0x7c($s1) +.L8024199C: +/* EF3FAC 8024199C 8602008E */ lh $v0, 0x8e($s0) +/* EF3FB0 802419A0 1C400017 */ bgtz $v0, .L80241A00 +/* EF3FB4 802419A4 240403E8 */ addiu $a0, $zero, 0x3e8 +.L802419A8: +/* EF3FB8 802419A8 24020002 */ addiu $v0, $zero, 2 +/* EF3FBC 802419AC 0C00AB3B */ jal func_8002ACEC +/* EF3FC0 802419B0 AE420070 */ sw $v0, 0x70($s2) +/* EF3FC4 802419B4 3C035555 */ lui $v1, 0x5555 +/* EF3FC8 802419B8 34635556 */ ori $v1, $v1, 0x5556 +/* EF3FCC 802419BC 00430018 */ mult $v0, $v1 +/* EF3FD0 802419C0 000227C3 */ sra $a0, $v0, 0x1f +/* EF3FD4 802419C4 00004010 */ mfhi $t0 +/* EF3FD8 802419C8 01042023 */ subu $a0, $t0, $a0 +/* EF3FDC 802419CC 00041840 */ sll $v1, $a0, 1 +/* EF3FE0 802419D0 00641821 */ addu $v1, $v1, $a0 +/* EF3FE4 802419D4 00431023 */ subu $v0, $v0, $v1 +/* EF3FE8 802419D8 24430002 */ addiu $v1, $v0, 2 +/* EF3FEC 802419DC AE430074 */ sw $v1, 0x74($s2) +/* EF3FF0 802419E0 8EE2002C */ lw $v0, 0x2c($s7) +/* EF3FF4 802419E4 58400006 */ blezl $v0, .L80241A00 +/* EF3FF8 802419E8 AE400070 */ sw $zero, 0x70($s2) +/* EF3FFC 802419EC 8EE20004 */ lw $v0, 4($s7) +/* EF4000 802419F0 58400003 */ blezl $v0, .L80241A00 +/* EF4004 802419F4 AE400070 */ sw $zero, 0x70($s2) +/* EF4008 802419F8 50600001 */ beql $v1, $zero, .L80241A00 +/* EF400C 802419FC AE400070 */ sw $zero, 0x70($s2) +.L80241A00: +/* EF4010 80241A00 8FBF0064 */ lw $ra, 0x64($sp) +/* EF4014 80241A04 8FBE0060 */ lw $fp, 0x60($sp) +/* EF4018 80241A08 8FB7005C */ lw $s7, 0x5c($sp) +/* EF401C 80241A0C 8FB60058 */ lw $s6, 0x58($sp) +/* EF4020 80241A10 8FB50054 */ lw $s5, 0x54($sp) +/* EF4024 80241A14 8FB40050 */ lw $s4, 0x50($sp) +/* EF4028 80241A18 8FB3004C */ lw $s3, 0x4c($sp) +/* EF402C 80241A1C 8FB20048 */ lw $s2, 0x48($sp) +/* EF4030 80241A20 8FB10044 */ lw $s1, 0x44($sp) +/* EF4034 80241A24 8FB00040 */ lw $s0, 0x40($sp) +/* EF4038 80241A28 D7BA0080 */ ldc1 $f26, 0x80($sp) +/* EF403C 80241A2C D7B80078 */ ldc1 $f24, 0x78($sp) +/* EF4040 80241A30 D7B60070 */ ldc1 $f22, 0x70($sp) +/* EF4044 80241A34 D7B40068 */ ldc1 $f20, 0x68($sp) +/* EF4048 80241A38 03E00008 */ jr $ra +/* EF404C 80241A3C 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/code_EF2680/func_80241A40_EF4050.s b/asm/nonmatchings/code_EF2680/func_80241A40_EF4050.s new file mode 100644 index 0000000000..81b4dbb66c --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80241A40_EF4050.s @@ -0,0 +1,156 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A40_EF4050 +/* EF4050 80241A40 27BDFF98 */ addiu $sp, $sp, -0x68 +/* EF4054 80241A44 AFB20048 */ sw $s2, 0x48($sp) +/* EF4058 80241A48 0080902D */ daddu $s2, $a0, $zero +/* EF405C 80241A4C AFBF0054 */ sw $ra, 0x54($sp) +/* EF4060 80241A50 AFB40050 */ sw $s4, 0x50($sp) +/* EF4064 80241A54 AFB3004C */ sw $s3, 0x4c($sp) +/* EF4068 80241A58 AFB10044 */ sw $s1, 0x44($sp) +/* EF406C 80241A5C AFB00040 */ sw $s0, 0x40($sp) +/* EF4070 80241A60 F7B60060 */ sdc1 $f22, 0x60($sp) +/* EF4074 80241A64 F7B40058 */ sdc1 $f20, 0x58($sp) +/* EF4078 80241A68 8E510148 */ lw $s1, 0x148($s2) +/* EF407C 80241A6C 00A0982D */ daddu $s3, $a1, $zero +/* EF4080 80241A70 86240008 */ lh $a0, 8($s1) +/* EF4084 80241A74 0C00F92F */ jal func_8003E4BC +/* EF4088 80241A78 00C0A02D */ daddu $s4, $a2, $zero +/* EF408C 80241A7C 0040802D */ daddu $s0, $v0, $zero +/* EF4090 80241A80 C6200078 */ lwc1 $f0, 0x78($s1) +/* EF4094 80241A84 46800020 */ cvt.s.w $f0, $f0 +/* EF4098 80241A88 46000021 */ cvt.d.s $f0, $f0 +/* EF409C 80241A8C 3C014059 */ lui $at, 0x4059 +/* EF40A0 80241A90 44814800 */ mtc1 $at, $f9 +/* EF40A4 80241A94 44804000 */ mtc1 $zero, $f8 +/* EF40A8 80241A98 8602008E */ lh $v0, 0x8e($s0) +/* EF40AC 80241A9C 9603008E */ lhu $v1, 0x8e($s0) +/* EF40B0 80241AA0 46280003 */ div.d $f0, $f0, $f8 +/* EF40B4 80241AA4 18400003 */ blez $v0, .L80241AB4 +/* EF40B8 80241AA8 462005A0 */ cvt.s.d $f22, $f0 +/* EF40BC 80241AAC 2462FFFF */ addiu $v0, $v1, -1 +/* EF40C0 80241AB0 A602008E */ sh $v0, 0x8e($s0) +.L80241AB4: +/* EF40C4 80241AB4 27A50028 */ addiu $a1, $sp, 0x28 +/* EF40C8 80241AB8 27A6002C */ addiu $a2, $sp, 0x2c +/* EF40CC 80241ABC 27A70030 */ addiu $a3, $sp, 0x30 +/* EF40D0 80241AC0 C6000038 */ lwc1 $f0, 0x38($s0) +/* EF40D4 80241AC4 C602003C */ lwc1 $f2, 0x3c($s0) +/* EF40D8 80241AC8 C6040040 */ lwc1 $f4, 0x40($s0) +/* EF40DC 80241ACC 3C01447A */ lui $at, 0x447a +/* EF40E0 80241AD0 44813000 */ mtc1 $at, $f6 +/* EF40E4 80241AD4 27A20034 */ addiu $v0, $sp, 0x34 +/* EF40E8 80241AD8 E7A00028 */ swc1 $f0, 0x28($sp) +/* EF40EC 80241ADC E7A2002C */ swc1 $f2, 0x2c($sp) +/* EF40F0 80241AE0 E7A40030 */ swc1 $f4, 0x30($sp) +/* EF40F4 80241AE4 E7A60034 */ swc1 $f6, 0x34($sp) +/* EF40F8 80241AE8 C6340070 */ lwc1 $f20, 0x70($s1) +/* EF40FC 80241AEC 4680A520 */ cvt.s.w $f20, $f20 +/* EF4100 80241AF0 4600A521 */ cvt.d.s $f20, $f20 +/* EF4104 80241AF4 4628A503 */ div.d $f20, $f20, $f8 +/* EF4108 80241AF8 AFA20010 */ sw $v0, 0x10($sp) +/* EF410C 80241AFC 8E040080 */ lw $a0, 0x80($s0) +/* EF4110 80241B00 0C03908F */ jal func_800E423C +/* EF4114 80241B04 4620A520 */ cvt.s.d $f20, $f20 +/* EF4118 80241B08 C62C0074 */ lwc1 $f12, 0x74($s1) +/* EF411C 80241B0C 0C00AD77 */ jal func_8002B5DC +/* EF4120 80241B10 46806320 */ cvt.s.w $f12, $f12 +/* EF4124 80241B14 46140002 */ mul.s $f0, $f0, $f20 +/* EF4128 80241B18 00000000 */ nop +/* EF412C 80241B1C C7A2002C */ lwc1 $f2, 0x2c($sp) +/* EF4130 80241B20 46161080 */ add.s $f2, $f2, $f22 +/* EF4134 80241B24 46001080 */ add.s $f2, $f2, $f0 +/* EF4138 80241B28 E602003C */ swc1 $f2, 0x3c($s0) +/* EF413C 80241B2C 8E220074 */ lw $v0, 0x74($s1) +/* EF4140 80241B30 2442000C */ addiu $v0, $v0, 0xc +/* EF4144 80241B34 44826000 */ mtc1 $v0, $f12 +/* EF4148 80241B38 00000000 */ nop +/* EF414C 80241B3C 0C00AB85 */ jal func_8002AE14 +/* EF4150 80241B40 46806320 */ cvt.s.w $f12, $f12 +/* EF4154 80241B44 4600028D */ trunc.w.s $f10, $f0 +/* EF4158 80241B48 E62A0074 */ swc1 $f10, 0x74($s1) +/* EF415C 80241B4C 0280202D */ daddu $a0, $s4, $zero +/* EF4160 80241B50 24020001 */ addiu $v0, $zero, 1 +/* EF4164 80241B54 AFA20010 */ sw $v0, 0x10($sp) +/* EF4168 80241B58 8E660024 */ lw $a2, 0x24($s3) +/* EF416C 80241B5C 8E670028 */ lw $a3, 0x28($s3) +/* EF4170 80241B60 0C013469 */ jal func_8004D1A4 +/* EF4174 80241B64 0220282D */ daddu $a1, $s1, $zero +/* EF4178 80241B68 1040001D */ beqz $v0, .L80241BE0 +/* EF417C 80241B6C 0000202D */ daddu $a0, $zero, $zero +/* EF4180 80241B70 0200282D */ daddu $a1, $s0, $zero +/* EF4184 80241B74 0000302D */ daddu $a2, $zero, $zero +/* EF4188 80241B78 860300A8 */ lh $v1, 0xa8($s0) +/* EF418C 80241B7C 3C013F80 */ lui $at, 0x3f80 +/* EF4190 80241B80 44810000 */ mtc1 $at, $f0 +/* EF4194 80241B84 3C014000 */ lui $at, 0x4000 +/* EF4198 80241B88 44811000 */ mtc1 $at, $f2 +/* EF419C 80241B8C 3C01C1A0 */ lui $at, 0xc1a0 +/* EF41A0 80241B90 44812000 */ mtc1 $at, $f4 +/* EF41A4 80241B94 2402000F */ addiu $v0, $zero, 0xf +/* EF41A8 80241B98 AFA2001C */ sw $v0, 0x1c($sp) +/* EF41AC 80241B9C 44835000 */ mtc1 $v1, $f10 +/* EF41B0 80241BA0 00000000 */ nop +/* EF41B4 80241BA4 468052A0 */ cvt.s.w $f10, $f10 +/* EF41B8 80241BA8 44075000 */ mfc1 $a3, $f10 +/* EF41BC 80241BAC 27A20038 */ addiu $v0, $sp, 0x38 +/* EF41C0 80241BB0 AFA20020 */ sw $v0, 0x20($sp) +/* EF41C4 80241BB4 E7A00010 */ swc1 $f0, 0x10($sp) +/* EF41C8 80241BB8 E7A20014 */ swc1 $f2, 0x14($sp) +/* EF41CC 80241BBC 0C01D444 */ jal func_80075110 +/* EF41D0 80241BC0 E7A40018 */ swc1 $f4, 0x18($sp) +/* EF41D4 80241BC4 0200202D */ daddu $a0, $s0, $zero +/* EF41D8 80241BC8 240502F4 */ addiu $a1, $zero, 0x2f4 +/* EF41DC 80241BCC 0C013600 */ jal func_8004D800 +/* EF41E0 80241BD0 3C060020 */ lui $a2, 0x20 +/* EF41E4 80241BD4 2402000C */ addiu $v0, $zero, 0xc +/* EF41E8 80241BD8 0809071A */ j .L80241C68 +/* EF41EC 80241BDC AE420070 */ sw $v0, 0x70($s2) +.L80241BE0: +/* EF41F0 80241BE0 8602008C */ lh $v0, 0x8c($s0) +/* EF41F4 80241BE4 14400020 */ bnez $v0, .L80241C68 +/* EF41F8 80241BE8 00000000 */ nop +/* EF41FC 80241BEC 8602008E */ lh $v0, 0x8e($s0) +/* EF4200 80241BF0 1C40001D */ bgtz $v0, .L80241C68 +/* EF4204 80241BF4 00000000 */ nop +/* EF4208 80241BF8 8E420074 */ lw $v0, 0x74($s2) +/* EF420C 80241BFC 2442FFFF */ addiu $v0, $v0, -1 +/* EF4210 80241C00 18400018 */ blez $v0, .L80241C64 +/* EF4214 80241C04 AE420074 */ sw $v0, 0x74($s2) +/* EF4218 80241C08 C600000C */ lwc1 $f0, 0xc($s0) +/* EF421C 80241C0C 3C014334 */ lui $at, 0x4334 +/* EF4220 80241C10 44816000 */ mtc1 $at, $f12 +/* EF4224 80241C14 0C00AB85 */ jal func_8002AE14 +/* EF4228 80241C18 460C0300 */ add.s $f12, $f0, $f12 +/* EF422C 80241C1C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* EF4230 80241C20 0C00AB3B */ jal func_8002ACEC +/* EF4234 80241C24 E600000C */ swc1 $f0, 0xc($s0) +/* EF4238 80241C28 3C032E8B */ lui $v1, 0x2e8b +/* EF423C 80241C2C 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* EF4240 80241C30 00430018 */ mult $v0, $v1 +/* EF4244 80241C34 00021FC3 */ sra $v1, $v0, 0x1f +/* EF4248 80241C38 00004010 */ mfhi $t0 +/* EF424C 80241C3C 00082043 */ sra $a0, $t0, 1 +/* EF4250 80241C40 00832023 */ subu $a0, $a0, $v1 +/* EF4254 80241C44 00041840 */ sll $v1, $a0, 1 +/* EF4258 80241C48 00641821 */ addu $v1, $v1, $a0 +/* EF425C 80241C4C 00031880 */ sll $v1, $v1, 2 +/* EF4260 80241C50 00641823 */ subu $v1, $v1, $a0 +/* EF4264 80241C54 00431023 */ subu $v0, $v0, $v1 +/* EF4268 80241C58 24420005 */ addiu $v0, $v0, 5 +/* EF426C 80241C5C 0809071A */ j .L80241C68 +/* EF4270 80241C60 A602008E */ sh $v0, 0x8e($s0) +.L80241C64: +/* EF4274 80241C64 AE400070 */ sw $zero, 0x70($s2) +.L80241C68: +/* EF4278 80241C68 8FBF0054 */ lw $ra, 0x54($sp) +/* EF427C 80241C6C 8FB40050 */ lw $s4, 0x50($sp) +/* EF4280 80241C70 8FB3004C */ lw $s3, 0x4c($sp) +/* EF4284 80241C74 8FB20048 */ lw $s2, 0x48($sp) +/* EF4288 80241C78 8FB10044 */ lw $s1, 0x44($sp) +/* EF428C 80241C7C 8FB00040 */ lw $s0, 0x40($sp) +/* EF4290 80241C80 D7B60060 */ ldc1 $f22, 0x60($sp) +/* EF4294 80241C84 D7B40058 */ ldc1 $f20, 0x58($sp) +/* EF4298 80241C88 03E00008 */ jr $ra +/* EF429C 80241C8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s b/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s new file mode 100644 index 0000000000..9906915921 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s @@ -0,0 +1,352 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C90_EF42A0 +/* EF42A0 80241C90 27BDFF98 */ addiu $sp, $sp, -0x68 +/* EF42A4 80241C94 AFB40050 */ sw $s4, 0x50($sp) +/* EF42A8 80241C98 0080A02D */ daddu $s4, $a0, $zero +/* EF42AC 80241C9C AFBF005C */ sw $ra, 0x5c($sp) +/* EF42B0 80241CA0 AFB60058 */ sw $s6, 0x58($sp) +/* EF42B4 80241CA4 AFB50054 */ sw $s5, 0x54($sp) +/* EF42B8 80241CA8 AFB3004C */ sw $s3, 0x4c($sp) +/* EF42BC 80241CAC AFB20048 */ sw $s2, 0x48($sp) +/* EF42C0 80241CB0 AFB10044 */ sw $s1, 0x44($sp) +/* EF42C4 80241CB4 AFB00040 */ sw $s0, 0x40($sp) +/* EF42C8 80241CB8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* EF42CC 80241CBC 8E930148 */ lw $s3, 0x148($s4) +/* EF42D0 80241CC0 86640008 */ lh $a0, 8($s3) +/* EF42D4 80241CC4 8E90000C */ lw $s0, 0xc($s4) +/* EF42D8 80241CC8 0C00F92F */ jal func_8003E4BC +/* EF42DC 80241CCC 00A0882D */ daddu $s1, $a1, $zero +/* EF42E0 80241CD0 0280202D */ daddu $a0, $s4, $zero +/* EF42E4 80241CD4 8E050000 */ lw $a1, ($s0) +/* EF42E8 80241CD8 0C0B53A3 */ jal func_802D4E8C +/* EF42EC 80241CDC 0040902D */ daddu $s2, $v0, $zero +/* EF42F0 80241CE0 AFA00020 */ sw $zero, 0x20($sp) +/* EF42F4 80241CE4 8E6300D0 */ lw $v1, 0xd0($s3) +/* EF42F8 80241CE8 8C630030 */ lw $v1, 0x30($v1) +/* EF42FC 80241CEC AFA30024 */ sw $v1, 0x24($sp) +/* EF4300 80241CF0 8E6300D0 */ lw $v1, 0xd0($s3) +/* EF4304 80241CF4 8C63001C */ lw $v1, 0x1c($v1) +/* EF4308 80241CF8 AFA30028 */ sw $v1, 0x28($sp) +/* EF430C 80241CFC 8E6300D0 */ lw $v1, 0xd0($s3) +/* EF4310 80241D00 8C630024 */ lw $v1, 0x24($v1) +/* EF4314 80241D04 AFA3002C */ sw $v1, 0x2c($sp) +/* EF4318 80241D08 8E6300D0 */ lw $v1, 0xd0($s3) +/* EF431C 80241D0C 8C630028 */ lw $v1, 0x28($v1) +/* EF4320 80241D10 AFA30030 */ sw $v1, 0x30($sp) +/* EF4324 80241D14 8E6300D0 */ lw $v1, 0xd0($s3) +/* EF4328 80241D18 3C0142F0 */ lui $at, 0x42f0 +/* EF432C 80241D1C 44810000 */ mtc1 $at, $f0 +/* EF4330 80241D20 8C63002C */ lw $v1, 0x2c($v1) +/* EF4334 80241D24 E7A00038 */ swc1 $f0, 0x38($sp) +/* EF4338 80241D28 A7A0003C */ sh $zero, 0x3c($sp) +/* EF433C 80241D2C AFA30034 */ sw $v1, 0x34($sp) +/* EF4340 80241D30 C6400038 */ lwc1 $f0, 0x38($s2) +/* EF4344 80241D34 E6600108 */ swc1 $f0, 0x108($s3) +/* EF4348 80241D38 C640003C */ lwc1 $f0, 0x3c($s2) +/* EF434C 80241D3C 27B50020 */ addiu $s5, $sp, 0x20 +/* EF4350 80241D40 E660010C */ swc1 $f0, 0x10c($s3) +/* EF4354 80241D44 3C0138D1 */ lui $at, 0x38d1 +/* EF4358 80241D48 3421B717 */ ori $at, $at, 0xb717 +/* EF435C 80241D4C 44810000 */ mtc1 $at, $f0 +/* EF4360 80241D50 C6420040 */ lwc1 $f2, 0x40($s2) +/* EF4364 80241D54 0040B02D */ daddu $s6, $v0, $zero +/* EF4368 80241D58 E6600114 */ swc1 $f0, 0x114($s3) +/* EF436C 80241D5C E6600118 */ swc1 $f0, 0x118($s3) +/* EF4370 80241D60 12200007 */ beqz $s1, .L80241D80 +/* EF4374 80241D64 E6620110 */ swc1 $f2, 0x110($s3) +/* EF4378 80241D68 0240202D */ daddu $a0, $s2, $zero +/* EF437C 80241D6C 0260282D */ daddu $a1, $s3, $zero +/* EF4380 80241D70 0280302D */ daddu $a2, $s4, $zero +/* EF4384 80241D74 0C090496 */ jal func_80241258_EF3868 +/* EF4388 80241D78 02C0382D */ daddu $a3, $s6, $zero +/* EF438C 80241D7C AE800070 */ sw $zero, 0x70($s4) +.L80241D80: +/* EF4390 80241D80 2402FFFD */ addiu $v0, $zero, -3 +/* EF4394 80241D84 A24200AB */ sb $v0, 0xab($s2) +/* EF4398 80241D88 8E6300B0 */ lw $v1, 0xb0($s3) +/* EF439C 80241D8C 30620004 */ andi $v0, $v1, 4 +/* EF43A0 80241D90 10400007 */ beqz $v0, .L80241DB0 +/* EF43A4 80241D94 00000000 */ nop +/* EF43A8 80241D98 826200B4 */ lb $v0, 0xb4($s3) +/* EF43AC 80241D9C 144000F4 */ bnez $v0, .L80242170 +/* EF43B0 80241DA0 0000102D */ daddu $v0, $zero, $zero +/* EF43B4 80241DA4 2402FFFB */ addiu $v0, $zero, -5 +/* EF43B8 80241DA8 00621024 */ and $v0, $v1, $v0 +/* EF43BC 80241DAC AE6200B0 */ sw $v0, 0xb0($s3) +.L80241DB0: +/* EF43C0 80241DB0 8E830070 */ lw $v1, 0x70($s4) +/* EF43C4 80241DB4 24020001 */ addiu $v0, $zero, 1 +/* EF43C8 80241DB8 10620011 */ beq $v1, $v0, .L80241E00 +/* EF43CC 80241DBC 28620002 */ slti $v0, $v1, 2 +/* EF43D0 80241DC0 10400005 */ beqz $v0, .L80241DD8 +/* EF43D4 80241DC4 24020002 */ addiu $v0, $zero, 2 +/* EF43D8 80241DC8 10600009 */ beqz $v1, .L80241DF0 +/* EF43DC 80241DCC 2402000C */ addiu $v0, $zero, 0xc +/* EF43E0 80241DD0 08090790 */ j .L80241E40 +/* EF43E4 80241DD4 00000000 */ nop +.L80241DD8: +/* EF43E8 80241DD8 1062000F */ beq $v1, $v0, .L80241E18 +/* EF43EC 80241DDC 24020003 */ addiu $v0, $zero, 3 +/* EF43F0 80241DE0 10620012 */ beq $v1, $v0, .L80241E2C +/* EF43F4 80241DE4 0280202D */ daddu $a0, $s4, $zero +/* EF43F8 80241DE8 0809078E */ j .L80241E38 +/* EF43FC 80241DEC 00000000 */ nop +.L80241DF0: +/* EF4400 80241DF0 0280202D */ daddu $a0, $s4, $zero +/* EF4404 80241DF4 02C0282D */ daddu $a1, $s6, $zero +/* EF4408 80241DF8 0C09001C */ jal func_80240070_EF2680 +/* EF440C 80241DFC 02A0302D */ daddu $a2, $s5, $zero +.L80241E00: +/* EF4410 80241E00 0280202D */ daddu $a0, $s4, $zero +/* EF4414 80241E04 02C0282D */ daddu $a1, $s6, $zero +/* EF4418 80241E08 0C090577 */ jal func_802415DC_EF3BEC +/* EF441C 80241E0C 02A0302D */ daddu $a2, $s5, $zero +/* EF4420 80241E10 0809078E */ j .L80241E38 +/* EF4424 80241E14 00000000 */ nop +.L80241E18: +/* EF4428 80241E18 0280202D */ daddu $a0, $s4, $zero +/* EF442C 80241E1C 02C0282D */ daddu $a1, $s6, $zero +/* EF4430 80241E20 0C090212 */ jal func_80240848_EF2E58 +/* EF4434 80241E24 02A0302D */ daddu $a2, $s5, $zero +/* EF4438 80241E28 0280202D */ daddu $a0, $s4, $zero +.L80241E2C: +/* EF443C 80241E2C 02C0282D */ daddu $a1, $s6, $zero +/* EF4440 80241E30 0C090690 */ jal func_80241A40_EF4050 +/* EF4444 80241E34 02A0302D */ daddu $a2, $s5, $zero +.L80241E38: +/* EF4448 80241E38 8E830070 */ lw $v1, 0x70($s4) +/* EF444C 80241E3C 2402000C */ addiu $v0, $zero, 0xc +.L80241E40: +/* EF4450 80241E40 1462001A */ bne $v1, $v0, .L80241EAC +/* EF4454 80241E44 00000000 */ nop +/* EF4458 80241E48 C64C0038 */ lwc1 $f12, 0x38($s2) +/* EF445C 80241E4C 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EF4460 80241E50 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EF4464 80241E54 C64E0040 */ lwc1 $f14, 0x40($s2) +/* EF4468 80241E58 8C460028 */ lw $a2, 0x28($v0) +/* EF446C 80241E5C 0C00ABDC */ jal fio_validate_header_checksums +/* EF4470 80241E60 8C470030 */ lw $a3, 0x30($v0) +/* EF4474 80241E64 0C090565 */ jal func_80241594_EF3BA4 +/* EF4478 80241E68 E640000C */ swc1 $f0, 0xc($s2) +/* EF447C 80241E6C 0440000F */ bltz $v0, .L80241EAC +/* EF4480 80241E70 AE62007C */ sw $v0, 0x7c($s3) +/* EF4484 80241E74 0C010ABD */ jal func_80042AF4 +/* EF4488 80241E78 0040202D */ daddu $a0, $v0, $zero +/* EF448C 80241E7C 3C030049 */ lui $v1, 0x49 +/* EF4490 80241E80 0040202D */ daddu $a0, $v0, $zero +/* EF4494 80241E84 24020001 */ addiu $v0, $zero, 1 +/* EF4498 80241E88 AC820094 */ sw $v0, 0x94($a0) +/* EF449C 80241E8C 86620008 */ lh $v0, 8($s3) +/* EF44A0 80241E90 34630014 */ ori $v1, $v1, 0x14 +/* EF44A4 80241E94 AC820098 */ sw $v0, 0x98($a0) +/* EF44A8 80241E98 2402000F */ addiu $v0, $zero, 0xf +/* EF44AC 80241E9C A642008E */ sh $v0, 0x8e($s2) +/* EF44B0 80241EA0 2402001E */ addiu $v0, $zero, 0x1e +/* EF44B4 80241EA4 AE430028 */ sw $v1, 0x28($s2) +/* EF44B8 80241EA8 AE820070 */ sw $v0, 0x70($s4) +.L80241EAC: +/* EF44BC 80241EAC 8E830070 */ lw $v1, 0x70($s4) +/* EF44C0 80241EB0 2402000D */ addiu $v0, $zero, 0xd +/* EF44C4 80241EB4 10620010 */ beq $v1, $v0, .L80241EF8 +/* EF44C8 80241EB8 2862000E */ slti $v0, $v1, 0xe +/* EF44CC 80241EBC 10400005 */ beqz $v0, .L80241ED4 +/* EF44D0 80241EC0 2402000C */ addiu $v0, $zero, 0xc +/* EF44D4 80241EC4 10620008 */ beq $v1, $v0, .L80241EE8 +/* EF44D8 80241EC8 2410001F */ addiu $s0, $zero, 0x1f +/* EF44DC 80241ECC 080907C9 */ j .L80241F24 +/* EF44E0 80241ED0 00000000 */ nop +.L80241ED4: +/* EF44E4 80241ED4 2402000E */ addiu $v0, $zero, 0xe +/* EF44E8 80241ED8 1062000D */ beq $v1, $v0, .L80241F10 +/* EF44EC 80241EDC 0280202D */ daddu $a0, $s4, $zero +/* EF44F0 80241EE0 080907C7 */ j .L80241F1C +/* EF44F4 80241EE4 00000000 */ nop +.L80241EE8: +/* EF44F8 80241EE8 0280202D */ daddu $a0, $s4, $zero +/* EF44FC 80241EEC 02C0282D */ daddu $a1, $s6, $zero +/* EF4500 80241EF0 0C09034C */ jal func_80240D30_EF3340 +/* EF4504 80241EF4 02A0302D */ daddu $a2, $s5, $zero +.L80241EF8: +/* EF4508 80241EF8 0280202D */ daddu $a0, $s4, $zero +/* EF450C 80241EFC 02C0282D */ daddu $a1, $s6, $zero +/* EF4510 80241F00 0C090399 */ jal func_80240E64_EF3474 +/* EF4514 80241F04 02A0302D */ daddu $a2, $s5, $zero +/* EF4518 80241F08 080907C7 */ j .L80241F1C +/* EF451C 80241F0C 00000000 */ nop +.L80241F10: +/* EF4520 80241F10 02C0282D */ daddu $a1, $s6, $zero +/* EF4524 80241F14 0C0903B2 */ jal func_80240EC8_EF34D8 +/* EF4528 80241F18 02A0302D */ daddu $a2, $s5, $zero +.L80241F1C: +/* EF452C 80241F1C 8E830070 */ lw $v1, 0x70($s4) +/* EF4530 80241F20 2410001F */ addiu $s0, $zero, 0x1f +.L80241F24: +/* EF4534 80241F24 1070001B */ beq $v1, $s0, .L80241F94 +/* EF4538 80241F28 28620020 */ slti $v0, $v1, 0x20 +/* EF453C 80241F2C 10400005 */ beqz $v0, .L80241F44 +/* EF4540 80241F30 2402001E */ addiu $v0, $zero, 0x1e +/* EF4544 80241F34 1062000A */ beq $v1, $v0, .L80241F60 +/* EF4548 80241F38 00000000 */ nop +/* EF454C 80241F3C 08090804 */ j .L80242010 +/* EF4550 80241F40 00000000 */ nop +.L80241F44: +/* EF4554 80241F44 24020020 */ addiu $v0, $zero, 0x20 +/* EF4558 80241F48 10620022 */ beq $v1, $v0, .L80241FD4 +/* EF455C 80241F4C 24020021 */ addiu $v0, $zero, 0x21 +/* EF4560 80241F50 10620029 */ beq $v1, $v0, .L80241FF8 +/* EF4564 80241F54 00000000 */ nop +/* EF4568 80241F58 08090804 */ j .L80242010 +/* EF456C 80241F5C 00000000 */ nop +.L80241F60: +/* EF4570 80241F60 9642008E */ lhu $v0, 0x8e($s2) +/* EF4574 80241F64 2442FFFF */ addiu $v0, $v0, -1 +/* EF4578 80241F68 A642008E */ sh $v0, 0x8e($s2) +/* EF457C 80241F6C 00021400 */ sll $v0, $v0, 0x10 +/* EF4580 80241F70 1C400027 */ bgtz $v0, .L80242010 +/* EF4584 80241F74 00000000 */ nop +/* EF4588 80241F78 0C010ABD */ jal func_80042AF4 +/* EF458C 80241F7C 8E64007C */ lw $a0, 0x7c($s3) +/* EF4590 80241F80 24030002 */ addiu $v1, $zero, 2 +/* EF4594 80241F84 AC430094 */ sw $v1, 0x94($v0) +/* EF4598 80241F88 24020005 */ addiu $v0, $zero, 5 +/* EF459C 80241F8C A642008E */ sh $v0, 0x8e($s2) +/* EF45A0 80241F90 AE900070 */ sw $s0, 0x70($s4) +.L80241F94: +/* EF45A4 80241F94 9642008E */ lhu $v0, 0x8e($s2) +/* EF45A8 80241F98 2442FFFF */ addiu $v0, $v0, -1 +/* EF45AC 80241F9C A642008E */ sh $v0, 0x8e($s2) +/* EF45B0 80241FA0 00021400 */ sll $v0, $v0, 0x10 +/* EF45B4 80241FA4 1C40001A */ bgtz $v0, .L80242010 +/* EF45B8 80241FA8 3C020049 */ lui $v0, 0x49 +/* EF45BC 80241FAC 34420015 */ ori $v0, $v0, 0x15 +/* EF45C0 80241FB0 AE420028 */ sw $v0, 0x28($s2) +/* EF45C4 80241FB4 0C010ABD */ jal func_80042AF4 +/* EF45C8 80241FB8 8E64007C */ lw $a0, 0x7c($s3) +/* EF45CC 80241FBC 24030003 */ addiu $v1, $zero, 3 +/* EF45D0 80241FC0 AC430094 */ sw $v1, 0x94($v0) +/* EF45D4 80241FC4 2402000A */ addiu $v0, $zero, 0xa +/* EF45D8 80241FC8 A642008E */ sh $v0, 0x8e($s2) +/* EF45DC 80241FCC 24020020 */ addiu $v0, $zero, 0x20 +/* EF45E0 80241FD0 AE820070 */ sw $v0, 0x70($s4) +.L80241FD4: +/* EF45E4 80241FD4 9642008E */ lhu $v0, 0x8e($s2) +/* EF45E8 80241FD8 2442FFFF */ addiu $v0, $v0, -1 +/* EF45EC 80241FDC A642008E */ sh $v0, 0x8e($s2) +/* EF45F0 80241FE0 00021400 */ sll $v0, $v0, 0x10 +/* EF45F4 80241FE4 1C40000A */ bgtz $v0, .L80242010 +/* EF45F8 80241FE8 24020003 */ addiu $v0, $zero, 3 +/* EF45FC 80241FEC A642008E */ sh $v0, 0x8e($s2) +/* EF4600 80241FF0 24020021 */ addiu $v0, $zero, 0x21 +/* EF4604 80241FF4 AE820070 */ sw $v0, 0x70($s4) +.L80241FF8: +/* EF4608 80241FF8 9642008E */ lhu $v0, 0x8e($s2) +/* EF460C 80241FFC 2442FFFF */ addiu $v0, $v0, -1 +/* EF4610 80242000 A642008E */ sh $v0, 0x8e($s2) +/* EF4614 80242004 00021400 */ sll $v0, $v0, 0x10 +/* EF4618 80242008 58400001 */ blezl $v0, .L80242010 +/* EF461C 8024200C AE800070 */ sw $zero, 0x70($s4) +.L80242010: +/* EF4620 80242010 8E820070 */ lw $v0, 0x70($s4) +/* EF4624 80242014 2442FFE2 */ addiu $v0, $v0, -0x1e +/* EF4628 80242018 2C420002 */ sltiu $v0, $v0, 2 +/* EF462C 8024201C 10400054 */ beqz $v0, .L80242170 +/* EF4630 80242020 0000102D */ daddu $v0, $zero, $zero +/* EF4634 80242024 3C108010 */ lui $s0, %hi(D_800FFC90) +/* EF4638 80242028 2610FC90 */ addiu $s0, $s0, %lo(D_800FFC90) +/* EF463C 8024202C C64C0038 */ lwc1 $f12, 0x38($s2) +/* EF4640 80242030 8E020000 */ lw $v0, ($s0) +/* EF4644 80242034 C64E0040 */ lwc1 $f14, 0x40($s2) +/* EF4648 80242038 8C460028 */ lw $a2, 0x28($v0) +/* EF464C 8024203C 0C00ABDC */ jal fio_validate_header_checksums +/* EF4650 80242040 8C470030 */ lw $a3, 0x30($v0) +/* EF4654 80242044 8E460038 */ lw $a2, 0x38($s2) +/* EF4658 80242048 8E470040 */ lw $a3, 0x40($s2) +/* EF465C 8024204C 8E020000 */ lw $v0, ($s0) +/* EF4660 80242050 E640000C */ swc1 $f0, 0xc($s2) +/* EF4664 80242054 C44C0028 */ lwc1 $f12, 0x28($v0) +/* EF4668 80242058 0C00AC71 */ jal func_8002B1C4 +/* EF466C 8024205C C44E0030 */ lwc1 $f14, 0x30($v0) +/* EF4670 80242060 C6A20008 */ lwc1 $f2, 8($s5) +/* EF4674 80242064 468010A0 */ cvt.s.w $f2, $f2 +/* EF4678 80242068 44051000 */ mfc1 $a1, $f2 +/* EF467C 8024206C C6A2000C */ lwc1 $f2, 0xc($s5) +/* EF4680 80242070 468010A0 */ cvt.s.w $f2, $f2 +/* EF4684 80242074 44061000 */ mfc1 $a2, $f2 +/* EF4688 80242078 C6420040 */ lwc1 $f2, 0x40($s2) +/* EF468C 8024207C E7A20010 */ swc1 $f2, 0x10($sp) +/* EF4690 80242080 C6A20010 */ lwc1 $f2, 0x10($s5) +/* EF4694 80242084 468010A0 */ cvt.s.w $f2, $f2 +/* EF4698 80242088 E7A20014 */ swc1 $f2, 0x14($sp) +/* EF469C 8024208C C6A20014 */ lwc1 $f2, 0x14($s5) +/* EF46A0 80242090 468010A0 */ cvt.s.w $f2, $f2 +/* EF46A4 80242094 E7A20018 */ swc1 $f2, 0x18($sp) +/* EF46A8 80242098 8EA40004 */ lw $a0, 4($s5) +/* EF46AC 8024209C 8E470038 */ lw $a3, 0x38($s2) +/* EF46B0 802420A0 0C013431 */ jal func_8004D0C4 +/* EF46B4 802420A4 46000506 */ mov.s $f20, $f0 +/* EF46B8 802420A8 14400031 */ bnez $v0, .L80242170 +/* EF46BC 802420AC 0000102D */ daddu $v0, $zero, $zero +/* EF46C0 802420B0 3C01403E */ lui $at, 0x403e +/* EF46C4 802420B4 44810800 */ mtc1 $at, $f1 +/* EF46C8 802420B8 44800000 */ mtc1 $zero, $f0 +/* EF46CC 802420BC 4600A0A1 */ cvt.d.s $f2, $f20 +/* EF46D0 802420C0 4622003C */ c.lt.d $f0, $f2 +/* EF46D4 802420C4 00000000 */ nop +/* EF46D8 802420C8 45000029 */ bc1f .L80242170 +/* EF46DC 802420CC 00000000 */ nop +/* EF46E0 802420D0 8642008C */ lh $v0, 0x8c($s2) +/* EF46E4 802420D4 54400026 */ bnel $v0, $zero, .L80242170 +/* EF46E8 802420D8 0000102D */ daddu $v0, $zero, $zero +/* EF46EC 802420DC 3C014034 */ lui $at, 0x4034 +/* EF46F0 802420E0 44810800 */ mtc1 $at, $f1 +/* EF46F4 802420E4 44800000 */ mtc1 $zero, $f0 +/* EF46F8 802420E8 00000000 */ nop +/* EF46FC 802420EC 46201001 */ sub.d $f0, $f2, $f0 +/* EF4700 802420F0 44801000 */ mtc1 $zero, $f2 +/* EF4704 802420F4 44801800 */ mtc1 $zero, $f3 +/* EF4708 802420F8 46200120 */ cvt.s.d $f4, $f0 +/* EF470C 802420FC 46002021 */ cvt.d.s $f0, $f4 +/* EF4710 80242100 4622003C */ c.lt.d $f0, $f2 +/* EF4714 80242104 00000000 */ nop +/* EF4718 80242108 45000002 */ bc1f .L80242114 +/* EF471C 8024210C 00000000 */ nop +/* EF4720 80242110 44802000 */ mtc1 $zero, $f4 +.L80242114: +/* EF4724 80242114 3C014069 */ lui $at, 0x4069 +/* EF4728 80242118 44811800 */ mtc1 $at, $f3 +/* EF472C 8024211C 44801000 */ mtc1 $zero, $f2 +/* EF4730 80242120 46002021 */ cvt.d.s $f0, $f4 +/* EF4734 80242124 4620103C */ c.lt.d $f2, $f0 +/* EF4738 80242128 00000000 */ nop +/* EF473C 8024212C 45000003 */ bc1f .L8024213C +/* EF4740 80242130 240200C8 */ addiu $v0, $zero, 0xc8 +/* EF4744 80242134 3C014348 */ lui $at, 0x4348 +/* EF4748 80242138 44812000 */ mtc1 $at, $f4 +.L8024213C: +/* EF474C 8024213C AFA20010 */ sw $v0, 0x10($sp) +/* EF4750 80242140 8EC50000 */ lw $a1, ($s6) +/* EF4754 80242144 8EC60018 */ lw $a2, 0x18($s6) +/* EF4758 80242148 4600218D */ trunc.w.s $f6, $f4 +/* EF475C 8024214C 44073000 */ mfc1 $a3, $f6 +/* EF4760 80242150 0C00ADA9 */ jal func_8002B6A4 +/* EF4764 80242154 0000202D */ daddu $a0, $zero, $zero +/* EF4768 80242158 44050000 */ mfc1 $a1, $f0 +/* EF476C 8024215C 8E46000C */ lw $a2, 0xc($s2) +/* EF4770 80242160 0240202D */ daddu $a0, $s2, $zero +/* EF4774 80242164 0C00F909 */ jal func_8003E424 +/* EF4778 80242168 AC850018 */ sw $a1, 0x18($a0) +/* EF477C 8024216C 0000102D */ daddu $v0, $zero, $zero +.L80242170: +/* EF4780 80242170 8FBF005C */ lw $ra, 0x5c($sp) +/* EF4784 80242174 8FB60058 */ lw $s6, 0x58($sp) +/* EF4788 80242178 8FB50054 */ lw $s5, 0x54($sp) +/* EF478C 8024217C 8FB40050 */ lw $s4, 0x50($sp) +/* EF4790 80242180 8FB3004C */ lw $s3, 0x4c($sp) +/* EF4794 80242184 8FB20048 */ lw $s2, 0x48($sp) +/* EF4798 80242188 8FB10044 */ lw $s1, 0x44($sp) +/* EF479C 8024218C 8FB00040 */ lw $s0, 0x40($sp) +/* EF47A0 80242190 D7B40060 */ ldc1 $f20, 0x60($sp) +/* EF47A4 80242194 03E00008 */ jr $ra +/* EF47A8 80242198 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/code_EF2680/func_8024219C_EF47AC.s b/asm/nonmatchings/code_EF2680/func_8024219C_EF47AC.s new file mode 100644 index 0000000000..f9a0a91d9d --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_8024219C_EF47AC.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024219C_EF47AC +/* EF47AC 8024219C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EF47B0 802421A0 AFB20018 */ sw $s2, 0x18($sp) +/* EF47B4 802421A4 0080902D */ daddu $s2, $a0, $zero +/* EF47B8 802421A8 AFBF001C */ sw $ra, 0x1c($sp) +/* EF47BC 802421AC AFB10014 */ sw $s1, 0x14($sp) +/* EF47C0 802421B0 AFB00010 */ sw $s0, 0x10($sp) +/* EF47C4 802421B4 8E510148 */ lw $s1, 0x148($s2) +/* EF47C8 802421B8 0C00F92F */ jal func_8003E4BC +/* EF47CC 802421BC 86240008 */ lh $a0, 8($s1) +/* EF47D0 802421C0 0040802D */ daddu $s0, $v0, $zero +/* EF47D4 802421C4 8E2300CC */ lw $v1, 0xcc($s1) +/* EF47D8 802421C8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EF47DC 802421CC 8C630020 */ lw $v1, 0x20($v1) +/* EF47E0 802421D0 AE030028 */ sw $v1, 0x28($s0) +/* EF47E4 802421D4 96220076 */ lhu $v0, 0x76($s1) +/* EF47E8 802421D8 A602008E */ sh $v0, 0x8e($s0) +/* EF47EC 802421DC 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EF47F0 802421E0 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EF47F4 802421E4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EF47F8 802421E8 8C460028 */ lw $a2, 0x28($v0) +/* EF47FC 802421EC 0C00ABDC */ jal fio_validate_header_checksums +/* EF4800 802421F0 8C470030 */ lw $a3, 0x30($v0) +/* EF4804 802421F4 2402000D */ addiu $v0, $zero, 0xd +/* EF4808 802421F8 E600000C */ swc1 $f0, 0xc($s0) +/* EF480C 802421FC AE420070 */ sw $v0, 0x70($s2) +/* EF4810 80242200 8FBF001C */ lw $ra, 0x1c($sp) +/* EF4814 80242204 8FB20018 */ lw $s2, 0x18($sp) +/* EF4818 80242208 8FB10014 */ lw $s1, 0x14($sp) +/* EF481C 8024220C 8FB00010 */ lw $s0, 0x10($sp) +/* EF4820 80242210 03E00008 */ jr $ra +/* EF4824 80242214 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EF2680/func_80242218_EF4828.s b/asm/nonmatchings/code_EF2680/func_80242218_EF4828.s new file mode 100644 index 0000000000..1dfb5ed38f --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80242218_EF4828.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242218_EF4828 +/* EF4828 80242218 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* EF482C 8024221C AFB3001C */ sw $s3, 0x1c($sp) +/* EF4830 80242220 0080982D */ daddu $s3, $a0, $zero +/* EF4834 80242224 AFBF0020 */ sw $ra, 0x20($sp) +/* EF4838 80242228 AFB20018 */ sw $s2, 0x18($sp) +/* EF483C 8024222C AFB10014 */ sw $s1, 0x14($sp) +/* EF4840 80242230 AFB00010 */ sw $s0, 0x10($sp) +/* EF4844 80242234 8E710148 */ lw $s1, 0x148($s3) +/* EF4848 80242238 86240008 */ lh $a0, 8($s1) +/* EF484C 8024223C 0C00F92F */ jal func_8003E4BC +/* EF4850 80242240 00A0902D */ daddu $s2, $a1, $zero +/* EF4854 80242244 0040802D */ daddu $s0, $v0, $zero +/* EF4858 80242248 8602008E */ lh $v0, 0x8e($s0) +/* EF485C 8024224C 9603008E */ lhu $v1, 0x8e($s0) +/* EF4860 80242250 18400005 */ blez $v0, .L80242268 +/* EF4864 80242254 2462FFFF */ addiu $v0, $v1, -1 +/* EF4868 80242258 A602008E */ sh $v0, 0x8e($s0) +/* EF486C 8024225C 00021400 */ sll $v0, $v0, 0x10 +/* EF4870 80242260 1C400033 */ bgtz $v0, .L80242330 +/* EF4874 80242264 00000000 */ nop +.L80242268: +/* EF4878 80242268 8602008C */ lh $v0, 0x8c($s0) +/* EF487C 8024226C 14400030 */ bnez $v0, .L80242330 +/* EF4880 80242270 00000000 */ nop +/* EF4884 80242274 8E2200CC */ lw $v0, 0xcc($s1) +/* EF4888 80242278 8C420024 */ lw $v0, 0x24($v0) +/* EF488C 8024227C AE020028 */ sw $v0, 0x28($s0) +/* EF4890 80242280 C6400018 */ lwc1 $f0, 0x18($s2) +/* EF4894 80242284 E6000018 */ swc1 $f0, 0x18($s0) +/* EF4898 80242288 8E230088 */ lw $v1, 0x88($s1) +/* EF489C 8024228C 24020005 */ addiu $v0, $zero, 5 +/* EF48A0 80242290 10620005 */ beq $v1, $v0, .L802422A8 +/* EF48A4 80242294 00000000 */ nop +/* EF48A8 80242298 10600003 */ beqz $v1, .L802422A8 +/* EF48AC 8024229C 24020001 */ addiu $v0, $zero, 1 +/* EF48B0 802422A0 14620006 */ bne $v1, $v0, .L802422BC +/* EF48B4 802422A4 00000000 */ nop +.L802422A8: +/* EF48B8 802422A8 8E220084 */ lw $v0, 0x84($s1) +/* EF48BC 802422AC 00021FC2 */ srl $v1, $v0, 0x1f +/* EF48C0 802422B0 00431021 */ addu $v0, $v0, $v1 +/* EF48C4 802422B4 00021043 */ sra $v0, $v0, 1 +/* EF48C8 802422B8 A60200A8 */ sh $v0, 0xa8($s0) +.L802422BC: +/* EF48CC 802422BC 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EF48D0 802422C0 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EF48D4 802422C4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* EF48D8 802422C8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* EF48DC 802422CC 8C460028 */ lw $a2, 0x28($v0) +/* EF48E0 802422D0 0C00AC71 */ jal func_8002B1C4 +/* EF48E4 802422D4 8C470030 */ lw $a3, 0x30($v0) +/* EF48E8 802422D8 C6020018 */ lwc1 $f2, 0x18($s0) +/* EF48EC 802422DC 46020003 */ div.s $f0, $f0, $f2 +/* EF48F0 802422E0 3C018024 */ lui $at, %hi(D_80245408) +/* EF48F4 802422E4 D4225408 */ ldc1 $f2, %lo(D_80245408)($at) +/* EF48F8 802422E8 46000021 */ cvt.d.s $f0, $f0 +/* EF48FC 802422EC 46220000 */ add.d $f0, $f0, $f2 +/* EF4900 802422F0 4620010D */ trunc.w.d $f4, $f0 +/* EF4904 802422F4 44022000 */ mfc1 $v0, $f4 +/* EF4908 802422F8 00000000 */ nop +/* EF490C 802422FC A602008E */ sh $v0, 0x8e($s0) +/* EF4910 80242300 00021400 */ sll $v0, $v0, 0x10 +/* EF4914 80242304 8E230078 */ lw $v1, 0x78($s1) +/* EF4918 80242308 00021403 */ sra $v0, $v0, 0x10 +/* EF491C 8024230C 0043102A */ slt $v0, $v0, $v1 +/* EF4920 80242310 10400003 */ beqz $v0, .L80242320 +/* EF4924 80242314 00000000 */ nop +/* EF4928 80242318 9622007A */ lhu $v0, 0x7a($s1) +/* EF492C 8024231C A602008E */ sh $v0, 0x8e($s0) +.L80242320: +/* EF4930 80242320 8602008E */ lh $v0, 0x8e($s0) +/* EF4934 80242324 AE22007C */ sw $v0, 0x7c($s1) +/* EF4938 80242328 2402000E */ addiu $v0, $zero, 0xe +/* EF493C 8024232C AE620070 */ sw $v0, 0x70($s3) +.L80242330: +/* EF4940 80242330 8FBF0020 */ lw $ra, 0x20($sp) +/* EF4944 80242334 8FB3001C */ lw $s3, 0x1c($sp) +/* EF4948 80242338 8FB20018 */ lw $s2, 0x18($sp) +/* EF494C 8024233C 8FB10014 */ lw $s1, 0x14($sp) +/* EF4950 80242340 8FB00010 */ lw $s0, 0x10($sp) +/* EF4954 80242344 03E00008 */ jr $ra +/* EF4958 80242348 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_EF2680/func_8024234C_EF495C.s b/asm/nonmatchings/code_EF2680/func_8024234C_EF495C.s new file mode 100644 index 0000000000..8a7779e9a9 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_8024234C_EF495C.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024234C_EF495C +/* EF495C 8024234C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EF4960 80242350 AFB3003C */ sw $s3, 0x3c($sp) +/* EF4964 80242354 0080982D */ daddu $s3, $a0, $zero +/* EF4968 80242358 AFBF0040 */ sw $ra, 0x40($sp) +/* EF496C 8024235C AFB20038 */ sw $s2, 0x38($sp) +/* EF4970 80242360 AFB10034 */ sw $s1, 0x34($sp) +/* EF4974 80242364 AFB00030 */ sw $s0, 0x30($sp) +/* EF4978 80242368 8E710148 */ lw $s1, 0x148($s3) +/* EF497C 8024236C 0C00F92F */ jal func_8003E4BC +/* EF4980 80242370 86240008 */ lh $a0, 8($s1) +/* EF4984 80242374 0040802D */ daddu $s0, $v0, $zero +/* EF4988 80242378 8E22007C */ lw $v0, 0x7c($s1) +/* EF498C 8024237C 8603008E */ lh $v1, 0x8e($s0) +/* EF4990 80242380 2442FFFF */ addiu $v0, $v0, -1 +/* EF4994 80242384 14620012 */ bne $v1, $v0, .L802423D0 +/* EF4998 80242388 00000000 */ nop +/* EF499C 8024238C C6000038 */ lwc1 $f0, 0x38($s0) +/* EF49A0 80242390 4600020D */ trunc.w.s $f8, $f0 +/* EF49A4 80242394 44024000 */ mfc1 $v0, $f8 +/* EF49A8 80242398 00000000 */ nop +/* EF49AC 8024239C A6220010 */ sh $v0, 0x10($s1) +/* EF49B0 802423A0 C600003C */ lwc1 $f0, 0x3c($s0) +/* EF49B4 802423A4 4600020D */ trunc.w.s $f8, $f0 +/* EF49B8 802423A8 44024000 */ mfc1 $v0, $f8 +/* EF49BC 802423AC 00000000 */ nop +/* EF49C0 802423B0 A6220012 */ sh $v0, 0x12($s1) +/* EF49C4 802423B4 C6000040 */ lwc1 $f0, 0x40($s0) +/* EF49C8 802423B8 24020001 */ addiu $v0, $zero, 1 +/* EF49CC 802423BC A2220007 */ sb $v0, 7($s1) +/* EF49D0 802423C0 4600020D */ trunc.w.s $f8, $f0 +/* EF49D4 802423C4 44024000 */ mfc1 $v0, $f8 +/* EF49D8 802423C8 00000000 */ nop +/* EF49DC 802423CC A6220014 */ sh $v0, 0x14($s1) +.L802423D0: +/* EF49E0 802423D0 C6000038 */ lwc1 $f0, 0x38($s0) +/* EF49E4 802423D4 C602003C */ lwc1 $f2, 0x3c($s0) +/* EF49E8 802423D8 C6040040 */ lwc1 $f4, 0x40($s0) +/* EF49EC 802423DC C6060018 */ lwc1 $f6, 0x18($s0) +/* EF49F0 802423E0 E7A00020 */ swc1 $f0, 0x20($sp) +/* EF49F4 802423E4 E7A20024 */ swc1 $f2, 0x24($sp) +/* EF49F8 802423E8 E7A40028 */ swc1 $f4, 0x28($sp) +/* EF49FC 802423EC E7A60010 */ swc1 $f6, 0x10($sp) +/* EF4A00 802423F0 C600000C */ lwc1 $f0, 0xc($s0) +/* EF4A04 802423F4 E7A00014 */ swc1 $f0, 0x14($sp) +/* EF4A08 802423F8 860200A8 */ lh $v0, 0xa8($s0) +/* EF4A0C 802423FC 27A50020 */ addiu $a1, $sp, 0x20 +/* EF4A10 80242400 44820000 */ mtc1 $v0, $f0 +/* EF4A14 80242404 00000000 */ nop +/* EF4A18 80242408 46800020 */ cvt.s.w $f0, $f0 +/* EF4A1C 8024240C E7A00018 */ swc1 $f0, 0x18($sp) +/* EF4A20 80242410 860200A6 */ lh $v0, 0xa6($s0) +/* EF4A24 80242414 27A60024 */ addiu $a2, $sp, 0x24 +/* EF4A28 80242418 44820000 */ mtc1 $v0, $f0 +/* EF4A2C 8024241C 00000000 */ nop +/* EF4A30 80242420 46800020 */ cvt.s.w $f0, $f0 +/* EF4A34 80242424 E7A0001C */ swc1 $f0, 0x1c($sp) +/* EF4A38 80242428 8E040080 */ lw $a0, 0x80($s0) +/* EF4A3C 8024242C 0C0394C1 */ jal func_800E5304 +/* EF4A40 80242430 27A70028 */ addiu $a3, $sp, 0x28 +/* EF4A44 80242434 0040902D */ daddu $s2, $v0, $zero +/* EF4A48 80242438 16400005 */ bnez $s2, .L80242450 +/* EF4A4C 8024243C 00000000 */ nop +/* EF4A50 80242440 8E050018 */ lw $a1, 0x18($s0) +/* EF4A54 80242444 8E06000C */ lw $a2, 0xc($s0) +/* EF4A58 80242448 0C00F909 */ jal func_8003E424 +/* EF4A5C 8024244C 0200202D */ daddu $a0, $s0, $zero +.L80242450: +/* EF4A60 80242450 8602008E */ lh $v0, 0x8e($s0) +/* EF4A64 80242454 9603008E */ lhu $v1, 0x8e($s0) +/* EF4A68 80242458 18400007 */ blez $v0, .L80242478 +/* EF4A6C 8024245C 2462FFFF */ addiu $v0, $v1, -1 +/* EF4A70 80242460 A602008E */ sh $v0, 0x8e($s0) +/* EF4A74 80242464 00021400 */ sll $v0, $v0, 0x10 +/* EF4A78 80242468 18400003 */ blez $v0, .L80242478 +/* EF4A7C 8024246C 00000000 */ nop +/* EF4A80 80242470 12400008 */ beqz $s2, .L80242494 +/* EF4A84 80242474 00000000 */ nop +.L80242478: +/* EF4A88 80242478 8E2200CC */ lw $v0, 0xcc($s1) +/* EF4A8C 8024247C A2200007 */ sb $zero, 7($s1) +/* EF4A90 80242480 8C420028 */ lw $v0, 0x28($v0) +/* EF4A94 80242484 A600008E */ sh $zero, 0x8e($s0) +/* EF4A98 80242488 AE020028 */ sw $v0, 0x28($s0) +/* EF4A9C 8024248C 2402000F */ addiu $v0, $zero, 0xf +/* EF4AA0 80242490 AE620070 */ sw $v0, 0x70($s3) +.L80242494: +/* EF4AA4 80242494 8FBF0040 */ lw $ra, 0x40($sp) +/* EF4AA8 80242498 8FB3003C */ lw $s3, 0x3c($sp) +/* EF4AAC 8024249C 8FB20038 */ lw $s2, 0x38($sp) +/* EF4AB0 802424A0 8FB10034 */ lw $s1, 0x34($sp) +/* EF4AB4 802424A4 8FB00030 */ lw $s0, 0x30($sp) +/* EF4AB8 802424A8 03E00008 */ jr $ra +/* EF4ABC 802424AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EF2680/func_802424B0_EF4AC0.s b/asm/nonmatchings/code_EF2680/func_802424B0_EF4AC0.s new file mode 100644 index 0000000000..f79d4731e2 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_802424B0_EF4AC0.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424B0_EF4AC0 +/* EF4AC0 802424B0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EF4AC4 802424B4 AFB10014 */ sw $s1, 0x14($sp) +/* EF4AC8 802424B8 0080882D */ daddu $s1, $a0, $zero +/* EF4ACC 802424BC AFBF0018 */ sw $ra, 0x18($sp) +/* EF4AD0 802424C0 AFB00010 */ sw $s0, 0x10($sp) +/* EF4AD4 802424C4 8E300148 */ lw $s0, 0x148($s1) +/* EF4AD8 802424C8 0C00F92F */ jal func_8003E4BC +/* EF4ADC 802424CC 86040008 */ lh $a0, 8($s0) +/* EF4AE0 802424D0 0040202D */ daddu $a0, $v0, $zero +/* EF4AE4 802424D4 9482008E */ lhu $v0, 0x8e($a0) +/* EF4AE8 802424D8 24030003 */ addiu $v1, $zero, 3 +/* EF4AEC 802424DC 24420001 */ addiu $v0, $v0, 1 +/* EF4AF0 802424E0 A482008E */ sh $v0, 0x8e($a0) +/* EF4AF4 802424E4 00021400 */ sll $v0, $v0, 0x10 +/* EF4AF8 802424E8 00021403 */ sra $v0, $v0, 0x10 +/* EF4AFC 802424EC 14430003 */ bne $v0, $v1, .L802424FC +/* EF4B00 802424F0 00000000 */ nop +/* EF4B04 802424F4 96020086 */ lhu $v0, 0x86($s0) +/* EF4B08 802424F8 A48200A8 */ sh $v0, 0xa8($a0) +.L802424FC: +/* EF4B0C 802424FC 8482008E */ lh $v0, 0x8e($a0) +/* EF4B10 80242500 8E030080 */ lw $v1, 0x80($s0) +/* EF4B14 80242504 0043102A */ slt $v0, $v0, $v1 +/* EF4B18 80242508 14400004 */ bnez $v0, .L8024251C +/* EF4B1C 8024250C 00000000 */ nop +/* EF4B20 80242510 96020086 */ lhu $v0, 0x86($s0) +/* EF4B24 80242514 A48200A8 */ sh $v0, 0xa8($a0) +/* EF4B28 80242518 AE200070 */ sw $zero, 0x70($s1) +.L8024251C: +/* EF4B2C 8024251C 8FBF0018 */ lw $ra, 0x18($sp) +/* EF4B30 80242520 8FB10014 */ lw $s1, 0x14($sp) +/* EF4B34 80242524 8FB00010 */ lw $s0, 0x10($sp) +/* EF4B38 80242528 03E00008 */ jr $ra +/* EF4B3C 8024252C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s b/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s new file mode 100644 index 0000000000..563ebad22d --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s @@ -0,0 +1,312 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242530_EF4B40 +/* EF4B40 80242530 27BDFF90 */ addiu $sp, $sp, -0x70 +/* EF4B44 80242534 AFB3005C */ sw $s3, 0x5c($sp) +/* EF4B48 80242538 0080982D */ daddu $s3, $a0, $zero +/* EF4B4C 8024253C AFBF0068 */ sw $ra, 0x68($sp) +/* EF4B50 80242540 AFB50064 */ sw $s5, 0x64($sp) +/* EF4B54 80242544 AFB40060 */ sw $s4, 0x60($sp) +/* EF4B58 80242548 AFB20058 */ sw $s2, 0x58($sp) +/* EF4B5C 8024254C AFB10054 */ sw $s1, 0x54($sp) +/* EF4B60 80242550 AFB00050 */ sw $s0, 0x50($sp) +/* EF4B64 80242554 8E710148 */ lw $s1, 0x148($s3) +/* EF4B68 80242558 86240008 */ lh $a0, 8($s1) +/* EF4B6C 8024255C 0C00F92F */ jal func_8003E4BC +/* EF4B70 80242560 00A0802D */ daddu $s0, $a1, $zero +/* EF4B74 80242564 8E63000C */ lw $v1, 0xc($s3) +/* EF4B78 80242568 0260202D */ daddu $a0, $s3, $zero +/* EF4B7C 8024256C 8C650000 */ lw $a1, ($v1) +/* EF4B80 80242570 0C0B53A3 */ jal func_802D4E8C +/* EF4B84 80242574 0040902D */ daddu $s2, $v0, $zero +/* EF4B88 80242578 AFA00028 */ sw $zero, 0x28($sp) +/* EF4B8C 8024257C 8E2300D0 */ lw $v1, 0xd0($s1) +/* EF4B90 80242580 8C630030 */ lw $v1, 0x30($v1) +/* EF4B94 80242584 AFA3002C */ sw $v1, 0x2c($sp) +/* EF4B98 80242588 8E2300D0 */ lw $v1, 0xd0($s1) +/* EF4B9C 8024258C 8C63001C */ lw $v1, 0x1c($v1) +/* EF4BA0 80242590 AFA30030 */ sw $v1, 0x30($sp) +/* EF4BA4 80242594 8E2300D0 */ lw $v1, 0xd0($s1) +/* EF4BA8 80242598 8C630024 */ lw $v1, 0x24($v1) +/* EF4BAC 8024259C AFA30034 */ sw $v1, 0x34($sp) +/* EF4BB0 802425A0 8E2300D0 */ lw $v1, 0xd0($s1) +/* EF4BB4 802425A4 8C630028 */ lw $v1, 0x28($v1) +/* EF4BB8 802425A8 AFA30038 */ sw $v1, 0x38($sp) +/* EF4BBC 802425AC 8E2300D0 */ lw $v1, 0xd0($s1) +/* EF4BC0 802425B0 3C0142C8 */ lui $at, 0x42c8 +/* EF4BC4 802425B4 44810000 */ mtc1 $at, $f0 +/* EF4BC8 802425B8 8C63002C */ lw $v1, 0x2c($v1) +/* EF4BCC 802425BC E7A00040 */ swc1 $f0, 0x40($sp) +/* EF4BD0 802425C0 A7A00044 */ sh $zero, 0x44($sp) +/* EF4BD4 802425C4 AFA3003C */ sw $v1, 0x3c($sp) +/* EF4BD8 802425C8 C6400038 */ lwc1 $f0, 0x38($s2) +/* EF4BDC 802425CC E6200108 */ swc1 $f0, 0x108($s1) +/* EF4BE0 802425D0 C640003C */ lwc1 $f0, 0x3c($s2) +/* EF4BE4 802425D4 27B50028 */ addiu $s5, $sp, 0x28 +/* EF4BE8 802425D8 E620010C */ swc1 $f0, 0x10c($s1) +/* EF4BEC 802425DC 3C013C23 */ lui $at, 0x3c23 +/* EF4BF0 802425E0 3421D70A */ ori $at, $at, 0xd70a +/* EF4BF4 802425E4 44810000 */ mtc1 $at, $f0 +/* EF4BF8 802425E8 C6420040 */ lwc1 $f2, 0x40($s2) +/* EF4BFC 802425EC 0040A02D */ daddu $s4, $v0, $zero +/* EF4C00 802425F0 E6200114 */ swc1 $f0, 0x114($s1) +/* EF4C04 802425F4 E6200118 */ swc1 $f0, 0x118($s1) +/* EF4C08 802425F8 12000009 */ beqz $s0, .L80242620 +/* EF4C0C 802425FC E6220110 */ swc1 $f2, 0x110($s1) +/* EF4C10 80242600 864300A8 */ lh $v1, 0xa8($s2) +/* EF4C14 80242604 8E2200B0 */ lw $v0, 0xb0($s1) +/* EF4C18 80242608 AE20008C */ sw $zero, 0x8c($s1) +/* EF4C1C 8024260C A22000B5 */ sb $zero, 0xb5($s1) +/* EF4C20 80242610 34420008 */ ori $v0, $v0, 8 +/* EF4C24 80242614 AE230084 */ sw $v1, 0x84($s1) +/* EF4C28 80242618 0809098C */ j .L80242630 +/* EF4C2C 8024261C AE2200B0 */ sw $v0, 0xb0($s1) +.L80242620: +/* EF4C30 80242620 8E2200B0 */ lw $v0, 0xb0($s1) +/* EF4C34 80242624 30420004 */ andi $v0, $v0, 4 +/* EF4C38 80242628 10400047 */ beqz $v0, .L80242748 +/* EF4C3C 8024262C 00000000 */ nop +.L80242630: +/* EF4C40 80242630 AE600070 */ sw $zero, 0x70($s3) +/* EF4C44 80242634 A640008E */ sh $zero, 0x8e($s2) +/* EF4C48 80242638 8E2300CC */ lw $v1, 0xcc($s1) +/* EF4C4C 8024263C 2404F7FF */ addiu $a0, $zero, -0x801 +/* EF4C50 80242640 A2200007 */ sb $zero, 7($s1) +/* EF4C54 80242644 8E420000 */ lw $v0, ($s2) +/* EF4C58 80242648 8C630000 */ lw $v1, ($v1) +/* EF4C5C 8024264C 00441024 */ and $v0, $v0, $a0 +/* EF4C60 80242650 AE420000 */ sw $v0, ($s2) +/* EF4C64 80242654 AE430028 */ sw $v1, 0x28($s2) +/* EF4C68 80242658 96220086 */ lhu $v0, 0x86($s1) +/* EF4C6C 8024265C A64200A8 */ sh $v0, 0xa8($s2) +/* EF4C70 80242660 8E2200D0 */ lw $v0, 0xd0($s1) +/* EF4C74 80242664 AE200090 */ sw $zero, 0x90($s1) +/* EF4C78 80242668 8C420034 */ lw $v0, 0x34($v0) +/* EF4C7C 8024266C 14400006 */ bnez $v0, .L80242688 +/* EF4C80 80242670 2403FDFF */ addiu $v1, $zero, -0x201 +/* EF4C84 80242674 8E420000 */ lw $v0, ($s2) +/* EF4C88 80242678 2403FFF7 */ addiu $v1, $zero, -9 +/* EF4C8C 8024267C 34420200 */ ori $v0, $v0, 0x200 +/* EF4C90 80242680 080909A5 */ j .L80242694 +/* EF4C94 80242684 00431024 */ and $v0, $v0, $v1 +.L80242688: +/* EF4C98 80242688 8E420000 */ lw $v0, ($s2) +/* EF4C9C 8024268C 00431024 */ and $v0, $v0, $v1 +/* EF4CA0 80242690 34420008 */ ori $v0, $v0, 8 +.L80242694: +/* EF4CA4 80242694 AE420000 */ sw $v0, ($s2) +/* EF4CA8 80242698 8E2200B0 */ lw $v0, 0xb0($s1) +/* EF4CAC 8024269C 30420004 */ andi $v0, $v0, 4 +/* EF4CB0 802426A0 1040001E */ beqz $v0, .L8024271C +/* EF4CB4 802426A4 24040002 */ addiu $a0, $zero, 2 +/* EF4CB8 802426A8 0240282D */ daddu $a1, $s2, $zero +/* EF4CBC 802426AC 0000302D */ daddu $a2, $zero, $zero +/* EF4CC0 802426B0 24020063 */ addiu $v0, $zero, 0x63 +/* EF4CC4 802426B4 AE620070 */ sw $v0, 0x70($s3) +/* EF4CC8 802426B8 AE600074 */ sw $zero, 0x74($s3) +/* EF4CCC 802426BC 864300A8 */ lh $v1, 0xa8($s2) +/* EF4CD0 802426C0 3C013F80 */ lui $at, 0x3f80 +/* EF4CD4 802426C4 44810000 */ mtc1 $at, $f0 +/* EF4CD8 802426C8 3C014000 */ lui $at, 0x4000 +/* EF4CDC 802426CC 44811000 */ mtc1 $at, $f2 +/* EF4CE0 802426D0 3C01C1A0 */ lui $at, 0xc1a0 +/* EF4CE4 802426D4 44812000 */ mtc1 $at, $f4 +/* EF4CE8 802426D8 24020028 */ addiu $v0, $zero, 0x28 +/* EF4CEC 802426DC AFA2001C */ sw $v0, 0x1c($sp) +/* EF4CF0 802426E0 44833000 */ mtc1 $v1, $f6 +/* EF4CF4 802426E4 00000000 */ nop +/* EF4CF8 802426E8 468031A0 */ cvt.s.w $f6, $f6 +/* EF4CFC 802426EC 44073000 */ mfc1 $a3, $f6 +/* EF4D00 802426F0 27A20048 */ addiu $v0, $sp, 0x48 +/* EF4D04 802426F4 AFA20020 */ sw $v0, 0x20($sp) +/* EF4D08 802426F8 E7A00010 */ swc1 $f0, 0x10($sp) +/* EF4D0C 802426FC E7A20014 */ swc1 $f2, 0x14($sp) +/* EF4D10 80242700 0C01D444 */ jal func_80075110 +/* EF4D14 80242704 E7A40018 */ swc1 $f4, 0x18($sp) +/* EF4D18 80242708 8E2200B0 */ lw $v0, 0xb0($s1) +/* EF4D1C 8024270C 2403FFFB */ addiu $v1, $zero, -5 +/* EF4D20 80242710 00431024 */ and $v0, $v0, $v1 +/* EF4D24 80242714 080909D2 */ j .L80242748 +/* EF4D28 80242718 AE2200B0 */ sw $v0, 0xb0($s1) +.L8024271C: +/* EF4D2C 8024271C 8E220000 */ lw $v0, ($s1) +/* EF4D30 80242720 3C034000 */ lui $v1, 0x4000 +/* EF4D34 80242724 00431024 */ and $v0, $v0, $v1 +/* EF4D38 80242728 10400007 */ beqz $v0, .L80242748 +/* EF4D3C 8024272C 3C03BFFF */ lui $v1, 0xbfff +/* EF4D40 80242730 2402000C */ addiu $v0, $zero, 0xc +/* EF4D44 80242734 AE620070 */ sw $v0, 0x70($s3) +/* EF4D48 80242738 8E220000 */ lw $v0, ($s1) +/* EF4D4C 8024273C 3463FFFF */ ori $v1, $v1, 0xffff +/* EF4D50 80242740 00431024 */ and $v0, $v0, $v1 +/* EF4D54 80242744 AE220000 */ sw $v0, ($s1) +.L80242748: +/* EF4D58 80242748 8E220090 */ lw $v0, 0x90($s1) +/* EF4D5C 8024274C 1840000C */ blez $v0, .L80242780 +/* EF4D60 80242750 2442FFFF */ addiu $v0, $v0, -1 +/* EF4D64 80242754 14400087 */ bnez $v0, .L80242974 +/* EF4D68 80242758 AE220090 */ sw $v0, 0x90($s1) +/* EF4D6C 8024275C 3C03FFAA */ lui $v1, 0xffaa +/* EF4D70 80242760 8E420028 */ lw $v0, 0x28($s2) +/* EF4D74 80242764 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* EF4D78 80242768 00431021 */ addu $v0, $v0, $v1 +/* EF4D7C 8024276C 2C420002 */ sltiu $v0, $v0, 2 +/* EF4D80 80242770 10400003 */ beqz $v0, .L80242780 +/* EF4D84 80242774 3C020055 */ lui $v0, 0x55 +/* EF4D88 80242778 3442000C */ ori $v0, $v0, 0xc +/* EF4D8C 8024277C AE420028 */ sw $v0, 0x28($s2) +.L80242780: +/* EF4D90 80242780 8E630070 */ lw $v1, 0x70($s3) +/* EF4D94 80242784 2402000C */ addiu $v0, $zero, 0xc +/* EF4D98 80242788 10620048 */ beq $v1, $v0, .L802428AC +/* EF4D9C 8024278C 2862000D */ slti $v0, $v1, 0xd +/* EF4DA0 80242790 1040000F */ beqz $v0, .L802427D0 +/* EF4DA4 80242794 24100001 */ addiu $s0, $zero, 1 +/* EF4DA8 80242798 1070001E */ beq $v1, $s0, .L80242814 +/* EF4DAC 8024279C 28620002 */ slti $v0, $v1, 2 +/* EF4DB0 802427A0 10400005 */ beqz $v0, .L802427B8 +/* EF4DB4 802427A4 24020002 */ addiu $v0, $zero, 2 +/* EF4DB8 802427A8 10600015 */ beqz $v1, .L80242800 +/* EF4DBC 802427AC 0260202D */ daddu $a0, $s3, $zero +/* EF4DC0 802427B0 08090A42 */ j .L80242908 +/* EF4DC4 802427B4 00000000 */ nop +.L802427B8: +/* EF4DC8 802427B8 1062001C */ beq $v1, $v0, .L8024282C +/* EF4DCC 802427BC 24020003 */ addiu $v0, $zero, 3 +/* EF4DD0 802427C0 10620035 */ beq $v1, $v0, .L80242898 +/* EF4DD4 802427C4 0260202D */ daddu $a0, $s3, $zero +/* EF4DD8 802427C8 08090A42 */ j .L80242908 +/* EF4DDC 802427CC 00000000 */ nop +.L802427D0: +/* EF4DE0 802427D0 2402000E */ addiu $v0, $zero, 0xe +/* EF4DE4 802427D4 1062003F */ beq $v1, $v0, .L802428D4 +/* EF4DE8 802427D8 0062102A */ slt $v0, $v1, $v0 +/* EF4DEC 802427DC 14400038 */ bnez $v0, .L802428C0 +/* EF4DF0 802427E0 0260202D */ daddu $a0, $s3, $zero +/* EF4DF4 802427E4 2402000F */ addiu $v0, $zero, 0xf +/* EF4DF8 802427E8 10620040 */ beq $v1, $v0, .L802428EC +/* EF4DFC 802427EC 24020063 */ addiu $v0, $zero, 0x63 +/* EF4E00 802427F0 10620043 */ beq $v1, $v0, .L80242900 +/* EF4E04 802427F4 00000000 */ nop +/* EF4E08 802427F8 08090A42 */ j .L80242908 +/* EF4E0C 802427FC 00000000 */ nop +.L80242800: +/* EF4E10 80242800 0280282D */ daddu $a1, $s4, $zero +/* EF4E14 80242804 0C013670 */ jal func_8004D9C0 +/* EF4E18 80242808 02A0302D */ daddu $a2, $s5, $zero +/* EF4E1C 8024280C 96220086 */ lhu $v0, 0x86($s1) +/* EF4E20 80242810 A64200A8 */ sh $v0, 0xa8($s2) +.L80242814: +/* EF4E24 80242814 0260202D */ daddu $a0, $s3, $zero +/* EF4E28 80242818 0280282D */ daddu $a1, $s4, $zero +/* EF4E2C 8024281C 0C0136B6 */ jal func_8004DAD8 +/* EF4E30 80242820 02A0302D */ daddu $a2, $s5, $zero +/* EF4E34 80242824 08090A42 */ j .L80242908 +/* EF4E38 80242828 00000000 */ nop +.L8024282C: +/* EF4E3C 8024282C 0260202D */ daddu $a0, $s3, $zero +/* EF4E40 80242830 0280282D */ daddu $a1, $s4, $zero +/* EF4E44 80242834 0C0137D9 */ jal func_8004DF64 +/* EF4E48 80242838 02A0302D */ daddu $a2, $s5, $zero +/* EF4E4C 8024283C 8E230088 */ lw $v1, 0x88($s1) +/* EF4E50 80242840 24020006 */ addiu $v0, $zero, 6 +/* EF4E54 80242844 14620014 */ bne $v1, $v0, .L80242898 +/* EF4E58 80242848 0260202D */ daddu $a0, $s3, $zero +/* EF4E5C 8024284C 0C00AB3B */ jal func_8002ACEC +/* EF4E60 80242850 24040064 */ addiu $a0, $zero, 0x64 +/* EF4E64 80242854 28420021 */ slti $v0, $v0, 0x21 +/* EF4E68 80242858 5040000F */ beql $v0, $zero, .L80242898 +/* EF4E6C 8024285C 0260202D */ daddu $a0, $s3, $zero +/* EF4E70 80242860 8E22008C */ lw $v0, 0x8c($s1) +/* EF4E74 80242864 10400005 */ beqz $v0, .L8024287C +/* EF4E78 80242868 3C020055 */ lui $v0, 0x55 +/* EF4E7C 8024286C 3442002F */ ori $v0, $v0, 0x2f +/* EF4E80 80242870 AE20008C */ sw $zero, 0x8c($s1) +/* EF4E84 80242874 08090A22 */ j .L80242888 +/* EF4E88 80242878 A22000B5 */ sb $zero, 0xb5($s1) +.L8024287C: +/* EF4E8C 8024287C 3442002E */ ori $v0, $v0, 0x2e +/* EF4E90 80242880 AE30008C */ sw $s0, 0x8c($s1) +/* EF4E94 80242884 A23000B5 */ sb $s0, 0xb5($s1) +.L80242888: +/* EF4E98 80242888 AE420028 */ sw $v0, 0x28($s2) +/* EF4E9C 8024288C 24020007 */ addiu $v0, $zero, 7 +/* EF4EA0 80242890 08090A5D */ j .L80242974 +/* EF4EA4 80242894 AE220090 */ sw $v0, 0x90($s1) +.L80242898: +/* EF4EA8 80242898 0280282D */ daddu $a1, $s4, $zero +/* EF4EAC 8024289C 0C013809 */ jal func_8004E024 +/* EF4EB0 802428A0 02A0302D */ daddu $a2, $s5, $zero +/* EF4EB4 802428A4 08090A42 */ j .L80242908 +/* EF4EB8 802428A8 00000000 */ nop +.L802428AC: +/* EF4EBC 802428AC 0260202D */ daddu $a0, $s3, $zero +/* EF4EC0 802428B0 0280282D */ daddu $a1, $s4, $zero +/* EF4EC4 802428B4 0C090867 */ jal func_8024219C_EF47AC +/* EF4EC8 802428B8 02A0302D */ daddu $a2, $s5, $zero +/* EF4ECC 802428BC 0260202D */ daddu $a0, $s3, $zero +.L802428C0: +/* EF4ED0 802428C0 0280282D */ daddu $a1, $s4, $zero +/* EF4ED4 802428C4 0C090886 */ jal func_80242218_EF4828 +/* EF4ED8 802428C8 02A0302D */ daddu $a2, $s5, $zero +/* EF4EDC 802428CC 08090A42 */ j .L80242908 +/* EF4EE0 802428D0 00000000 */ nop +.L802428D4: +/* EF4EE4 802428D4 0260202D */ daddu $a0, $s3, $zero +/* EF4EE8 802428D8 0280282D */ daddu $a1, $s4, $zero +/* EF4EEC 802428DC 0C0908D3 */ jal func_8024234C_EF495C +/* EF4EF0 802428E0 02A0302D */ daddu $a2, $s5, $zero +/* EF4EF4 802428E4 08090A42 */ j .L80242908 +/* EF4EF8 802428E8 00000000 */ nop +.L802428EC: +/* EF4EFC 802428EC 0280282D */ daddu $a1, $s4, $zero +/* EF4F00 802428F0 0C09092C */ jal func_802424B0_EF4AC0 +/* EF4F04 802428F4 02A0302D */ daddu $a2, $s5, $zero +/* EF4F08 802428F8 08090A42 */ j .L80242908 +/* EF4F0C 802428FC 00000000 */ nop +.L80242900: +/* EF4F10 80242900 0C013AE3 */ jal func_8004EB8C +/* EF4F14 80242904 0260202D */ daddu $a0, $s3, $zero +.L80242908: +/* EF4F18 80242908 8E230088 */ lw $v1, 0x88($s1) +/* EF4F1C 8024290C 24020006 */ addiu $v0, $zero, 6 +/* EF4F20 80242910 14620019 */ bne $v1, $v0, .L80242978 +/* EF4F24 80242914 0000102D */ daddu $v0, $zero, $zero +/* EF4F28 80242918 8E22008C */ lw $v0, 0x8c($s1) +/* EF4F2C 8024291C 10400003 */ beqz $v0, .L8024292C +/* EF4F30 80242920 24020001 */ addiu $v0, $zero, 1 +/* EF4F34 80242924 08090A4C */ j .L80242930 +/* EF4F38 80242928 A22200B5 */ sb $v0, 0xb5($s1) +.L8024292C: +/* EF4F3C 8024292C A22000B5 */ sb $zero, 0xb5($s1) +.L80242930: +/* EF4F40 80242930 8E22008C */ lw $v0, 0x8c($s1) +/* EF4F44 80242934 1040000F */ beqz $v0, .L80242974 +/* EF4F48 80242938 3C03FFAA */ lui $v1, 0xffaa +/* EF4F4C 8024293C 8E420028 */ lw $v0, 0x28($s2) +/* EF4F50 80242940 3463FFFC */ ori $v1, $v1, 0xfffc +/* EF4F54 80242944 00431821 */ addu $v1, $v0, $v1 +/* EF4F58 80242948 2C620015 */ sltiu $v0, $v1, 0x15 +/* EF4F5C 8024294C 10400009 */ beqz $v0, .L80242974 +/* EF4F60 80242950 00031080 */ sll $v0, $v1, 2 +/* EF4F64 80242954 3C018024 */ lui $at, %hi(D_80245410) +/* EF4F68 80242958 00220821 */ addu $at, $at, $v0 +/* EF4F6C 8024295C 8C225410 */ lw $v0, %lo(D_80245410)($at) +/* EF4F70 80242960 00400008 */ jr $v0 +/* EF4F74 80242964 00000000 */ nop +/* EF4F78 80242968 8E420028 */ lw $v0, 0x28($s2) +/* EF4F7C 8024296C 24420001 */ addiu $v0, $v0, 1 +/* EF4F80 80242970 AE420028 */ sw $v0, 0x28($s2) +.L80242974: +/* EF4F84 80242974 0000102D */ daddu $v0, $zero, $zero +.L80242978: +/* EF4F88 80242978 8FBF0068 */ lw $ra, 0x68($sp) +/* EF4F8C 8024297C 8FB50064 */ lw $s5, 0x64($sp) +/* EF4F90 80242980 8FB40060 */ lw $s4, 0x60($sp) +/* EF4F94 80242984 8FB3005C */ lw $s3, 0x5c($sp) +/* EF4F98 80242988 8FB20058 */ lw $s2, 0x58($sp) +/* EF4F9C 8024298C 8FB10054 */ lw $s1, 0x54($sp) +/* EF4FA0 80242990 8FB00050 */ lw $s0, 0x50($sp) +/* EF4FA4 80242994 03E00008 */ jr $ra +/* EF4FA8 80242998 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/code_EF2680/func_8024299C_EF4FAC.s b/asm/nonmatchings/code_EF2680/func_8024299C_EF4FAC.s new file mode 100644 index 0000000000..ee1f0ef834 --- /dev/null +++ b/asm/nonmatchings/code_EF2680/func_8024299C_EF4FAC.s @@ -0,0 +1,630 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024299C_EF4FAC +/* EF4FAC 8024299C 27BDFF68 */ addiu $sp, $sp, -0x98 +/* EF4FB0 802429A0 AFB5007C */ sw $s5, 0x7c($sp) +/* EF4FB4 802429A4 0080A82D */ daddu $s5, $a0, $zero +/* EF4FB8 802429A8 AFBF0080 */ sw $ra, 0x80($sp) +/* EF4FBC 802429AC AFB40078 */ sw $s4, 0x78($sp) +/* EF4FC0 802429B0 AFB30074 */ sw $s3, 0x74($sp) +/* EF4FC4 802429B4 AFB20070 */ sw $s2, 0x70($sp) +/* EF4FC8 802429B8 AFB1006C */ sw $s1, 0x6c($sp) +/* EF4FCC 802429BC AFB00068 */ sw $s0, 0x68($sp) +/* EF4FD0 802429C0 F7B60090 */ sdc1 $f22, 0x90($sp) +/* EF4FD4 802429C4 F7B40088 */ sdc1 $f20, 0x88($sp) +/* EF4FD8 802429C8 8EB20148 */ lw $s2, 0x148($s5) +/* EF4FDC 802429CC 86440008 */ lh $a0, 8($s2) +/* EF4FE0 802429D0 0C00F92F */ jal func_8003E4BC +/* EF4FE4 802429D4 00A0802D */ daddu $s0, $a1, $zero +/* EF4FE8 802429D8 8EA3000C */ lw $v1, 0xc($s5) +/* EF4FEC 802429DC 02A0202D */ daddu $a0, $s5, $zero +/* EF4FF0 802429E0 8C650000 */ lw $a1, ($v1) +/* EF4FF4 802429E4 0C0B53A3 */ jal func_802D4E8C +/* EF4FF8 802429E8 0040882D */ daddu $s1, $v0, $zero +/* EF4FFC 802429EC AFA00028 */ sw $zero, 0x28($sp) +/* EF5000 802429F0 8E4300D0 */ lw $v1, 0xd0($s2) +/* EF5004 802429F4 8C630030 */ lw $v1, 0x30($v1) +/* EF5008 802429F8 AFA3002C */ sw $v1, 0x2c($sp) +/* EF500C 802429FC 8E4300D0 */ lw $v1, 0xd0($s2) +/* EF5010 80242A00 8C63001C */ lw $v1, 0x1c($v1) +/* EF5014 80242A04 AFA30030 */ sw $v1, 0x30($sp) +/* EF5018 80242A08 8E4300D0 */ lw $v1, 0xd0($s2) +/* EF501C 80242A0C 8C630024 */ lw $v1, 0x24($v1) +/* EF5020 80242A10 AFA30034 */ sw $v1, 0x34($sp) +/* EF5024 80242A14 8E4300D0 */ lw $v1, 0xd0($s2) +/* EF5028 80242A18 8C630028 */ lw $v1, 0x28($v1) +/* EF502C 80242A1C AFA30038 */ sw $v1, 0x38($sp) +/* EF5030 80242A20 8E4300D0 */ lw $v1, 0xd0($s2) +/* EF5034 80242A24 3C014282 */ lui $at, 0x4282 +/* EF5038 80242A28 44810000 */ mtc1 $at, $f0 +/* EF503C 80242A2C 8C63002C */ lw $v1, 0x2c($v1) +/* EF5040 80242A30 E7A00040 */ swc1 $f0, 0x40($sp) +/* EF5044 80242A34 A7A00044 */ sh $zero, 0x44($sp) +/* EF5048 80242A38 AFA3003C */ sw $v1, 0x3c($sp) +/* EF504C 80242A3C C6200038 */ lwc1 $f0, 0x38($s1) +/* EF5050 80242A40 E6400108 */ swc1 $f0, 0x108($s2) +/* EF5054 80242A44 C620003C */ lwc1 $f0, 0x3c($s1) +/* EF5058 80242A48 27B40028 */ addiu $s4, $sp, 0x28 +/* EF505C 80242A4C E640010C */ swc1 $f0, 0x10c($s2) +/* EF5060 80242A50 3C0138D1 */ lui $at, 0x38d1 +/* EF5064 80242A54 3421B717 */ ori $at, $at, 0xb717 +/* EF5068 80242A58 44810000 */ mtc1 $at, $f0 +/* EF506C 80242A5C C6220040 */ lwc1 $f2, 0x40($s1) +/* EF5070 80242A60 0040982D */ daddu $s3, $v0, $zero +/* EF5074 80242A64 E6400114 */ swc1 $f0, 0x114($s2) +/* EF5078 80242A68 E6400118 */ swc1 $f0, 0x118($s2) +/* EF507C 80242A6C 12000007 */ beqz $s0, .L80242A8C +/* EF5080 80242A70 E6420110 */ swc1 $f2, 0x110($s2) +/* EF5084 80242A74 8E4200B0 */ lw $v0, 0xb0($s2) +/* EF5088 80242A78 862300A8 */ lh $v1, 0xa8($s1) +/* EF508C 80242A7C 34420008 */ ori $v0, $v0, 8 +/* EF5090 80242A80 AE430084 */ sw $v1, 0x84($s2) +/* EF5094 80242A84 08090AA7 */ j .L80242A9C +/* EF5098 80242A88 AE4200B0 */ sw $v0, 0xb0($s2) +.L80242A8C: +/* EF509C 80242A8C 8E430094 */ lw $v1, 0x94($s2) +/* EF50A0 80242A90 24020064 */ addiu $v0, $zero, 0x64 +/* EF50A4 80242A94 1462001C */ bne $v1, $v0, .L80242B08 +/* EF50A8 80242A98 00000000 */ nop +.L80242A9C: +/* EF50AC 80242A9C 24020064 */ addiu $v0, $zero, 0x64 +/* EF50B0 80242AA0 2404F7FF */ addiu $a0, $zero, -0x801 +/* EF50B4 80242AA4 AEA20070 */ sw $v0, 0x70($s5) +/* EF50B8 80242AA8 A620008E */ sh $zero, 0x8e($s1) +/* EF50BC 80242AAC 8E4300CC */ lw $v1, 0xcc($s2) +/* EF50C0 80242AB0 8E220000 */ lw $v0, ($s1) +/* EF50C4 80242AB4 3C01C47A */ lui $at, 0xc47a +/* EF50C8 80242AB8 44810000 */ mtc1 $at, $f0 +/* EF50CC 80242ABC 8C630000 */ lw $v1, ($v1) +/* EF50D0 80242AC0 00441024 */ and $v0, $v0, $a0 +/* EF50D4 80242AC4 AE220000 */ sw $v0, ($s1) +/* EF50D8 80242AC8 AE230028 */ sw $v1, 0x28($s1) +/* EF50DC 80242ACC 8E420000 */ lw $v0, ($s2) +/* EF50E0 80242AD0 3C030020 */ lui $v1, 0x20 +/* EF50E4 80242AD4 00431025 */ or $v0, $v0, $v1 +/* EF50E8 80242AD8 AE420000 */ sw $v0, ($s2) +/* EF50EC 80242ADC 8E220000 */ lw $v0, ($s1) +/* EF50F0 80242AE0 2403FDFF */ addiu $v1, $zero, -0x201 +/* EF50F4 80242AE4 00431024 */ and $v0, $v0, $v1 +/* EF50F8 80242AE8 34420008 */ ori $v0, $v0, 8 +/* EF50FC 80242AEC AE220000 */ sw $v0, ($s1) +/* EF5100 80242AF0 2402FFFF */ addiu $v0, $zero, -1 +/* EF5104 80242AF4 AE400094 */ sw $zero, 0x94($s2) +/* EF5108 80242AF8 AE420098 */ sw $v0, 0x98($s2) +/* EF510C 80242AFC AE200038 */ sw $zero, 0x38($s1) +/* EF5110 80242B00 E620003C */ swc1 $f0, 0x3c($s1) +/* EF5114 80242B04 AE200040 */ sw $zero, 0x40($s1) +.L80242B08: +/* EF5118 80242B08 8E4200B0 */ lw $v0, 0xb0($s2) +/* EF511C 80242B0C 30420004 */ andi $v0, $v0, 4 +/* EF5120 80242B10 10400030 */ beqz $v0, .L80242BD4 +/* EF5124 80242B14 2403FFFB */ addiu $v1, $zero, -5 +/* EF5128 80242B18 A620008E */ sh $zero, 0x8e($s1) +/* EF512C 80242B1C 96420086 */ lhu $v0, 0x86($s2) +/* EF5130 80242B20 A62200A8 */ sh $v0, 0xa8($s1) +/* EF5134 80242B24 8E4200B0 */ lw $v0, 0xb0($s2) +/* EF5138 80242B28 00431024 */ and $v0, $v0, $v1 +/* EF513C 80242B2C AE4200B0 */ sw $v0, 0xb0($s2) +/* EF5140 80242B30 8E220000 */ lw $v0, ($s1) +/* EF5144 80242B34 30420800 */ andi $v0, $v0, 0x800 +/* EF5148 80242B38 1040000A */ beqz $v0, .L80242B64 +/* EF514C 80242B3C 3C02004A */ lui $v0, 0x4a +/* EF5150 80242B40 3C013F80 */ lui $at, 0x3f80 +/* EF5154 80242B44 44810000 */ mtc1 $at, $f0 +/* EF5158 80242B48 34420018 */ ori $v0, $v0, 0x18 +/* EF515C 80242B4C AE220028 */ sw $v0, 0x28($s1) +/* EF5160 80242B50 24020066 */ addiu $v0, $zero, 0x66 +/* EF5164 80242B54 AE200018 */ sw $zero, 0x18($s1) +/* EF5168 80242B58 AE20001C */ sw $zero, 0x1c($s1) +/* EF516C 80242B5C 08090AF4 */ j .L80242BD0 +/* EF5170 80242B60 E6200014 */ swc1 $f0, 0x14($s1) +.L80242B64: +/* EF5174 80242B64 24040002 */ addiu $a0, $zero, 2 +/* EF5178 80242B68 0220282D */ daddu $a1, $s1, $zero +/* EF517C 80242B6C 0000302D */ daddu $a2, $zero, $zero +/* EF5180 80242B70 862300A8 */ lh $v1, 0xa8($s1) +/* EF5184 80242B74 3C013F80 */ lui $at, 0x3f80 +/* EF5188 80242B78 44810000 */ mtc1 $at, $f0 +/* EF518C 80242B7C 3C014000 */ lui $at, 0x4000 +/* EF5190 80242B80 44811000 */ mtc1 $at, $f2 +/* EF5194 80242B84 3C01C1A0 */ lui $at, 0xc1a0 +/* EF5198 80242B88 44812000 */ mtc1 $at, $f4 +/* EF519C 80242B8C 24020028 */ addiu $v0, $zero, 0x28 +/* EF51A0 80242B90 AFA2001C */ sw $v0, 0x1c($sp) +/* EF51A4 80242B94 44834000 */ mtc1 $v1, $f8 +/* EF51A8 80242B98 00000000 */ nop +/* EF51AC 80242B9C 46804220 */ cvt.s.w $f8, $f8 +/* EF51B0 80242BA0 44074000 */ mfc1 $a3, $f8 +/* EF51B4 80242BA4 27A20048 */ addiu $v0, $sp, 0x48 +/* EF51B8 80242BA8 AFA20020 */ sw $v0, 0x20($sp) +/* EF51BC 80242BAC E7A00010 */ swc1 $f0, 0x10($sp) +/* EF51C0 80242BB0 E7A20014 */ swc1 $f2, 0x14($sp) +/* EF51C4 80242BB4 0C01D444 */ jal func_80075110 +/* EF51C8 80242BB8 E7A40018 */ swc1 $f4, 0x18($sp) +/* EF51CC 80242BBC 8E4200CC */ lw $v0, 0xcc($s2) +/* EF51D0 80242BC0 8C420000 */ lw $v0, ($v0) +/* EF51D4 80242BC4 AE220028 */ sw $v0, 0x28($s1) +/* EF51D8 80242BC8 240200C8 */ addiu $v0, $zero, 0xc8 +/* EF51DC 80242BCC AEA00074 */ sw $zero, 0x74($s5) +.L80242BD0: +/* EF51E0 80242BD0 AEA20070 */ sw $v0, 0x70($s5) +.L80242BD4: +/* EF51E4 80242BD4 27A2004C */ addiu $v0, $sp, 0x4c +/* EF51E8 80242BD8 AFA20010 */ sw $v0, 0x10($sp) +/* EF51EC 80242BDC 27A20050 */ addiu $v0, $sp, 0x50 +/* EF51F0 80242BE0 AFA20014 */ sw $v0, 0x14($sp) +/* EF51F4 80242BE4 27A20054 */ addiu $v0, $sp, 0x54 +/* EF51F8 80242BE8 AFA20018 */ sw $v0, 0x18($sp) +/* EF51FC 80242BEC 8E250038 */ lw $a1, 0x38($s1) +/* EF5200 80242BF0 8E26003C */ lw $a2, 0x3c($s1) +/* EF5204 80242BF4 8E270040 */ lw $a3, 0x40($s1) +/* EF5208 80242BF8 0C00BF2F */ jal func_8002FCBC +/* EF520C 80242BFC 0000202D */ daddu $a0, $zero, $zero +/* EF5210 80242C00 8EA20070 */ lw $v0, 0x70($s5) +/* EF5214 80242C04 28420064 */ slti $v0, $v0, 0x64 +/* EF5218 80242C08 10400007 */ beqz $v0, .L80242C28 +/* EF521C 80242C0C 00000000 */ nop +/* EF5220 80242C10 8FA2004C */ lw $v0, 0x4c($sp) +/* EF5224 80242C14 24420032 */ addiu $v0, $v0, 0x32 +/* EF5228 80242C18 2C4201A5 */ sltiu $v0, $v0, 0x1a5 +/* EF522C 80242C1C 14400002 */ bnez $v0, .L80242C28 +/* EF5230 80242C20 2402006E */ addiu $v0, $zero, 0x6e +/* EF5234 80242C24 AEA20070 */ sw $v0, 0x70($s5) +.L80242C28: +/* EF5238 80242C28 8EA30070 */ lw $v1, 0x70($s5) +/* EF523C 80242C2C 2402000F */ addiu $v0, $zero, 0xf +/* EF5240 80242C30 1062006B */ beq $v1, $v0, .L80242DE0 +/* EF5244 80242C34 28620010 */ slti $v0, $v1, 0x10 +/* EF5248 80242C38 10400016 */ beqz $v0, .L80242C94 +/* EF524C 80242C3C 24020003 */ addiu $v0, $zero, 3 +/* EF5250 80242C40 10620051 */ beq $v1, $v0, .L80242D88 +/* EF5254 80242C44 28620004 */ slti $v0, $v1, 4 +/* EF5258 80242C48 10400009 */ beqz $v0, .L80242C70 +/* EF525C 80242C4C 24020001 */ addiu $v0, $zero, 1 +/* EF5260 80242C50 10620044 */ beq $v1, $v0, .L80242D64 +/* EF5264 80242C54 28620002 */ slti $v0, $v1, 2 +/* EF5268 80242C58 50400048 */ beql $v0, $zero, .L80242D7C +/* EF526C 80242C5C 02A0202D */ daddu $a0, $s5, $zero +/* EF5270 80242C60 50600027 */ beql $v1, $zero, .L80242D00 +/* EF5274 80242C64 02A0202D */ daddu $a0, $s5, $zero +/* EF5278 80242C68 08090CA5 */ j .L80243294 +/* EF527C 80242C6C 00000000 */ nop +.L80242C70: +/* EF5280 80242C70 2402000D */ addiu $v0, $zero, 0xd +/* EF5284 80242C74 1062004D */ beq $v1, $v0, .L80242DAC +/* EF5288 80242C78 2862000E */ slti $v0, $v1, 0xe +/* EF528C 80242C7C 10400052 */ beqz $v0, .L80242DC8 +/* EF5290 80242C80 2402000C */ addiu $v0, $zero, 0xc +/* EF5294 80242C84 10620046 */ beq $v1, $v0, .L80242DA0 +/* EF5298 80242C88 02A0202D */ daddu $a0, $s5, $zero +/* EF529C 80242C8C 08090CA5 */ j .L80243294 +/* EF52A0 80242C90 00000000 */ nop +.L80242C94: +/* EF52A4 80242C94 24020067 */ addiu $v0, $zero, 0x67 +/* EF52A8 80242C98 10620158 */ beq $v1, $v0, .L802431FC +/* EF52AC 80242C9C 28620068 */ slti $v0, $v1, 0x68 +/* EF52B0 80242CA0 10400009 */ beqz $v0, .L80242CC8 +/* EF52B4 80242CA4 24020065 */ addiu $v0, $zero, 0x65 +/* EF52B8 80242CA8 1062008F */ beq $v1, $v0, .L80242EE8 +/* EF52BC 80242CAC 28620066 */ slti $v0, $v1, 0x66 +/* EF52C0 80242CB0 104000A9 */ beqz $v0, .L80242F58 +/* EF52C4 80242CB4 24020064 */ addiu $v0, $zero, 0x64 +/* EF52C8 80242CB8 1062004F */ beq $v1, $v0, .L80242DF8 +/* EF52CC 80242CBC 24020002 */ addiu $v0, $zero, 2 +/* EF52D0 80242CC0 08090CA5 */ j .L80243294 +/* EF52D4 80242CC4 00000000 */ nop +.L80242CC8: +/* EF52D8 80242CC8 2404006F */ addiu $a0, $zero, 0x6f +/* EF52DC 80242CCC 10640166 */ beq $v1, $a0, .L80243268 +/* EF52E0 80242CD0 28620070 */ slti $v0, $v1, 0x70 +/* EF52E4 80242CD4 10400005 */ beqz $v0, .L80242CEC +/* EF52E8 80242CD8 2402006E */ addiu $v0, $zero, 0x6e +/* EF52EC 80242CDC 10620156 */ beq $v1, $v0, .L80243238 +/* EF52F0 80242CE0 2402001E */ addiu $v0, $zero, 0x1e +/* EF52F4 80242CE4 08090CA5 */ j .L80243294 +/* EF52F8 80242CE8 00000000 */ nop +.L80242CEC: +/* EF52FC 80242CEC 240200C8 */ addiu $v0, $zero, 0xc8 +/* EF5300 80242CF0 10620166 */ beq $v1, $v0, .L8024328C +/* EF5304 80242CF4 00000000 */ nop +/* EF5308 80242CF8 08090CA5 */ j .L80243294 +/* EF530C 80242CFC 00000000 */ nop +.L80242D00: +/* EF5310 80242D00 0260282D */ daddu $a1, $s3, $zero +/* EF5314 80242D04 0C013670 */ jal func_8004D9C0 +/* EF5318 80242D08 0280302D */ daddu $a2, $s4, $zero +/* EF531C 80242D0C 96420086 */ lhu $v0, 0x86($s2) +/* EF5320 80242D10 A62200A8 */ sh $v0, 0xa8($s1) +/* EF5324 80242D14 8E4200A0 */ lw $v0, 0xa0($s2) +/* EF5328 80242D18 10400013 */ beqz $v0, .L80242D68 +/* EF532C 80242D1C 02A0202D */ daddu $a0, $s5, $zero +/* EF5330 80242D20 C620003C */ lwc1 $f0, 0x3c($s1) +/* EF5334 80242D24 44801000 */ mtc1 $zero, $f2 +/* EF5338 80242D28 44801800 */ mtc1 $zero, $f3 +/* EF533C 80242D2C 46000021 */ cvt.d.s $f0, $f0 +/* EF5340 80242D30 4622003E */ c.le.d $f0, $f2 +/* EF5344 80242D34 00000000 */ nop +/* EF5348 80242D38 45000005 */ bc1f .L80242D50 +/* EF534C 80242D3C 2403FDFF */ addiu $v1, $zero, -0x201 +/* EF5350 80242D40 8E220000 */ lw $v0, ($s1) +/* EF5354 80242D44 00431024 */ and $v0, $v0, $v1 +/* EF5358 80242D48 08090B58 */ j .L80242D60 +/* EF535C 80242D4C 34420008 */ ori $v0, $v0, 8 +.L80242D50: +/* EF5360 80242D50 8E220000 */ lw $v0, ($s1) +/* EF5364 80242D54 2403FFF7 */ addiu $v1, $zero, -9 +/* EF5368 80242D58 34420200 */ ori $v0, $v0, 0x200 +/* EF536C 80242D5C 00431024 */ and $v0, $v0, $v1 +.L80242D60: +/* EF5370 80242D60 AE220000 */ sw $v0, ($s1) +.L80242D64: +/* EF5374 80242D64 02A0202D */ daddu $a0, $s5, $zero +.L80242D68: +/* EF5378 80242D68 0260282D */ daddu $a1, $s3, $zero +/* EF537C 80242D6C 0C0136B6 */ jal func_8004DAD8 +/* EF5380 80242D70 0280302D */ daddu $a2, $s4, $zero +/* EF5384 80242D74 08090CA5 */ j .L80243294 +/* EF5388 80242D78 00000000 */ nop +.L80242D7C: +/* EF538C 80242D7C 0260282D */ daddu $a1, $s3, $zero +/* EF5390 80242D80 0C0137D9 */ jal func_8004DF64 +/* EF5394 80242D84 0280302D */ daddu $a2, $s4, $zero +.L80242D88: +/* EF5398 80242D88 02A0202D */ daddu $a0, $s5, $zero +/* EF539C 80242D8C 0260282D */ daddu $a1, $s3, $zero +/* EF53A0 80242D90 0C013809 */ jal func_8004E024 +/* EF53A4 80242D94 0280302D */ daddu $a2, $s4, $zero +/* EF53A8 80242D98 08090CA5 */ j .L80243294 +/* EF53AC 80242D9C 00000000 */ nop +.L80242DA0: +/* EF53B0 80242DA0 0260282D */ daddu $a1, $s3, $zero +/* EF53B4 80242DA4 0C090867 */ jal func_8024219C_EF47AC +/* EF53B8 80242DA8 0280302D */ daddu $a2, $s4, $zero +.L80242DAC: +/* EF53BC 80242DAC 02A0202D */ daddu $a0, $s5, $zero +/* EF53C0 80242DB0 0260282D */ daddu $a1, $s3, $zero +/* EF53C4 80242DB4 0C090886 */ jal func_80242218_EF4828 +/* EF53C8 80242DB8 0280302D */ daddu $a2, $s4, $zero +/* EF53CC 80242DBC 96420086 */ lhu $v0, 0x86($s2) +/* EF53D0 80242DC0 08090CA5 */ j .L80243294 +/* EF53D4 80242DC4 A62200A8 */ sh $v0, 0xa8($s1) +.L80242DC8: +/* EF53D8 80242DC8 02A0202D */ daddu $a0, $s5, $zero +/* EF53DC 80242DCC 0260282D */ daddu $a1, $s3, $zero +/* EF53E0 80242DD0 0C0908D3 */ jal func_8024234C_EF495C +/* EF53E4 80242DD4 0280302D */ daddu $a2, $s4, $zero +/* EF53E8 80242DD8 08090CA5 */ j .L80243294 +/* EF53EC 80242DDC 00000000 */ nop +.L80242DE0: +/* EF53F0 80242DE0 02A0202D */ daddu $a0, $s5, $zero +/* EF53F4 80242DE4 0260282D */ daddu $a1, $s3, $zero +/* EF53F8 80242DE8 0C09092C */ jal func_802424B0_EF4AC0 +/* EF53FC 80242DEC 0280302D */ daddu $a2, $s4, $zero +/* EF5400 80242DF0 08090CA5 */ j .L80243294 +/* EF5404 80242DF4 00000000 */ nop +.L80242DF8: +/* EF5408 80242DF8 8E430094 */ lw $v1, 0x94($s2) +/* EF540C 80242DFC 14620125 */ bne $v1, $v0, .L80243294 +/* EF5410 80242E00 00000000 */ nop +/* EF5414 80242E04 0C010ABD */ jal func_80042AF4 +/* EF5418 80242E08 8E440098 */ lw $a0, 0x98($s2) +/* EF541C 80242E0C 0C00F92F */ jal func_8003E4BC +/* EF5420 80242E10 84440008 */ lh $a0, 8($v0) +/* EF5424 80242E14 C440000C */ lwc1 $f0, 0xc($v0) +/* EF5428 80242E18 3C018024 */ lui $at, %hi(D_80245468) +/* EF542C 80242E1C D4225468 */ ldc1 $f2, %lo(D_80245468)($at) +/* EF5430 80242E20 46000021 */ cvt.d.s $f0, $f0 +/* EF5434 80242E24 4622003C */ c.lt.d $f0, $f2 +/* EF5438 80242E28 00000000 */ nop +/* EF543C 80242E2C 45000008 */ bc1f .L80242E50 +/* EF5440 80242E30 00000000 */ nop +/* EF5444 80242E34 C4400038 */ lwc1 $f0, 0x38($v0) +/* EF5448 80242E38 3C014028 */ lui $at, 0x4028 +/* EF544C 80242E3C 44811800 */ mtc1 $at, $f3 +/* EF5450 80242E40 44801000 */ mtc1 $zero, $f2 +/* EF5454 80242E44 46000021 */ cvt.d.s $f0, $f0 +/* EF5458 80242E48 08090B9A */ j .L80242E68 +/* EF545C 80242E4C 46220000 */ add.d $f0, $f0, $f2 +.L80242E50: +/* EF5460 80242E50 C4400038 */ lwc1 $f0, 0x38($v0) +/* EF5464 80242E54 3C014028 */ lui $at, 0x4028 +/* EF5468 80242E58 44811800 */ mtc1 $at, $f3 +/* EF546C 80242E5C 44801000 */ mtc1 $zero, $f2 +/* EF5470 80242E60 46000021 */ cvt.d.s $f0, $f0 +/* EF5474 80242E64 46220001 */ sub.d $f0, $f0, $f2 +.L80242E68: +/* EF5478 80242E68 46200020 */ cvt.s.d $f0, $f0 +/* EF547C 80242E6C E6200038 */ swc1 $f0, 0x38($s1) +/* EF5480 80242E70 3C04004A */ lui $a0, 0x4a +/* EF5484 80242E74 C440003C */ lwc1 $f0, 0x3c($v0) +/* EF5488 80242E78 3C014039 */ lui $at, 0x4039 +/* EF548C 80242E7C 44811800 */ mtc1 $at, $f3 +/* EF5490 80242E80 44801000 */ mtc1 $zero, $f2 +/* EF5494 80242E84 46000021 */ cvt.d.s $f0, $f0 +/* EF5498 80242E88 46220000 */ add.d $f0, $f0, $f2 +/* EF549C 80242E8C 34840018 */ ori $a0, $a0, 0x18 +/* EF54A0 80242E90 3C013FF0 */ lui $at, 0x3ff0 +/* EF54A4 80242E94 44811800 */ mtc1 $at, $f3 +/* EF54A8 80242E98 44801000 */ mtc1 $zero, $f2 +/* EF54AC 80242E9C 46200020 */ cvt.s.d $f0, $f0 +/* EF54B0 80242EA0 E620003C */ swc1 $f0, 0x3c($s1) +/* EF54B4 80242EA4 C4400040 */ lwc1 $f0, 0x40($v0) +/* EF54B8 80242EA8 8E220000 */ lw $v0, ($s1) +/* EF54BC 80242EAC 2403FFFD */ addiu $v1, $zero, -3 +/* EF54C0 80242EB0 AE200048 */ sw $zero, 0x48($s1) +/* EF54C4 80242EB4 AE200034 */ sw $zero, 0x34($s1) +/* EF54C8 80242EB8 AE240028 */ sw $a0, 0x28($s1) +/* EF54CC 80242EBC 34420008 */ ori $v0, $v0, 8 +/* EF54D0 80242EC0 00431024 */ and $v0, $v0, $v1 +/* EF54D4 80242EC4 2403FDFF */ addiu $v1, $zero, -0x201 +/* EF54D8 80242EC8 00431024 */ and $v0, $v0, $v1 +/* EF54DC 80242ECC 46000021 */ cvt.d.s $f0, $f0 +/* EF54E0 80242ED0 46220000 */ add.d $f0, $f0, $f2 +/* EF54E4 80242ED4 AE220000 */ sw $v0, ($s1) +/* EF54E8 80242ED8 24020065 */ addiu $v0, $zero, 0x65 +/* EF54EC 80242EDC 46200020 */ cvt.s.d $f0, $f0 +/* EF54F0 80242EE0 E6200040 */ swc1 $f0, 0x40($s1) +/* EF54F4 80242EE4 AEA20070 */ sw $v0, 0x70($s5) +.L80242EE8: +/* EF54F8 80242EE8 8E430094 */ lw $v1, 0x94($s2) +/* EF54FC 80242EEC 24020003 */ addiu $v0, $zero, 3 +/* EF5500 80242EF0 146200E8 */ bne $v1, $v0, .L80243294 +/* EF5504 80242EF4 24020004 */ addiu $v0, $zero, 4 +/* EF5508 80242EF8 AE420094 */ sw $v0, 0x94($s2) +/* EF550C 80242EFC C62C0038 */ lwc1 $f12, 0x38($s1) +/* EF5510 80242F00 3C028010 */ lui $v0, %hi(D_800FFC90) +/* EF5514 80242F04 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) +/* EF5518 80242F08 C62E0040 */ lwc1 $f14, 0x40($s1) +/* EF551C 80242F0C 8C460028 */ lw $a2, 0x28($v0) +/* EF5520 80242F10 0C00ABDC */ jal fio_validate_header_checksums +/* EF5524 80242F14 8C470030 */ lw $a3, 0x30($v0) +/* EF5528 80242F18 3C014020 */ lui $at, 0x4020 +/* EF552C 80242F1C 44811000 */ mtc1 $at, $f2 +/* EF5530 80242F20 3C014100 */ lui $at, 0x4100 +/* EF5534 80242F24 44812000 */ mtc1 $at, $f4 +/* EF5538 80242F28 3C013F4C */ lui $at, 0x3f4c +/* EF553C 80242F2C 3421CCCD */ ori $at, $at, 0xcccd +/* EF5540 80242F30 44813000 */ mtc1 $at, $f6 +/* EF5544 80242F34 8E220000 */ lw $v0, ($s1) +/* EF5548 80242F38 E620000C */ swc1 $f0, 0xc($s1) +/* EF554C 80242F3C 34420800 */ ori $v0, $v0, 0x800 +/* EF5550 80242F40 AE220000 */ sw $v0, ($s1) +/* EF5554 80242F44 24020066 */ addiu $v0, $zero, 0x66 +/* EF5558 80242F48 E6220018 */ swc1 $f2, 0x18($s1) +/* EF555C 80242F4C E624001C */ swc1 $f4, 0x1c($s1) +/* EF5560 80242F50 E6260014 */ swc1 $f6, 0x14($s1) +/* EF5564 80242F54 AEA20070 */ sw $v0, 0x70($s5) +.L80242F58: +/* EF5568 80242F58 C6200018 */ lwc1 $f0, 0x18($s1) +/* EF556C 80242F5C 44801000 */ mtc1 $zero, $f2 +/* EF5570 80242F60 44801800 */ mtc1 $zero, $f3 +/* EF5574 80242F64 46000021 */ cvt.d.s $f0, $f0 +/* EF5578 80242F68 4620103C */ c.lt.d $f2, $f0 +/* EF557C 80242F6C 00000000 */ nop +/* EF5580 80242F70 4500001F */ bc1f .L80242FF0 +/* EF5584 80242F74 27A50058 */ addiu $a1, $sp, 0x58 +/* EF5588 80242F78 C6200038 */ lwc1 $f0, 0x38($s1) +/* EF558C 80242F7C C622003C */ lwc1 $f2, 0x3c($s1) +/* EF5590 80242F80 C6240040 */ lwc1 $f4, 0x40($s1) +/* EF5594 80242F84 C6260018 */ lwc1 $f6, 0x18($s1) +/* EF5598 80242F88 E7A00058 */ swc1 $f0, 0x58($sp) +/* EF559C 80242F8C E7A2005C */ swc1 $f2, 0x5c($sp) +/* EF55A0 80242F90 E7A40060 */ swc1 $f4, 0x60($sp) +/* EF55A4 80242F94 E7A60010 */ swc1 $f6, 0x10($sp) +/* EF55A8 80242F98 C620000C */ lwc1 $f0, 0xc($s1) +/* EF55AC 80242F9C E7A00014 */ swc1 $f0, 0x14($sp) +/* EF55B0 80242FA0 862200A8 */ lh $v0, 0xa8($s1) +/* EF55B4 80242FA4 44820000 */ mtc1 $v0, $f0 +/* EF55B8 80242FA8 00000000 */ nop +/* EF55BC 80242FAC 46800020 */ cvt.s.w $f0, $f0 +/* EF55C0 80242FB0 E7A00018 */ swc1 $f0, 0x18($sp) +/* EF55C4 80242FB4 862200A6 */ lh $v0, 0xa6($s1) +/* EF55C8 80242FB8 27A6005C */ addiu $a2, $sp, 0x5c +/* EF55CC 80242FBC 44820000 */ mtc1 $v0, $f0 +/* EF55D0 80242FC0 00000000 */ nop +/* EF55D4 80242FC4 46800020 */ cvt.s.w $f0, $f0 +/* EF55D8 80242FC8 E7A0001C */ swc1 $f0, 0x1c($sp) +/* EF55DC 80242FCC 8E240080 */ lw $a0, 0x80($s1) +/* EF55E0 80242FD0 0C0394C1 */ jal func_800E5304 +/* EF55E4 80242FD4 27A70060 */ addiu $a3, $sp, 0x60 +/* EF55E8 80242FD8 54400005 */ bnel $v0, $zero, .L80242FF0 +/* EF55EC 80242FDC AE200018 */ sw $zero, 0x18($s1) +/* EF55F0 80242FE0 8E250018 */ lw $a1, 0x18($s1) +/* EF55F4 80242FE4 8E26000C */ lw $a2, 0xc($s1) +/* EF55F8 80242FE8 0C00F909 */ jal func_8003E424 +/* EF55FC 80242FEC 0220202D */ daddu $a0, $s1, $zero +.L80242FF0: +/* EF5600 80242FF0 C620001C */ lwc1 $f0, 0x1c($s1) +/* EF5604 80242FF4 4480B000 */ mtc1 $zero, $f22 +/* EF5608 80242FF8 4480B800 */ mtc1 $zero, $f23 +/* EF560C 80242FFC 46000021 */ cvt.d.s $f0, $f0 +/* EF5610 80243000 4636003C */ c.lt.d $f0, $f22 +/* EF5614 80243004 00000000 */ nop +/* EF5618 80243008 45000074 */ bc1f .L802431DC +/* EF561C 8024300C 27A50058 */ addiu $a1, $sp, 0x58 +/* EF5620 80243010 27A6005C */ addiu $a2, $sp, 0x5c +/* EF5624 80243014 27A20064 */ addiu $v0, $sp, 0x64 +/* EF5628 80243018 C622003C */ lwc1 $f2, 0x3c($s1) +/* EF562C 8024301C C6260038 */ lwc1 $f6, 0x38($s1) +/* EF5630 80243020 3C01402A */ lui $at, 0x402a +/* EF5634 80243024 4481A800 */ mtc1 $at, $f21 +/* EF5638 80243028 4480A000 */ mtc1 $zero, $f20 +/* EF563C 8024302C 460010A1 */ cvt.d.s $f2, $f2 +/* EF5640 80243030 46341080 */ add.d $f2, $f2, $f20 +/* EF5644 80243034 C620001C */ lwc1 $f0, 0x1c($s1) +/* EF5648 80243038 C6240040 */ lwc1 $f4, 0x40($s1) +/* EF564C 8024303C 46000005 */ abs.s $f0, $f0 +/* EF5650 80243040 E7A40060 */ swc1 $f4, 0x60($sp) +/* EF5654 80243044 3C014030 */ lui $at, 0x4030 +/* EF5658 80243048 44812800 */ mtc1 $at, $f5 +/* EF565C 8024304C 44802000 */ mtc1 $zero, $f4 +/* EF5660 80243050 46000021 */ cvt.d.s $f0, $f0 +/* EF5664 80243054 E7A60058 */ swc1 $f6, 0x58($sp) +/* EF5668 80243058 46240000 */ add.d $f0, $f0, $f4 +/* EF566C 8024305C 462010A0 */ cvt.s.d $f2, $f2 +/* EF5670 80243060 E7A2005C */ swc1 $f2, 0x5c($sp) +/* EF5674 80243064 46200020 */ cvt.s.d $f0, $f0 +/* EF5678 80243068 E7A00064 */ swc1 $f0, 0x64($sp) +/* EF567C 8024306C AFA20010 */ sw $v0, 0x10($sp) +/* EF5680 80243070 8E240080 */ lw $a0, 0x80($s1) +/* EF5684 80243074 0C03908F */ jal func_800E423C +/* EF5688 80243078 27A70060 */ addiu $a3, $sp, 0x60 +/* EF568C 8024307C 10400057 */ beqz $v0, .L802431DC +/* EF5690 80243080 00000000 */ nop +/* EF5694 80243084 C620001C */ lwc1 $f0, 0x1c($s1) +/* EF5698 80243088 C7A20064 */ lwc1 $f2, 0x64($sp) +/* EF569C 8024308C 46000005 */ abs.s $f0, $f0 +/* EF56A0 80243090 46000021 */ cvt.d.s $f0, $f0 +/* EF56A4 80243094 46340000 */ add.d $f0, $f0, $f20 +/* EF56A8 80243098 460010A1 */ cvt.d.s $f2, $f2 +/* EF56AC 8024309C 4620103E */ c.le.d $f2, $f0 +/* EF56B0 802430A0 00000000 */ nop +/* EF56B4 802430A4 4500004D */ bc1f .L802431DC +/* EF56B8 802430A8 00000000 */ nop +/* EF56BC 802430AC C7A0005C */ lwc1 $f0, 0x5c($sp) +/* EF56C0 802430B0 E620003C */ swc1 $f0, 0x3c($s1) +/* EF56C4 802430B4 8E4200D0 */ lw $v0, 0xd0($s2) +/* EF56C8 802430B8 C6200038 */ lwc1 $f0, 0x38($s1) +/* EF56CC 802430BC 4600020D */ trunc.w.s $f8, $f0 +/* EF56D0 802430C0 E4480000 */ swc1 $f8, ($v0) +/* EF56D4 802430C4 8E4200D0 */ lw $v0, 0xd0($s2) +/* EF56D8 802430C8 C620003C */ lwc1 $f0, 0x3c($s1) +/* EF56DC 802430CC 4600020D */ trunc.w.s $f8, $f0 +/* EF56E0 802430D0 E4480004 */ swc1 $f8, 4($v0) +/* EF56E4 802430D4 8E4200D0 */ lw $v0, 0xd0($s2) +/* EF56E8 802430D8 C6200040 */ lwc1 $f0, 0x40($s1) +/* EF56EC 802430DC 4600020D */ trunc.w.s $f8, $f0 +/* EF56F0 802430E0 E4480008 */ swc1 $f8, 8($v0) +/* EF56F4 802430E4 8E4200D0 */ lw $v0, 0xd0($s2) +/* EF56F8 802430E8 C6200038 */ lwc1 $f0, 0x38($s1) +/* EF56FC 802430EC 4600020D */ trunc.w.s $f8, $f0 +/* EF5700 802430F0 E448001C */ swc1 $f8, 0x1c($v0) +/* EF5704 802430F4 8E4200D0 */ lw $v0, 0xd0($s2) +/* EF5708 802430F8 C620003C */ lwc1 $f0, 0x3c($s1) +/* EF570C 802430FC 4600020D */ trunc.w.s $f8, $f0 +/* EF5710 80243100 E4480020 */ swc1 $f8, 0x20($v0) +/* EF5714 80243104 8E4200D0 */ lw $v0, 0xd0($s2) +/* EF5718 80243108 C6200040 */ lwc1 $f0, 0x40($s1) +/* EF571C 8024310C 4600020D */ trunc.w.s $f8, $f0 +/* EF5720 80243110 E4480024 */ swc1 $f8, 0x24($v0) +/* EF5724 80243114 8E4300A0 */ lw $v1, 0xa0($s2) +/* EF5728 80243118 24020005 */ addiu $v0, $zero, 5 +/* EF572C 8024311C 1060000B */ beqz $v1, .L8024314C +/* EF5730 80243120 AE420094 */ sw $v0, 0x94($s2) +/* EF5734 80243124 C620003C */ lwc1 $f0, 0x3c($s1) +/* EF5738 80243128 46000021 */ cvt.d.s $f0, $f0 +/* EF573C 8024312C 4636003E */ c.le.d $f0, $f22 +/* EF5740 80243130 00000000 */ nop +/* EF5744 80243134 4501000D */ bc1t .L8024316C +/* EF5748 80243138 2403FFF7 */ addiu $v1, $zero, -9 +/* EF574C 8024313C 8E220000 */ lw $v0, ($s1) +/* EF5750 80243140 34420200 */ ori $v0, $v0, 0x200 +/* EF5754 80243144 08090C5F */ j .L8024317C +/* EF5758 80243148 00431024 */ and $v0, $v0, $v1 +.L8024314C: +/* EF575C 8024314C 8E4200D0 */ lw $v0, 0xd0($s2) +/* EF5760 80243150 8C420034 */ lw $v0, 0x34($v0) +/* EF5764 80243154 14400005 */ bnez $v0, .L8024316C +/* EF5768 80243158 2403FFF7 */ addiu $v1, $zero, -9 +/* EF576C 8024315C 8E220000 */ lw $v0, ($s1) +/* EF5770 80243160 34420200 */ ori $v0, $v0, 0x200 +/* EF5774 80243164 08090C5F */ j .L8024317C +/* EF5778 80243168 00431024 */ and $v0, $v0, $v1 +.L8024316C: +/* EF577C 8024316C 8E220000 */ lw $v0, ($s1) +/* EF5780 80243170 2403FDFF */ addiu $v1, $zero, -0x201 +/* EF5784 80243174 00431024 */ and $v0, $v0, $v1 +/* EF5788 80243178 34420008 */ ori $v0, $v0, 8 +.L8024317C: +/* EF578C 8024317C AE220000 */ sw $v0, ($s1) +/* EF5790 80243180 C62C0038 */ lwc1 $f12, 0x38($s1) +/* EF5794 80243184 C62E0040 */ lwc1 $f14, 0x40($s1) +/* EF5798 80243188 8E220000 */ lw $v0, ($s1) +/* EF579C 8024318C 3C048010 */ lui $a0, %hi(D_800FFC90) +/* EF57A0 80243190 8C84FC90 */ lw $a0, %lo(D_800FFC90)($a0) +/* EF57A4 80243194 3C030004 */ lui $v1, 4 +/* EF57A8 80243198 AE20001C */ sw $zero, 0x1c($s1) +/* EF57AC 8024319C 00431025 */ or $v0, $v0, $v1 +/* EF57B0 802431A0 2403F7FF */ addiu $v1, $zero, -0x801 +/* EF57B4 802431A4 00431024 */ and $v0, $v0, $v1 +/* EF57B8 802431A8 AE220000 */ sw $v0, ($s1) +/* EF57BC 802431AC 8C860028 */ lw $a2, 0x28($a0) +/* EF57C0 802431B0 0C00ABDC */ jal fio_validate_header_checksums +/* EF57C4 802431B4 8C870030 */ lw $a3, 0x30($a0) +/* EF57C8 802431B8 3C02004A */ lui $v0, 0x4a +/* EF57CC 802431BC 3442001A */ ori $v0, $v0, 0x1a +/* EF57D0 802431C0 AE220028 */ sw $v0, 0x28($s1) +/* EF57D4 802431C4 24020003 */ addiu $v0, $zero, 3 +/* EF57D8 802431C8 A622008E */ sh $v0, 0x8e($s1) +/* EF57DC 802431CC 24020067 */ addiu $v0, $zero, 0x67 +/* EF57E0 802431D0 E620000C */ swc1 $f0, 0xc($s1) +/* EF57E4 802431D4 08090CA5 */ j .L80243294 +/* EF57E8 802431D8 AEA20070 */ sw $v0, 0x70($s5) +.L802431DC: +/* EF57EC 802431DC C624003C */ lwc1 $f4, 0x3c($s1) +/* EF57F0 802431E0 C620001C */ lwc1 $f0, 0x1c($s1) +/* EF57F4 802431E4 46002100 */ add.s $f4, $f4, $f0 +/* EF57F8 802431E8 C6220014 */ lwc1 $f2, 0x14($s1) +/* EF57FC 802431EC 46020001 */ sub.s $f0, $f0, $f2 +/* EF5800 802431F0 E624003C */ swc1 $f4, 0x3c($s1) +/* EF5804 802431F4 08090CA5 */ j .L80243294 +/* EF5808 802431F8 E620001C */ swc1 $f0, 0x1c($s1) +.L802431FC: +/* EF580C 802431FC 9622008E */ lhu $v0, 0x8e($s1) +/* EF5810 80243200 2442FFFF */ addiu $v0, $v0, -1 +/* EF5814 80243204 A622008E */ sh $v0, 0x8e($s1) +/* EF5818 80243208 00021400 */ sll $v0, $v0, 0x10 +/* EF581C 8024320C 1C400021 */ bgtz $v0, .L80243294 +/* EF5820 80243210 3C03004A */ lui $v1, 0x4a +/* EF5824 80243214 3C04FFFB */ lui $a0, 0xfffb +/* EF5828 80243218 3484FFFF */ ori $a0, $a0, 0xffff +/* EF582C 8024321C 8E220000 */ lw $v0, ($s1) +/* EF5830 80243220 34630001 */ ori $v1, $v1, 1 +/* EF5834 80243224 AE230028 */ sw $v1, 0x28($s1) +/* EF5838 80243228 00441024 */ and $v0, $v0, $a0 +/* EF583C 8024322C AE220000 */ sw $v0, ($s1) +/* EF5840 80243230 08090CA5 */ j .L80243294 +/* EF5844 80243234 AEA00070 */ sw $zero, 0x70($s5) +.L80243238: +/* EF5848 80243238 3C01C47A */ lui $at, 0xc47a +/* EF584C 8024323C 44810000 */ mtc1 $at, $f0 +/* EF5850 80243240 8E230000 */ lw $v1, ($s1) +/* EF5854 80243244 A622008E */ sh $v0, 0x8e($s1) +/* EF5858 80243248 2402FDFF */ addiu $v0, $zero, -0x201 +/* EF585C 8024324C AE200038 */ sw $zero, 0x38($s1) +/* EF5860 80243250 AE200040 */ sw $zero, 0x40($s1) +/* EF5864 80243254 3463000A */ ori $v1, $v1, 0xa +/* EF5868 80243258 00621824 */ and $v1, $v1, $v0 +/* EF586C 8024325C E620003C */ swc1 $f0, 0x3c($s1) +/* EF5870 80243260 AE230000 */ sw $v1, ($s1) +/* EF5874 80243264 AEA40070 */ sw $a0, 0x70($s5) +.L80243268: +/* EF5878 80243268 9622008E */ lhu $v0, 0x8e($s1) +/* EF587C 8024326C 2442FFFF */ addiu $v0, $v0, -1 +/* EF5880 80243270 A622008E */ sh $v0, 0x8e($s1) +/* EF5884 80243274 00021400 */ sll $v0, $v0, 0x10 +/* EF5888 80243278 1C400006 */ bgtz $v0, .L80243294 +/* EF588C 8024327C 24020064 */ addiu $v0, $zero, 0x64 +/* EF5890 80243280 AE400094 */ sw $zero, 0x94($s2) +/* EF5894 80243284 08090CA5 */ j .L80243294 +/* EF5898 80243288 AEA20070 */ sw $v0, 0x70($s5) +.L8024328C: +/* EF589C 8024328C 0C013AE3 */ jal func_8004EB8C +/* EF58A0 80243290 02A0202D */ daddu $a0, $s5, $zero +.L80243294: +/* EF58A4 80243294 8FBF0080 */ lw $ra, 0x80($sp) +/* EF58A8 80243298 8FB5007C */ lw $s5, 0x7c($sp) +/* EF58AC 8024329C 8FB40078 */ lw $s4, 0x78($sp) +/* EF58B0 802432A0 8FB30074 */ lw $s3, 0x74($sp) +/* EF58B4 802432A4 8FB20070 */ lw $s2, 0x70($sp) +/* EF58B8 802432A8 8FB1006C */ lw $s1, 0x6c($sp) +/* EF58BC 802432AC 8FB00068 */ lw $s0, 0x68($sp) +/* EF58C0 802432B0 D7B60090 */ ldc1 $f22, 0x90($sp) +/* EF58C4 802432B4 D7B40088 */ ldc1 $f20, 0x88($sp) +/* EF58C8 802432B8 0000102D */ daddu $v0, $zero, $zero +/* EF58CC 802432BC 03E00008 */ jr $ra +/* EF58D0 802432C0 27BD0098 */ addiu $sp, $sp, 0x98 +/* EF58D4 802432C4 00000000 */ nop +/* EF58D8 802432C8 00000000 */ nop +/* EF58DC 802432CC 00000000 */ nop diff --git a/asm/nonmatchings/code_EF7A80/func_80240000_EF7A80.s b/asm/nonmatchings/code_EF7A80/func_80240000_EF7A80.s new file mode 100644 index 0000000000..d4bbe8bd3a --- /dev/null +++ b/asm/nonmatchings/code_EF7A80/func_80240000_EF7A80.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EF7A80 +/* EF7A80 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EF7A84 80240004 AFB00010 */ sw $s0, 0x10($sp) +/* EF7A88 80240008 0080802D */ daddu $s0, $a0, $zero +/* EF7A8C 8024000C AFBF0014 */ sw $ra, 0x14($sp) +/* EF7A90 80240010 8E0300A8 */ lw $v1, 0xa8($s0) +/* EF7A94 80240014 8E020088 */ lw $v0, 0x88($s0) +/* EF7A98 80240018 00621821 */ addu $v1, $v1, $v0 +/* EF7A9C 8024001C 04610004 */ bgez $v1, .L80240030 +/* EF7AA0 80240020 AE0300A8 */ sw $v1, 0xa8($s0) +/* EF7AA4 80240024 3C020002 */ lui $v0, 2 +/* EF7AA8 80240028 08090010 */ j .L80240040 +/* EF7AAC 8024002C 00621021 */ addu $v0, $v1, $v0 +.L80240030: +/* EF7AB0 80240030 3C040002 */ lui $a0, 2 +/* EF7AB4 80240034 0083102A */ slt $v0, $a0, $v1 +/* EF7AB8 80240038 10400002 */ beqz $v0, .L80240044 +/* EF7ABC 8024003C 00641023 */ subu $v0, $v1, $a0 +.L80240040: +/* EF7AC0 80240040 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240044: +/* EF7AC4 80240044 8E0300AC */ lw $v1, 0xac($s0) +/* EF7AC8 80240048 8E02008C */ lw $v0, 0x8c($s0) +/* EF7ACC 8024004C 00621821 */ addu $v1, $v1, $v0 +/* EF7AD0 80240050 04610004 */ bgez $v1, .L80240064 +/* EF7AD4 80240054 AE0300AC */ sw $v1, 0xac($s0) +/* EF7AD8 80240058 3C020002 */ lui $v0, 2 +/* EF7ADC 8024005C 0809001D */ j .L80240074 +/* EF7AE0 80240060 00621021 */ addu $v0, $v1, $v0 +.L80240064: +/* EF7AE4 80240064 3C040002 */ lui $a0, 2 +/* EF7AE8 80240068 0083102A */ slt $v0, $a0, $v1 +/* EF7AEC 8024006C 10400002 */ beqz $v0, .L80240078 +/* EF7AF0 80240070 00641023 */ subu $v0, $v1, $a0 +.L80240074: +/* EF7AF4 80240074 AE0200AC */ sw $v0, 0xac($s0) +.L80240078: +/* EF7AF8 80240078 8E0300B0 */ lw $v1, 0xb0($s0) +/* EF7AFC 8024007C 8E020090 */ lw $v0, 0x90($s0) +/* EF7B00 80240080 00621821 */ addu $v1, $v1, $v0 +/* EF7B04 80240084 04610004 */ bgez $v1, .L80240098 +/* EF7B08 80240088 AE0300B0 */ sw $v1, 0xb0($s0) +/* EF7B0C 8024008C 3C020002 */ lui $v0, 2 +/* EF7B10 80240090 0809002A */ j .L802400A8 +/* EF7B14 80240094 00621021 */ addu $v0, $v1, $v0 +.L80240098: +/* EF7B18 80240098 3C040002 */ lui $a0, 2 +/* EF7B1C 8024009C 0083102A */ slt $v0, $a0, $v1 +/* EF7B20 802400A0 10400002 */ beqz $v0, .L802400AC +/* EF7B24 802400A4 00641023 */ subu $v0, $v1, $a0 +.L802400A8: +/* EF7B28 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802400AC: +/* EF7B2C 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) +/* EF7B30 802400B0 8E020094 */ lw $v0, 0x94($s0) +/* EF7B34 802400B4 00621821 */ addu $v1, $v1, $v0 +/* EF7B38 802400B8 04610004 */ bgez $v1, .L802400CC +/* EF7B3C 802400BC AE0300B4 */ sw $v1, 0xb4($s0) +/* EF7B40 802400C0 3C020002 */ lui $v0, 2 +/* EF7B44 802400C4 08090037 */ j .L802400DC +/* EF7B48 802400C8 00621021 */ addu $v0, $v1, $v0 +.L802400CC: +/* EF7B4C 802400CC 3C040002 */ lui $a0, 2 +/* EF7B50 802400D0 0083102A */ slt $v0, $a0, $v1 +/* EF7B54 802400D4 10400002 */ beqz $v0, .L802400E0 +/* EF7B58 802400D8 00641023 */ subu $v0, $v1, $a0 +.L802400DC: +/* EF7B5C 802400DC AE0200B4 */ sw $v0, 0xb4($s0) +.L802400E0: +/* EF7B60 802400E0 8E040084 */ lw $a0, 0x84($s0) +/* EF7B64 802400E4 0C049819 */ jal func_80126064 +/* EF7B68 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) +/* EF7B6C 802400EC 8E040084 */ lw $a0, 0x84($s0) +/* EF7B70 802400F0 0C04981F */ jal func_8012607C +/* EF7B74 802400F4 8E0500AC */ lw $a1, 0xac($s0) +/* EF7B78 802400F8 8E040084 */ lw $a0, 0x84($s0) +/* EF7B7C 802400FC 0C049825 */ jal func_80126094 +/* EF7B80 80240100 8E0500B0 */ lw $a1, 0xb0($s0) +/* EF7B84 80240104 8E040084 */ lw $a0, 0x84($s0) +/* EF7B88 80240108 0C04982B */ jal func_801260AC +/* EF7B8C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) +/* EF7B90 80240110 8FBF0014 */ lw $ra, 0x14($sp) +/* EF7B94 80240114 8FB00010 */ lw $s0, 0x10($sp) +/* EF7B98 80240118 0000102D */ daddu $v0, $zero, $zero +/* EF7B9C 8024011C 03E00008 */ jr $ra +/* EF7BA0 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EF7A80/func_80240124_EF7BA4.s b/asm/nonmatchings/code_EF7A80/func_80240124_EF7BA4.s new file mode 100644 index 0000000000..62f9c85bef --- /dev/null +++ b/asm/nonmatchings/code_EF7A80/func_80240124_EF7BA4.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240124_EF7BA4 +/* EF7BA4 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EF7BA8 80240128 AFB00010 */ sw $s0, 0x10($sp) +/* EF7BAC 8024012C 0080802D */ daddu $s0, $a0, $zero +/* EF7BB0 80240130 10A00005 */ beqz $a1, .L80240148 +/* EF7BB4 80240134 AFBF0014 */ sw $ra, 0x14($sp) +/* EF7BB8 80240138 AE000070 */ sw $zero, 0x70($s0) +/* EF7BBC 8024013C AE000074 */ sw $zero, 0x74($s0) +/* EF7BC0 80240140 AE000078 */ sw $zero, 0x78($s0) +/* EF7BC4 80240144 AE00007C */ sw $zero, 0x7c($s0) +.L80240148: +/* EF7BC8 80240148 8E020070 */ lw $v0, 0x70($s0) +/* EF7BCC 8024014C 1440000E */ bnez $v0, .L80240188 +/* EF7BD0 80240150 00000000 */ nop +/* EF7BD4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) +/* EF7BD8 80240158 8E020088 */ lw $v0, 0x88($s0) +/* EF7BDC 8024015C 00621821 */ addu $v1, $v1, $v0 +/* EF7BE0 80240160 04610004 */ bgez $v1, .L80240174 +/* EF7BE4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) +/* EF7BE8 80240168 3C020002 */ lui $v0, 2 +/* EF7BEC 8024016C 08090061 */ j .L80240184 +/* EF7BF0 80240170 00621021 */ addu $v0, $v1, $v0 +.L80240174: +/* EF7BF4 80240174 3C040002 */ lui $a0, 2 +/* EF7BF8 80240178 0083102A */ slt $v0, $a0, $v1 +/* EF7BFC 8024017C 10400002 */ beqz $v0, .L80240188 +/* EF7C00 80240180 00641023 */ subu $v0, $v1, $a0 +.L80240184: +/* EF7C04 80240184 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240188: +/* EF7C08 80240188 8E020074 */ lw $v0, 0x74($s0) +/* EF7C0C 8024018C 1440000E */ bnez $v0, .L802401C8 +/* EF7C10 80240190 00000000 */ nop +/* EF7C14 80240194 8E0300AC */ lw $v1, 0xac($s0) +/* EF7C18 80240198 8E02008C */ lw $v0, 0x8c($s0) +/* EF7C1C 8024019C 00621821 */ addu $v1, $v1, $v0 +/* EF7C20 802401A0 04610004 */ bgez $v1, .L802401B4 +/* EF7C24 802401A4 AE0300AC */ sw $v1, 0xac($s0) +/* EF7C28 802401A8 3C020002 */ lui $v0, 2 +/* EF7C2C 802401AC 08090071 */ j .L802401C4 +/* EF7C30 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* EF7C34 802401B4 3C040002 */ lui $a0, 2 +/* EF7C38 802401B8 0083102A */ slt $v0, $a0, $v1 +/* EF7C3C 802401BC 10400002 */ beqz $v0, .L802401C8 +/* EF7C40 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* EF7C44 802401C4 AE0200AC */ sw $v0, 0xac($s0) +.L802401C8: +/* EF7C48 802401C8 8E020078 */ lw $v0, 0x78($s0) +/* EF7C4C 802401CC 1440000E */ bnez $v0, .L80240208 +/* EF7C50 802401D0 00000000 */ nop +/* EF7C54 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) +/* EF7C58 802401D8 8E020090 */ lw $v0, 0x90($s0) +/* EF7C5C 802401DC 00621821 */ addu $v1, $v1, $v0 +/* EF7C60 802401E0 04610004 */ bgez $v1, .L802401F4 +/* EF7C64 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) +/* EF7C68 802401E8 3C020002 */ lui $v0, 2 +/* EF7C6C 802401EC 08090081 */ j .L80240204 +/* EF7C70 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* EF7C74 802401F4 3C040002 */ lui $a0, 2 +/* EF7C78 802401F8 0083102A */ slt $v0, $a0, $v1 +/* EF7C7C 802401FC 10400002 */ beqz $v0, .L80240208 +/* EF7C80 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* EF7C84 80240204 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240208: +/* EF7C88 80240208 8E02007C */ lw $v0, 0x7c($s0) +/* EF7C8C 8024020C 1440000E */ bnez $v0, .L80240248 +/* EF7C90 80240210 00000000 */ nop +/* EF7C94 80240214 8E0300B4 */ lw $v1, 0xb4($s0) +/* EF7C98 80240218 8E020094 */ lw $v0, 0x94($s0) +/* EF7C9C 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EF7CA0 80240220 04610004 */ bgez $v1, .L80240234 +/* EF7CA4 80240224 AE0300B4 */ sw $v1, 0xb4($s0) +/* EF7CA8 80240228 3C020002 */ lui $v0, 2 +/* EF7CAC 8024022C 08090091 */ j .L80240244 +/* EF7CB0 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* EF7CB4 80240234 3C040002 */ lui $a0, 2 +/* EF7CB8 80240238 0083102A */ slt $v0, $a0, $v1 +/* EF7CBC 8024023C 10400002 */ beqz $v0, .L80240248 +/* EF7CC0 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* EF7CC4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240248: +/* EF7CC8 80240248 8E040084 */ lw $a0, 0x84($s0) +/* EF7CCC 8024024C 0C049819 */ jal func_80126064 +/* EF7CD0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) +/* EF7CD4 80240254 8E040084 */ lw $a0, 0x84($s0) +/* EF7CD8 80240258 0C04981F */ jal func_8012607C +/* EF7CDC 8024025C 8E0500AC */ lw $a1, 0xac($s0) +/* EF7CE0 80240260 8E040084 */ lw $a0, 0x84($s0) +/* EF7CE4 80240264 0C049825 */ jal func_80126094 +/* EF7CE8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) +/* EF7CEC 8024026C 8E040084 */ lw $a0, 0x84($s0) +/* EF7CF0 80240270 0C04982B */ jal func_801260AC +/* EF7CF4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) +/* EF7CF8 80240278 8E020070 */ lw $v0, 0x70($s0) +/* EF7CFC 8024027C 8E030078 */ lw $v1, 0x78($s0) +/* EF7D00 80240280 8E040098 */ lw $a0, 0x98($s0) +/* EF7D04 80240284 24420001 */ addiu $v0, $v0, 1 +/* EF7D08 80240288 AE020070 */ sw $v0, 0x70($s0) +/* EF7D0C 8024028C 8E020074 */ lw $v0, 0x74($s0) +/* EF7D10 80240290 24630001 */ addiu $v1, $v1, 1 +/* EF7D14 80240294 AE030078 */ sw $v1, 0x78($s0) +/* EF7D18 80240298 8E030070 */ lw $v1, 0x70($s0) +/* EF7D1C 8024029C 24420001 */ addiu $v0, $v0, 1 +/* EF7D20 802402A0 AE020074 */ sw $v0, 0x74($s0) +/* EF7D24 802402A4 8E02007C */ lw $v0, 0x7c($s0) +/* EF7D28 802402A8 0064182A */ slt $v1, $v1, $a0 +/* EF7D2C 802402AC 24420001 */ addiu $v0, $v0, 1 +/* EF7D30 802402B0 14600002 */ bnez $v1, .L802402BC +/* EF7D34 802402B4 AE02007C */ sw $v0, 0x7c($s0) +/* EF7D38 802402B8 AE000070 */ sw $zero, 0x70($s0) +.L802402BC: +/* EF7D3C 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* EF7D40 802402C0 8E03009C */ lw $v1, 0x9c($s0) +/* EF7D44 802402C4 0043102A */ slt $v0, $v0, $v1 +/* EF7D48 802402C8 50400001 */ beql $v0, $zero, .L802402D0 +/* EF7D4C 802402CC AE000074 */ sw $zero, 0x74($s0) +.L802402D0: +/* EF7D50 802402D0 8E020078 */ lw $v0, 0x78($s0) +/* EF7D54 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) +/* EF7D58 802402D8 0043102A */ slt $v0, $v0, $v1 +/* EF7D5C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* EF7D60 802402E0 AE000078 */ sw $zero, 0x78($s0) +.L802402E4: +/* EF7D64 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* EF7D68 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) +/* EF7D6C 802402EC 0043102A */ slt $v0, $v0, $v1 +/* EF7D70 802402F0 50400001 */ beql $v0, $zero, .L802402F8 +/* EF7D74 802402F4 AE00007C */ sw $zero, 0x7c($s0) +.L802402F8: +/* EF7D78 802402F8 8FBF0014 */ lw $ra, 0x14($sp) +/* EF7D7C 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* EF7D80 80240300 0000102D */ daddu $v0, $zero, $zero +/* EF7D84 80240304 03E00008 */ jr $ra +/* EF7D88 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EF7A80/func_8024030C_EF7D8C.s b/asm/nonmatchings/code_EF7A80/func_8024030C_EF7D8C.s new file mode 100644 index 0000000000..83d1d5f136 --- /dev/null +++ b/asm/nonmatchings/code_EF7A80/func_8024030C_EF7D8C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024030C_EF7D8C +/* EF7D8C 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EF7D90 80240310 24040001 */ addiu $a0, $zero, 1 +/* EF7D94 80240314 0000282D */ daddu $a1, $zero, $zero +/* EF7D98 80240318 00A0302D */ daddu $a2, $a1, $zero +/* EF7D9C 8024031C 00A0382D */ daddu $a3, $a1, $zero +/* EF7DA0 80240320 AFBF0018 */ sw $ra, 0x18($sp) +/* EF7DA4 80240324 AFA00010 */ sw $zero, 0x10($sp) +/* EF7DA8 80240328 0C01DEF4 */ jal func_80077BD0 +/* EF7DAC 8024032C AFA00014 */ sw $zero, 0x14($sp) +/* EF7DB0 80240330 8FBF0018 */ lw $ra, 0x18($sp) +/* EF7DB4 80240334 24020002 */ addiu $v0, $zero, 2 +/* EF7DB8 80240338 03E00008 */ jr $ra +/* EF7DBC 8024033C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EF7A80/func_80240340_EF7DC0.s b/asm/nonmatchings/code_EF7A80/func_80240340_EF7DC0.s new file mode 100644 index 0000000000..1d75a809aa --- /dev/null +++ b/asm/nonmatchings/code_EF7A80/func_80240340_EF7DC0.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240340_EF7DC0 +/* EF7DC0 80240340 8C8400C0 */ lw $a0, 0xc0($a0) +/* EF7DC4 80240344 8C83000C */ lw $v1, 0xc($a0) +/* EF7DC8 80240348 24020045 */ addiu $v0, $zero, 0x45 +/* EF7DCC 8024034C AC620030 */ sw $v0, 0x30($v1) +/* EF7DD0 80240350 8C83000C */ lw $v1, 0xc($a0) +/* EF7DD4 80240354 240200FF */ addiu $v0, $zero, 0xff +/* EF7DD8 80240358 AC620034 */ sw $v0, 0x34($v1) +/* EF7DDC 8024035C 8C83000C */ lw $v1, 0xc($a0) +/* EF7DE0 80240360 240200D9 */ addiu $v0, $zero, 0xd9 +/* EF7DE4 80240364 AC620038 */ sw $v0, 0x38($v1) +/* EF7DE8 80240368 8C83000C */ lw $v1, 0xc($a0) +/* EF7DEC 8024036C 240200B0 */ addiu $v0, $zero, 0xb0 +/* EF7DF0 80240370 AC620040 */ sw $v0, 0x40($v1) +/* EF7DF4 80240374 8C83000C */ lw $v1, 0xc($a0) +/* EF7DF8 80240378 240200FE */ addiu $v0, $zero, 0xfe +/* EF7DFC 8024037C AC620044 */ sw $v0, 0x44($v1) +/* EF7E00 80240380 8C83000C */ lw $v1, 0xc($a0) +/* EF7E04 80240384 2402007C */ addiu $v0, $zero, 0x7c +/* EF7E08 80240388 AC620048 */ sw $v0, 0x48($v1) +/* EF7E0C 8024038C 03E00008 */ jr $ra +/* EF7E10 80240390 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_EF7A80/func_80240394_EF7E14.s b/asm/nonmatchings/code_EF7A80/func_80240394_EF7E14.s new file mode 100644 index 0000000000..3f5c5aea2e --- /dev/null +++ b/asm/nonmatchings/code_EF7A80/func_80240394_EF7E14.s @@ -0,0 +1,108 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240394_EF7E14 +/* EF7E14 80240394 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EF7E18 80240398 AFB20018 */ sw $s2, 0x18($sp) +/* EF7E1C 8024039C 0080902D */ daddu $s2, $a0, $zero +/* EF7E20 802403A0 AFBF0028 */ sw $ra, 0x28($sp) +/* EF7E24 802403A4 AFB50024 */ sw $s5, 0x24($sp) +/* EF7E28 802403A8 AFB40020 */ sw $s4, 0x20($sp) +/* EF7E2C 802403AC AFB3001C */ sw $s3, 0x1c($sp) +/* EF7E30 802403B0 AFB10014 */ sw $s1, 0x14($sp) +/* EF7E34 802403B4 AFB00010 */ sw $s0, 0x10($sp) +/* EF7E38 802403B8 F7B80040 */ sdc1 $f24, 0x40($sp) +/* EF7E3C 802403BC F7B60038 */ sdc1 $f22, 0x38($sp) +/* EF7E40 802403C0 F7B40030 */ sdc1 $f20, 0x30($sp) +/* EF7E44 802403C4 8E50000C */ lw $s0, 0xc($s2) +/* EF7E48 802403C8 8E140000 */ lw $s4, ($s0) +/* EF7E4C 802403CC 26100004 */ addiu $s0, $s0, 4 +/* EF7E50 802403D0 0C0B53A3 */ jal func_802D4E8C +/* EF7E54 802403D4 0280282D */ daddu $a1, $s4, $zero +/* EF7E58 802403D8 0040982D */ daddu $s3, $v0, $zero +/* EF7E5C 802403DC 8E150000 */ lw $s5, ($s0) +/* EF7E60 802403E0 26100004 */ addiu $s0, $s0, 4 +/* EF7E64 802403E4 8E050000 */ lw $a1, ($s0) +/* EF7E68 802403E8 26100004 */ addiu $s0, $s0, 4 +/* EF7E6C 802403EC 0C0B55FF */ jal func_802D57FC +/* EF7E70 802403F0 0240202D */ daddu $a0, $s2, $zero +/* EF7E74 802403F4 8E050000 */ lw $a1, ($s0) +/* EF7E78 802403F8 26100004 */ addiu $s0, $s0, 4 +/* EF7E7C 802403FC 0240202D */ daddu $a0, $s2, $zero +/* EF7E80 80240400 0C0B55FF */ jal func_802D57FC +/* EF7E84 80240404 46000606 */ mov.s $f24, $f0 +/* EF7E88 80240408 8E050000 */ lw $a1, ($s0) +/* EF7E8C 8024040C 26100004 */ addiu $s0, $s0, 4 +/* EF7E90 80240410 0240202D */ daddu $a0, $s2, $zero +/* EF7E94 80240414 0C0B53A3 */ jal func_802D4E8C +/* EF7E98 80240418 46000506 */ mov.s $f20, $f0 +/* EF7E9C 8024041C 8E050000 */ lw $a1, ($s0) +/* EF7EA0 80240420 26100004 */ addiu $s0, $s0, 4 +/* EF7EA4 80240424 0240202D */ daddu $a0, $s2, $zero +/* EF7EA8 80240428 0C0B53A3 */ jal func_802D4E8C +/* EF7EAC 8024042C 0040882D */ daddu $s1, $v0, $zero +/* EF7EB0 80240430 0240202D */ daddu $a0, $s2, $zero +/* EF7EB4 80240434 8E050000 */ lw $a1, ($s0) +/* EF7EB8 80240438 0C0B55FF */ jal func_802D57FC +/* EF7EBC 8024043C 0040802D */ daddu $s0, $v0, $zero +/* EF7EC0 80240440 3C014334 */ lui $at, 0x4334 +/* EF7EC4 80240444 44811000 */ mtc1 $at, $f2 +/* EF7EC8 80240448 3C014049 */ lui $at, 0x4049 +/* EF7ECC 8024044C 34210FD8 */ ori $at, $at, 0xfd8 +/* EF7ED0 80240450 44812000 */ mtc1 $at, $f4 +/* EF7ED4 80240454 46020003 */ div.s $f0, $f0, $f2 +/* EF7ED8 80240458 46040582 */ mul.s $f22, $f0, $f4 +/* EF7EDC 8024045C 00000000 */ nop +/* EF7EE0 80240460 4618A501 */ sub.s $f20, $f20, $f24 +/* EF7EE4 80240464 3C013F00 */ lui $at, 0x3f00 +/* EF7EE8 80240468 44810000 */ mtc1 $at, $f0 +/* EF7EEC 8024046C 00000000 */ nop +/* EF7EF0 80240470 4600A502 */ mul.s $f20, $f20, $f0 +/* EF7EF4 80240474 00000000 */ nop +/* EF7EF8 80240478 12000007 */ beqz $s0, .L80240498 +/* EF7EFC 8024047C 0233102A */ slt $v0, $s1, $s3 +/* EF7F00 80240480 10400005 */ beqz $v0, .L80240498 +/* EF7F04 80240484 0240202D */ daddu $a0, $s2, $zero +/* EF7F08 80240488 0220982D */ daddu $s3, $s1, $zero +/* EF7F0C 8024048C 0280282D */ daddu $a1, $s4, $zero +/* EF7F10 80240490 0C0B551A */ jal func_802D5468 +/* EF7F14 80240494 0220302D */ daddu $a2, $s1, $zero +.L80240498: +/* EF7F18 80240498 3C014049 */ lui $at, 0x4049 +/* EF7F1C 8024049C 34210FD8 */ ori $at, $at, 0xfd8 +/* EF7F20 802404A0 44810000 */ mtc1 $at, $f0 +/* EF7F24 802404A4 44936000 */ mtc1 $s3, $f12 +/* EF7F28 802404A8 00000000 */ nop +/* EF7F2C 802404AC 46806320 */ cvt.s.w $f12, $f12 +/* EF7F30 802404B0 46006302 */ mul.s $f12, $f12, $f0 +/* EF7F34 802404B4 00000000 */ nop +/* EF7F38 802404B8 44910000 */ mtc1 $s1, $f0 +/* EF7F3C 802404BC 00000000 */ nop +/* EF7F40 802404C0 46800020 */ cvt.s.w $f0, $f0 +/* EF7F44 802404C4 46006303 */ div.s $f12, $f12, $f0 +/* EF7F48 802404C8 0C00AD30 */ jal func_8002B4C0 +/* EF7F4C 802404CC 46166300 */ add.s $f12, $f12, $f22 +/* EF7F50 802404D0 4600A002 */ mul.s $f0, $f20, $f0 +/* EF7F54 802404D4 00000000 */ nop +/* EF7F58 802404D8 4614C080 */ add.s $f2, $f24, $f20 +/* EF7F5C 802404DC 46001081 */ sub.s $f2, $f2, $f0 +/* EF7F60 802404E0 0240202D */ daddu $a0, $s2, $zero +/* EF7F64 802404E4 44061000 */ mfc1 $a2, $f2 +/* EF7F68 802404E8 0C0B5684 */ jal func_802D5A10 +/* EF7F6C 802404EC 02A0282D */ daddu $a1, $s5, $zero +/* EF7F70 802404F0 8FBF0028 */ lw $ra, 0x28($sp) +/* EF7F74 802404F4 8FB50024 */ lw $s5, 0x24($sp) +/* EF7F78 802404F8 8FB40020 */ lw $s4, 0x20($sp) +/* EF7F7C 802404FC 8FB3001C */ lw $s3, 0x1c($sp) +/* EF7F80 80240500 8FB20018 */ lw $s2, 0x18($sp) +/* EF7F84 80240504 8FB10014 */ lw $s1, 0x14($sp) +/* EF7F88 80240508 8FB00010 */ lw $s0, 0x10($sp) +/* EF7F8C 8024050C D7B80040 */ ldc1 $f24, 0x40($sp) +/* EF7F90 80240510 D7B60038 */ ldc1 $f22, 0x38($sp) +/* EF7F94 80240514 D7B40030 */ ldc1 $f20, 0x30($sp) +/* EF7F98 80240518 24020002 */ addiu $v0, $zero, 2 +/* EF7F9C 8024051C 03E00008 */ jr $ra +/* EF7FA0 80240520 27BD0048 */ addiu $sp, $sp, 0x48 +/* EF7FA4 80240524 00000000 */ nop +/* EF7FA8 80240528 00000000 */ nop +/* EF7FAC 8024052C 00000000 */ nop diff --git a/asm/nonmatchings/code_EF7FB0/func_80240530_EF7FB0.s b/asm/nonmatchings/code_EF7FB0/func_80240530_EF7FB0.s new file mode 100644 index 0000000000..5501498f37 --- /dev/null +++ b/asm/nonmatchings/code_EF7FB0/func_80240530_EF7FB0.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240530_EF7FB0 +/* EF7FB0 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EF7FB4 80240534 AFB00010 */ sw $s0, 0x10($sp) +/* EF7FB8 80240538 0080802D */ daddu $s0, $a0, $zero +/* EF7FBC 8024053C AFBF0014 */ sw $ra, 0x14($sp) +/* EF7FC0 80240540 C60C0084 */ lwc1 $f12, 0x84($s0) +/* EF7FC4 80240544 46806320 */ cvt.s.w $f12, $f12 +/* EF7FC8 80240548 C6020090 */ lwc1 $f2, 0x90($s0) +/* EF7FCC 8024054C 468010A0 */ cvt.s.w $f2, $f2 +/* EF7FD0 80240550 44061000 */ mfc1 $a2, $f2 +/* EF7FD4 80240554 C6020098 */ lwc1 $f2, 0x98($s0) +/* EF7FD8 80240558 468010A0 */ cvt.s.w $f2, $f2 +/* EF7FDC 8024055C 44071000 */ mfc1 $a3, $f2 +/* EF7FE0 80240560 C60E008C */ lwc1 $f14, 0x8c($s0) +/* EF7FE4 80240564 0C00ABDC */ jal fio_validate_header_checksums +/* EF7FE8 80240568 468073A0 */ cvt.s.w $f14, $f14 +/* EF7FEC 8024056C 4600008D */ trunc.w.s $f2, $f0 +/* EF7FF0 80240570 E60200AC */ swc1 $f2, 0xac($s0) +/* EF7FF4 80240574 8FBF0014 */ lw $ra, 0x14($sp) +/* EF7FF8 80240578 8FB00010 */ lw $s0, 0x10($sp) +/* EF7FFC 8024057C 24020002 */ addiu $v0, $zero, 2 +/* EF8000 80240580 03E00008 */ jr $ra +/* EF8004 80240584 27BD0018 */ addiu $sp, $sp, 0x18 +/* EF8008 80240588 00000000 */ nop +/* EF800C 8024058C 00000000 */ nop diff --git a/asm/nonmatchings/code_EF8010/func_80240590_EF8010.s b/asm/nonmatchings/code_EF8010/func_80240590_EF8010.s new file mode 100644 index 0000000000..0f6490f665 --- /dev/null +++ b/asm/nonmatchings/code_EF8010/func_80240590_EF8010.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240590_EF8010 +/* EF8010 80240590 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* EF8014 80240594 F7B40018 */ sdc1 $f20, 0x18($sp) +/* EF8018 80240598 4485A000 */ mtc1 $a1, $f20 +/* EF801C 8024059C F7B60020 */ sdc1 $f22, 0x20($sp) +/* EF8020 802405A0 4486B000 */ mtc1 $a2, $f22 +/* EF8024 802405A4 AFB00010 */ sw $s0, 0x10($sp) +/* EF8028 802405A8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* EF802C 802405AC 4487C000 */ mtc1 $a3, $f24 +/* EF8030 802405B0 AFBF0014 */ sw $ra, 0x14($sp) +/* EF8034 802405B4 0C01B198 */ jal osGetCause +/* EF8038 802405B8 0080802D */ daddu $s0, $a0, $zero +/* EF803C 802405BC 4616A582 */ mul.s $f22, $f20, $f22 +/* EF8040 802405C0 00000000 */ nop +/* EF8044 802405C4 4618A502 */ mul.s $f20, $f20, $f24 +/* EF8048 802405C8 00000000 */ nop +/* EF804C 802405CC 3C013F80 */ lui $at, 0x3f80 +/* EF8050 802405D0 44810000 */ mtc1 $at, $f0 +/* EF8054 802405D4 00000000 */ nop +/* EF8058 802405D8 E6000014 */ swc1 $f0, 0x14($s0) +/* EF805C 802405DC E6160010 */ swc1 $f22, 0x10($s0) +/* EF8060 802405E0 E6140018 */ swc1 $f20, 0x18($s0) +/* EF8064 802405E4 8FBF0014 */ lw $ra, 0x14($sp) +/* EF8068 802405E8 8FB00010 */ lw $s0, 0x10($sp) +/* EF806C 802405EC D7B80028 */ ldc1 $f24, 0x28($sp) +/* EF8070 802405F0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* EF8074 802405F4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* EF8078 802405F8 03E00008 */ jr $ra +/* EF807C 802405FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_EF8010/func_80240600_EF8080.s b/asm/nonmatchings/code_EF8010/func_80240600_EF8080.s new file mode 100644 index 0000000000..6b42edb237 --- /dev/null +++ b/asm/nonmatchings/code_EF8010/func_80240600_EF8080.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240600_EF8080 +/* EF8080 80240600 27BDFF78 */ addiu $sp, $sp, -0x88 +/* EF8084 80240604 AFB10054 */ sw $s1, 0x54($sp) +/* EF8088 80240608 0080882D */ daddu $s1, $a0, $zero +/* EF808C 8024060C AFBF005C */ sw $ra, 0x5c($sp) +/* EF8090 80240610 AFB20058 */ sw $s2, 0x58($sp) +/* EF8094 80240614 AFB00050 */ sw $s0, 0x50($sp) +/* EF8098 80240618 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* EF809C 8024061C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* EF80A0 80240620 F7B80070 */ sdc1 $f24, 0x70($sp) +/* EF80A4 80240624 F7B60068 */ sdc1 $f22, 0x68($sp) +/* EF80A8 80240628 F7B40060 */ sdc1 $f20, 0x60($sp) +/* EF80AC 8024062C 8E30000C */ lw $s0, 0xc($s1) +/* EF80B0 80240630 8E050000 */ lw $a1, ($s0) +/* EF80B4 80240634 0C0B53A3 */ jal func_802D4E8C +/* EF80B8 80240638 26100004 */ addiu $s0, $s0, 4 +/* EF80BC 8024063C 0C04949C */ jal func_80125270 +/* EF80C0 80240640 0040202D */ daddu $a0, $v0, $zero +/* EF80C4 80240644 8E050000 */ lw $a1, ($s0) +/* EF80C8 80240648 26100004 */ addiu $s0, $s0, 4 +/* EF80CC 8024064C 0220202D */ daddu $a0, $s1, $zero +/* EF80D0 80240650 0C0B55FF */ jal func_802D57FC +/* EF80D4 80240654 0040902D */ daddu $s2, $v0, $zero +/* EF80D8 80240658 8E050000 */ lw $a1, ($s0) +/* EF80DC 8024065C 26100004 */ addiu $s0, $s0, 4 +/* EF80E0 80240660 0220202D */ daddu $a0, $s1, $zero +/* EF80E4 80240664 0C0B55FF */ jal func_802D57FC +/* EF80E8 80240668 46000706 */ mov.s $f28, $f0 +/* EF80EC 8024066C 8E050000 */ lw $a1, ($s0) +/* EF80F0 80240670 26100004 */ addiu $s0, $s0, 4 +/* EF80F4 80240674 0220202D */ daddu $a0, $s1, $zero +/* EF80F8 80240678 0C0B55FF */ jal func_802D57FC +/* EF80FC 8024067C 46000686 */ mov.s $f26, $f0 +/* EF8100 80240680 0220202D */ daddu $a0, $s1, $zero +/* EF8104 80240684 8E050000 */ lw $a1, ($s0) +/* EF8108 80240688 0C0B55FF */ jal func_802D57FC +/* EF810C 8024068C 46000586 */ mov.s $f22, $f0 +/* EF8110 80240690 0240202D */ daddu $a0, $s2, $zero +/* EF8114 80240694 0C0493D1 */ jal func_80124F44 +/* EF8118 80240698 46000606 */ mov.s $f24, $f0 +/* EF811C 8024069C 0040882D */ daddu $s1, $v0, $zero +/* EF8120 802406A0 96220000 */ lhu $v0, ($s1) +/* EF8124 802406A4 30420400 */ andi $v0, $v0, 0x400 +/* EF8128 802406A8 1440001E */ bnez $v0, .L80240724 +/* EF812C 802406AC 26300058 */ addiu $s0, $s1, 0x58 +/* EF8130 802406B0 4480A000 */ mtc1 $zero, $f20 +/* EF8134 802406B4 4406B000 */ mfc1 $a2, $f22 +/* EF8138 802406B8 4405A000 */ mfc1 $a1, $f20 +/* EF813C 802406BC 4407A000 */ mfc1 $a3, $f20 +/* EF8140 802406C0 0C01B2B0 */ jal func_8006CAC0 +/* EF8144 802406C4 0200202D */ daddu $a0, $s0, $zero +/* EF8148 802406C8 4405E000 */ mfc1 $a1, $f28 +/* EF814C 802406CC 4406D000 */ mfc1 $a2, $f26 +/* EF8150 802406D0 4407C000 */ mfc1 $a3, $f24 +/* EF8154 802406D4 0C090164 */ jal func_80240590_EF8010 +/* EF8158 802406D8 27A40010 */ addiu $a0, $sp, 0x10 +/* EF815C 802406DC 27A40010 */ addiu $a0, $sp, 0x10 +/* EF8160 802406E0 0200282D */ daddu $a1, $s0, $zero +/* EF8164 802406E4 0C01B1F0 */ jal osSiRawReadIo +/* EF8168 802406E8 0200302D */ daddu $a2, $s0, $zero +/* EF816C 802406EC 27A40010 */ addiu $a0, $sp, 0x10 +/* EF8170 802406F0 4600B587 */ neg.s $f22, $f22 +/* EF8174 802406F4 4405A000 */ mfc1 $a1, $f20 +/* EF8178 802406F8 4406B000 */ mfc1 $a2, $f22 +/* EF817C 802406FC 0C01B2B0 */ jal func_8006CAC0 +/* EF8180 80240700 00A0382D */ daddu $a3, $a1, $zero +/* EF8184 80240704 27A40010 */ addiu $a0, $sp, 0x10 +/* EF8188 80240708 0200282D */ daddu $a1, $s0, $zero +/* EF818C 8024070C 0C01B1F0 */ jal osSiRawReadIo +/* EF8190 80240710 00A0302D */ daddu $a2, $a1, $zero +/* EF8194 80240714 96220000 */ lhu $v0, ($s1) +/* EF8198 80240718 34421400 */ ori $v0, $v0, 0x1400 +/* EF819C 8024071C 080901E7 */ j .L8024079C +/* EF81A0 80240720 A6220000 */ sh $v0, ($s1) +.L80240724: +/* EF81A4 80240724 4480A000 */ mtc1 $zero, $f20 +/* EF81A8 80240728 4406B000 */ mfc1 $a2, $f22 +/* EF81AC 8024072C 4405A000 */ mfc1 $a1, $f20 +/* EF81B0 80240730 4407A000 */ mfc1 $a3, $f20 +/* EF81B4 80240734 0C01B2B0 */ jal func_8006CAC0 +/* EF81B8 80240738 27A40010 */ addiu $a0, $sp, 0x10 +/* EF81BC 8024073C 27A40010 */ addiu $a0, $sp, 0x10 +/* EF81C0 80240740 26300058 */ addiu $s0, $s1, 0x58 +/* EF81C4 80240744 0200282D */ daddu $a1, $s0, $zero +/* EF81C8 80240748 0C01B1F0 */ jal osSiRawReadIo +/* EF81CC 8024074C 0200302D */ daddu $a2, $s0, $zero +/* EF81D0 80240750 4405E000 */ mfc1 $a1, $f28 +/* EF81D4 80240754 4406D000 */ mfc1 $a2, $f26 +/* EF81D8 80240758 4407C000 */ mfc1 $a3, $f24 +/* EF81DC 8024075C 0C090164 */ jal func_80240590_EF8010 +/* EF81E0 80240760 27A40010 */ addiu $a0, $sp, 0x10 +/* EF81E4 80240764 27A40010 */ addiu $a0, $sp, 0x10 +/* EF81E8 80240768 0200282D */ daddu $a1, $s0, $zero +/* EF81EC 8024076C 0C01B1F0 */ jal osSiRawReadIo +/* EF81F0 80240770 0200302D */ daddu $a2, $s0, $zero +/* EF81F4 80240774 27A40010 */ addiu $a0, $sp, 0x10 +/* EF81F8 80240778 4600B587 */ neg.s $f22, $f22 +/* EF81FC 8024077C 4405A000 */ mfc1 $a1, $f20 +/* EF8200 80240780 4406B000 */ mfc1 $a2, $f22 +/* EF8204 80240784 0C01B2B0 */ jal func_8006CAC0 +/* EF8208 80240788 00A0382D */ daddu $a3, $a1, $zero +/* EF820C 8024078C 27A40010 */ addiu $a0, $sp, 0x10 +/* EF8210 80240790 0200282D */ daddu $a1, $s0, $zero +/* EF8214 80240794 0C01B1F0 */ jal osSiRawReadIo +/* EF8218 80240798 00A0302D */ daddu $a2, $a1, $zero +.L8024079C: +/* EF821C 8024079C 8FBF005C */ lw $ra, 0x5c($sp) +/* EF8220 802407A0 8FB20058 */ lw $s2, 0x58($sp) +/* EF8224 802407A4 8FB10054 */ lw $s1, 0x54($sp) +/* EF8228 802407A8 8FB00050 */ lw $s0, 0x50($sp) +/* EF822C 802407AC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* EF8230 802407B0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* EF8234 802407B4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* EF8238 802407B8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* EF823C 802407BC D7B40060 */ ldc1 $f20, 0x60($sp) +/* EF8240 802407C0 24020002 */ addiu $v0, $zero, 2 +/* EF8244 802407C4 03E00008 */ jr $ra +/* EF8248 802407C8 27BD0088 */ addiu $sp, $sp, 0x88 +/* EF824C 802407CC 00000000 */ nop diff --git a/asm/nonmatchings/code_EFEB00/func_80240000_EFEB00.s b/asm/nonmatchings/code_EFEB00/func_80240000_EFEB00.s new file mode 100644 index 0000000000..d208483c6b --- /dev/null +++ b/asm/nonmatchings/code_EFEB00/func_80240000_EFEB00.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_EFEB00 +/* EFEB00 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EFEB04 80240004 AFB00010 */ sw $s0, 0x10($sp) +/* EFEB08 80240008 0080802D */ daddu $s0, $a0, $zero +/* EFEB0C 8024000C AFBF0014 */ sw $ra, 0x14($sp) +/* EFEB10 80240010 8E0300A8 */ lw $v1, 0xa8($s0) +/* EFEB14 80240014 8E020088 */ lw $v0, 0x88($s0) +/* EFEB18 80240018 00621821 */ addu $v1, $v1, $v0 +/* EFEB1C 8024001C 04610004 */ bgez $v1, .L80240030 +/* EFEB20 80240020 AE0300A8 */ sw $v1, 0xa8($s0) +/* EFEB24 80240024 3C020002 */ lui $v0, 2 +/* EFEB28 80240028 08090010 */ j .L80240040 +/* EFEB2C 8024002C 00621021 */ addu $v0, $v1, $v0 +.L80240030: +/* EFEB30 80240030 3C040002 */ lui $a0, 2 +/* EFEB34 80240034 0083102A */ slt $v0, $a0, $v1 +/* EFEB38 80240038 10400002 */ beqz $v0, .L80240044 +/* EFEB3C 8024003C 00641023 */ subu $v0, $v1, $a0 +.L80240040: +/* EFEB40 80240040 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240044: +/* EFEB44 80240044 8E0300AC */ lw $v1, 0xac($s0) +/* EFEB48 80240048 8E02008C */ lw $v0, 0x8c($s0) +/* EFEB4C 8024004C 00621821 */ addu $v1, $v1, $v0 +/* EFEB50 80240050 04610004 */ bgez $v1, .L80240064 +/* EFEB54 80240054 AE0300AC */ sw $v1, 0xac($s0) +/* EFEB58 80240058 3C020002 */ lui $v0, 2 +/* EFEB5C 8024005C 0809001D */ j .L80240074 +/* EFEB60 80240060 00621021 */ addu $v0, $v1, $v0 +.L80240064: +/* EFEB64 80240064 3C040002 */ lui $a0, 2 +/* EFEB68 80240068 0083102A */ slt $v0, $a0, $v1 +/* EFEB6C 8024006C 10400002 */ beqz $v0, .L80240078 +/* EFEB70 80240070 00641023 */ subu $v0, $v1, $a0 +.L80240074: +/* EFEB74 80240074 AE0200AC */ sw $v0, 0xac($s0) +.L80240078: +/* EFEB78 80240078 8E0300B0 */ lw $v1, 0xb0($s0) +/* EFEB7C 8024007C 8E020090 */ lw $v0, 0x90($s0) +/* EFEB80 80240080 00621821 */ addu $v1, $v1, $v0 +/* EFEB84 80240084 04610004 */ bgez $v1, .L80240098 +/* EFEB88 80240088 AE0300B0 */ sw $v1, 0xb0($s0) +/* EFEB8C 8024008C 3C020002 */ lui $v0, 2 +/* EFEB90 80240090 0809002A */ j .L802400A8 +/* EFEB94 80240094 00621021 */ addu $v0, $v1, $v0 +.L80240098: +/* EFEB98 80240098 3C040002 */ lui $a0, 2 +/* EFEB9C 8024009C 0083102A */ slt $v0, $a0, $v1 +/* EFEBA0 802400A0 10400002 */ beqz $v0, .L802400AC +/* EFEBA4 802400A4 00641023 */ subu $v0, $v1, $a0 +.L802400A8: +/* EFEBA8 802400A8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802400AC: +/* EFEBAC 802400AC 8E0300B4 */ lw $v1, 0xb4($s0) +/* EFEBB0 802400B0 8E020094 */ lw $v0, 0x94($s0) +/* EFEBB4 802400B4 00621821 */ addu $v1, $v1, $v0 +/* EFEBB8 802400B8 04610004 */ bgez $v1, .L802400CC +/* EFEBBC 802400BC AE0300B4 */ sw $v1, 0xb4($s0) +/* EFEBC0 802400C0 3C020002 */ lui $v0, 2 +/* EFEBC4 802400C4 08090037 */ j .L802400DC +/* EFEBC8 802400C8 00621021 */ addu $v0, $v1, $v0 +.L802400CC: +/* EFEBCC 802400CC 3C040002 */ lui $a0, 2 +/* EFEBD0 802400D0 0083102A */ slt $v0, $a0, $v1 +/* EFEBD4 802400D4 10400002 */ beqz $v0, .L802400E0 +/* EFEBD8 802400D8 00641023 */ subu $v0, $v1, $a0 +.L802400DC: +/* EFEBDC 802400DC AE0200B4 */ sw $v0, 0xb4($s0) +.L802400E0: +/* EFEBE0 802400E0 8E040084 */ lw $a0, 0x84($s0) +/* EFEBE4 802400E4 0C049819 */ jal func_80126064 +/* EFEBE8 802400E8 8E0500A8 */ lw $a1, 0xa8($s0) +/* EFEBEC 802400EC 8E040084 */ lw $a0, 0x84($s0) +/* EFEBF0 802400F0 0C04981F */ jal func_8012607C +/* EFEBF4 802400F4 8E0500AC */ lw $a1, 0xac($s0) +/* EFEBF8 802400F8 8E040084 */ lw $a0, 0x84($s0) +/* EFEBFC 802400FC 0C049825 */ jal func_80126094 +/* EFEC00 80240100 8E0500B0 */ lw $a1, 0xb0($s0) +/* EFEC04 80240104 8E040084 */ lw $a0, 0x84($s0) +/* EFEC08 80240108 0C04982B */ jal func_801260AC +/* EFEC0C 8024010C 8E0500B4 */ lw $a1, 0xb4($s0) +/* EFEC10 80240110 8FBF0014 */ lw $ra, 0x14($sp) +/* EFEC14 80240114 8FB00010 */ lw $s0, 0x10($sp) +/* EFEC18 80240118 0000102D */ daddu $v0, $zero, $zero +/* EFEC1C 8024011C 03E00008 */ jr $ra +/* EFEC20 80240120 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EFEB00/func_80240124_EFEC24.s b/asm/nonmatchings/code_EFEB00/func_80240124_EFEC24.s new file mode 100644 index 0000000000..6de3abae8b --- /dev/null +++ b/asm/nonmatchings/code_EFEB00/func_80240124_EFEC24.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240124_EFEC24 +/* EFEC24 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EFEC28 80240128 AFB00010 */ sw $s0, 0x10($sp) +/* EFEC2C 8024012C 0080802D */ daddu $s0, $a0, $zero +/* EFEC30 80240130 10A00005 */ beqz $a1, .L80240148 +/* EFEC34 80240134 AFBF0014 */ sw $ra, 0x14($sp) +/* EFEC38 80240138 AE000070 */ sw $zero, 0x70($s0) +/* EFEC3C 8024013C AE000074 */ sw $zero, 0x74($s0) +/* EFEC40 80240140 AE000078 */ sw $zero, 0x78($s0) +/* EFEC44 80240144 AE00007C */ sw $zero, 0x7c($s0) +.L80240148: +/* EFEC48 80240148 8E020070 */ lw $v0, 0x70($s0) +/* EFEC4C 8024014C 1440000E */ bnez $v0, .L80240188 +/* EFEC50 80240150 00000000 */ nop +/* EFEC54 80240154 8E0300A8 */ lw $v1, 0xa8($s0) +/* EFEC58 80240158 8E020088 */ lw $v0, 0x88($s0) +/* EFEC5C 8024015C 00621821 */ addu $v1, $v1, $v0 +/* EFEC60 80240160 04610004 */ bgez $v1, .L80240174 +/* EFEC64 80240164 AE0300A8 */ sw $v1, 0xa8($s0) +/* EFEC68 80240168 3C020002 */ lui $v0, 2 +/* EFEC6C 8024016C 08090061 */ j .L80240184 +/* EFEC70 80240170 00621021 */ addu $v0, $v1, $v0 +.L80240174: +/* EFEC74 80240174 3C040002 */ lui $a0, 2 +/* EFEC78 80240178 0083102A */ slt $v0, $a0, $v1 +/* EFEC7C 8024017C 10400002 */ beqz $v0, .L80240188 +/* EFEC80 80240180 00641023 */ subu $v0, $v1, $a0 +.L80240184: +/* EFEC84 80240184 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240188: +/* EFEC88 80240188 8E020074 */ lw $v0, 0x74($s0) +/* EFEC8C 8024018C 1440000E */ bnez $v0, .L802401C8 +/* EFEC90 80240190 00000000 */ nop +/* EFEC94 80240194 8E0300AC */ lw $v1, 0xac($s0) +/* EFEC98 80240198 8E02008C */ lw $v0, 0x8c($s0) +/* EFEC9C 8024019C 00621821 */ addu $v1, $v1, $v0 +/* EFECA0 802401A0 04610004 */ bgez $v1, .L802401B4 +/* EFECA4 802401A4 AE0300AC */ sw $v1, 0xac($s0) +/* EFECA8 802401A8 3C020002 */ lui $v0, 2 +/* EFECAC 802401AC 08090071 */ j .L802401C4 +/* EFECB0 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* EFECB4 802401B4 3C040002 */ lui $a0, 2 +/* EFECB8 802401B8 0083102A */ slt $v0, $a0, $v1 +/* EFECBC 802401BC 10400002 */ beqz $v0, .L802401C8 +/* EFECC0 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* EFECC4 802401C4 AE0200AC */ sw $v0, 0xac($s0) +.L802401C8: +/* EFECC8 802401C8 8E020078 */ lw $v0, 0x78($s0) +/* EFECCC 802401CC 1440000E */ bnez $v0, .L80240208 +/* EFECD0 802401D0 00000000 */ nop +/* EFECD4 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) +/* EFECD8 802401D8 8E020090 */ lw $v0, 0x90($s0) +/* EFECDC 802401DC 00621821 */ addu $v1, $v1, $v0 +/* EFECE0 802401E0 04610004 */ bgez $v1, .L802401F4 +/* EFECE4 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) +/* EFECE8 802401E8 3C020002 */ lui $v0, 2 +/* EFECEC 802401EC 08090081 */ j .L80240204 +/* EFECF0 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* EFECF4 802401F4 3C040002 */ lui $a0, 2 +/* EFECF8 802401F8 0083102A */ slt $v0, $a0, $v1 +/* EFECFC 802401FC 10400002 */ beqz $v0, .L80240208 +/* EFED00 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* EFED04 80240204 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240208: +/* EFED08 80240208 8E02007C */ lw $v0, 0x7c($s0) +/* EFED0C 8024020C 1440000E */ bnez $v0, .L80240248 +/* EFED10 80240210 00000000 */ nop +/* EFED14 80240214 8E0300B4 */ lw $v1, 0xb4($s0) +/* EFED18 80240218 8E020094 */ lw $v0, 0x94($s0) +/* EFED1C 8024021C 00621821 */ addu $v1, $v1, $v0 +/* EFED20 80240220 04610004 */ bgez $v1, .L80240234 +/* EFED24 80240224 AE0300B4 */ sw $v1, 0xb4($s0) +/* EFED28 80240228 3C020002 */ lui $v0, 2 +/* EFED2C 8024022C 08090091 */ j .L80240244 +/* EFED30 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* EFED34 80240234 3C040002 */ lui $a0, 2 +/* EFED38 80240238 0083102A */ slt $v0, $a0, $v1 +/* EFED3C 8024023C 10400002 */ beqz $v0, .L80240248 +/* EFED40 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* EFED44 80240244 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240248: +/* EFED48 80240248 8E040084 */ lw $a0, 0x84($s0) +/* EFED4C 8024024C 0C049819 */ jal func_80126064 +/* EFED50 80240250 8E0500A8 */ lw $a1, 0xa8($s0) +/* EFED54 80240254 8E040084 */ lw $a0, 0x84($s0) +/* EFED58 80240258 0C04981F */ jal func_8012607C +/* EFED5C 8024025C 8E0500AC */ lw $a1, 0xac($s0) +/* EFED60 80240260 8E040084 */ lw $a0, 0x84($s0) +/* EFED64 80240264 0C049825 */ jal func_80126094 +/* EFED68 80240268 8E0500B0 */ lw $a1, 0xb0($s0) +/* EFED6C 8024026C 8E040084 */ lw $a0, 0x84($s0) +/* EFED70 80240270 0C04982B */ jal func_801260AC +/* EFED74 80240274 8E0500B4 */ lw $a1, 0xb4($s0) +/* EFED78 80240278 8E020070 */ lw $v0, 0x70($s0) +/* EFED7C 8024027C 8E030078 */ lw $v1, 0x78($s0) +/* EFED80 80240280 8E040098 */ lw $a0, 0x98($s0) +/* EFED84 80240284 24420001 */ addiu $v0, $v0, 1 +/* EFED88 80240288 AE020070 */ sw $v0, 0x70($s0) +/* EFED8C 8024028C 8E020074 */ lw $v0, 0x74($s0) +/* EFED90 80240290 24630001 */ addiu $v1, $v1, 1 +/* EFED94 80240294 AE030078 */ sw $v1, 0x78($s0) +/* EFED98 80240298 8E030070 */ lw $v1, 0x70($s0) +/* EFED9C 8024029C 24420001 */ addiu $v0, $v0, 1 +/* EFEDA0 802402A0 AE020074 */ sw $v0, 0x74($s0) +/* EFEDA4 802402A4 8E02007C */ lw $v0, 0x7c($s0) +/* EFEDA8 802402A8 0064182A */ slt $v1, $v1, $a0 +/* EFEDAC 802402AC 24420001 */ addiu $v0, $v0, 1 +/* EFEDB0 802402B0 14600002 */ bnez $v1, .L802402BC +/* EFEDB4 802402B4 AE02007C */ sw $v0, 0x7c($s0) +/* EFEDB8 802402B8 AE000070 */ sw $zero, 0x70($s0) +.L802402BC: +/* EFEDBC 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* EFEDC0 802402C0 8E03009C */ lw $v1, 0x9c($s0) +/* EFEDC4 802402C4 0043102A */ slt $v0, $v0, $v1 +/* EFEDC8 802402C8 50400001 */ beql $v0, $zero, .L802402D0 +/* EFEDCC 802402CC AE000074 */ sw $zero, 0x74($s0) +.L802402D0: +/* EFEDD0 802402D0 8E020078 */ lw $v0, 0x78($s0) +/* EFEDD4 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) +/* EFEDD8 802402D8 0043102A */ slt $v0, $v0, $v1 +/* EFEDDC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* EFEDE0 802402E0 AE000078 */ sw $zero, 0x78($s0) +.L802402E4: +/* EFEDE4 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* EFEDE8 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) +/* EFEDEC 802402EC 0043102A */ slt $v0, $v0, $v1 +/* EFEDF0 802402F0 50400001 */ beql $v0, $zero, .L802402F8 +/* EFEDF4 802402F4 AE00007C */ sw $zero, 0x7c($s0) +.L802402F8: +/* EFEDF8 802402F8 8FBF0014 */ lw $ra, 0x14($sp) +/* EFEDFC 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* EFEE00 80240300 0000102D */ daddu $v0, $zero, $zero +/* EFEE04 80240304 03E00008 */ jr $ra +/* EFEE08 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EFEB00/func_8024030C_EFEE0C.s b/asm/nonmatchings/code_EFEB00/func_8024030C_EFEE0C.s new file mode 100644 index 0000000000..2a44c1446c --- /dev/null +++ b/asm/nonmatchings/code_EFEB00/func_8024030C_EFEE0C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024030C_EFEE0C +/* EFEE0C 8024030C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EFEE10 80240310 24040001 */ addiu $a0, $zero, 1 +/* EFEE14 80240314 0000282D */ daddu $a1, $zero, $zero +/* EFEE18 80240318 00A0302D */ daddu $a2, $a1, $zero +/* EFEE1C 8024031C 00A0382D */ daddu $a3, $a1, $zero +/* EFEE20 80240320 AFBF0018 */ sw $ra, 0x18($sp) +/* EFEE24 80240324 AFA00010 */ sw $zero, 0x10($sp) +/* EFEE28 80240328 0C01DEF4 */ jal func_80077BD0 +/* EFEE2C 8024032C AFA00014 */ sw $zero, 0x14($sp) +/* EFEE30 80240330 8FBF0018 */ lw $ra, 0x18($sp) +/* EFEE34 80240334 24020002 */ addiu $v0, $zero, 2 +/* EFEE38 80240338 03E00008 */ jr $ra +/* EFEE3C 8024033C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EFEB00/func_80240340_EFEE40.s b/asm/nonmatchings/code_EFEB00/func_80240340_EFEE40.s new file mode 100644 index 0000000000..ce24a54627 --- /dev/null +++ b/asm/nonmatchings/code_EFEB00/func_80240340_EFEE40.s @@ -0,0 +1,105 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240340_EFEE40 +/* EFEE40 80240340 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EFEE44 80240344 AFB20018 */ sw $s2, 0x18($sp) +/* EFEE48 80240348 0080902D */ daddu $s2, $a0, $zero +/* EFEE4C 8024034C AFBF0028 */ sw $ra, 0x28($sp) +/* EFEE50 80240350 AFB50024 */ sw $s5, 0x24($sp) +/* EFEE54 80240354 AFB40020 */ sw $s4, 0x20($sp) +/* EFEE58 80240358 AFB3001C */ sw $s3, 0x1c($sp) +/* EFEE5C 8024035C AFB10014 */ sw $s1, 0x14($sp) +/* EFEE60 80240360 AFB00010 */ sw $s0, 0x10($sp) +/* EFEE64 80240364 F7B80040 */ sdc1 $f24, 0x40($sp) +/* EFEE68 80240368 F7B60038 */ sdc1 $f22, 0x38($sp) +/* EFEE6C 8024036C F7B40030 */ sdc1 $f20, 0x30($sp) +/* EFEE70 80240370 8E50000C */ lw $s0, 0xc($s2) +/* EFEE74 80240374 8E140000 */ lw $s4, ($s0) +/* EFEE78 80240378 26100004 */ addiu $s0, $s0, 4 +/* EFEE7C 8024037C 0C0B53A3 */ jal func_802D4E8C +/* EFEE80 80240380 0280282D */ daddu $a1, $s4, $zero +/* EFEE84 80240384 0040982D */ daddu $s3, $v0, $zero +/* EFEE88 80240388 8E150000 */ lw $s5, ($s0) +/* EFEE8C 8024038C 26100004 */ addiu $s0, $s0, 4 +/* EFEE90 80240390 8E050000 */ lw $a1, ($s0) +/* EFEE94 80240394 26100004 */ addiu $s0, $s0, 4 +/* EFEE98 80240398 0C0B55FF */ jal func_802D57FC +/* EFEE9C 8024039C 0240202D */ daddu $a0, $s2, $zero +/* EFEEA0 802403A0 8E050000 */ lw $a1, ($s0) +/* EFEEA4 802403A4 26100004 */ addiu $s0, $s0, 4 +/* EFEEA8 802403A8 0240202D */ daddu $a0, $s2, $zero +/* EFEEAC 802403AC 0C0B55FF */ jal func_802D57FC +/* EFEEB0 802403B0 46000606 */ mov.s $f24, $f0 +/* EFEEB4 802403B4 8E050000 */ lw $a1, ($s0) +/* EFEEB8 802403B8 26100004 */ addiu $s0, $s0, 4 +/* EFEEBC 802403BC 0240202D */ daddu $a0, $s2, $zero +/* EFEEC0 802403C0 0C0B53A3 */ jal func_802D4E8C +/* EFEEC4 802403C4 46000506 */ mov.s $f20, $f0 +/* EFEEC8 802403C8 8E050000 */ lw $a1, ($s0) +/* EFEECC 802403CC 26100004 */ addiu $s0, $s0, 4 +/* EFEED0 802403D0 0240202D */ daddu $a0, $s2, $zero +/* EFEED4 802403D4 0C0B53A3 */ jal func_802D4E8C +/* EFEED8 802403D8 0040882D */ daddu $s1, $v0, $zero +/* EFEEDC 802403DC 0240202D */ daddu $a0, $s2, $zero +/* EFEEE0 802403E0 8E050000 */ lw $a1, ($s0) +/* EFEEE4 802403E4 0C0B55FF */ jal func_802D57FC +/* EFEEE8 802403E8 0040802D */ daddu $s0, $v0, $zero +/* EFEEEC 802403EC 3C014334 */ lui $at, 0x4334 +/* EFEEF0 802403F0 44811000 */ mtc1 $at, $f2 +/* EFEEF4 802403F4 3C014049 */ lui $at, 0x4049 +/* EFEEF8 802403F8 34210FD8 */ ori $at, $at, 0xfd8 +/* EFEEFC 802403FC 44812000 */ mtc1 $at, $f4 +/* EFEF00 80240400 46020003 */ div.s $f0, $f0, $f2 +/* EFEF04 80240404 46040582 */ mul.s $f22, $f0, $f4 +/* EFEF08 80240408 00000000 */ nop +/* EFEF0C 8024040C 4618A501 */ sub.s $f20, $f20, $f24 +/* EFEF10 80240410 3C013F00 */ lui $at, 0x3f00 +/* EFEF14 80240414 44810000 */ mtc1 $at, $f0 +/* EFEF18 80240418 4600A505 */ abs.s $f20, $f20 +/* EFEF1C 8024041C 4600A502 */ mul.s $f20, $f20, $f0 +/* EFEF20 80240420 00000000 */ nop +/* EFEF24 80240424 12000007 */ beqz $s0, .L80240444 +/* EFEF28 80240428 0233102A */ slt $v0, $s1, $s3 +/* EFEF2C 8024042C 10400005 */ beqz $v0, .L80240444 +/* EFEF30 80240430 0240202D */ daddu $a0, $s2, $zero +/* EFEF34 80240434 0220982D */ daddu $s3, $s1, $zero +/* EFEF38 80240438 0280282D */ daddu $a1, $s4, $zero +/* EFEF3C 8024043C 0C0B551A */ jal func_802D5468 +/* EFEF40 80240440 0220302D */ daddu $a2, $s1, $zero +.L80240444: +/* EFEF44 80240444 3C014049 */ lui $at, 0x4049 +/* EFEF48 80240448 34210FD8 */ ori $at, $at, 0xfd8 +/* EFEF4C 8024044C 44810000 */ mtc1 $at, $f0 +/* EFEF50 80240450 44936000 */ mtc1 $s3, $f12 +/* EFEF54 80240454 00000000 */ nop +/* EFEF58 80240458 46806320 */ cvt.s.w $f12, $f12 +/* EFEF5C 8024045C 46006302 */ mul.s $f12, $f12, $f0 +/* EFEF60 80240460 00000000 */ nop +/* EFEF64 80240464 44910000 */ mtc1 $s1, $f0 +/* EFEF68 80240468 00000000 */ nop +/* EFEF6C 8024046C 46800020 */ cvt.s.w $f0, $f0 +/* EFEF70 80240470 46006303 */ div.s $f12, $f12, $f0 +/* EFEF74 80240474 0C00AD30 */ jal func_8002B4C0 +/* EFEF78 80240478 46166300 */ add.s $f12, $f12, $f22 +/* EFEF7C 8024047C 4600A002 */ mul.s $f0, $f20, $f0 +/* EFEF80 80240480 00000000 */ nop +/* EFEF84 80240484 4614C080 */ add.s $f2, $f24, $f20 +/* EFEF88 80240488 46001081 */ sub.s $f2, $f2, $f0 +/* EFEF8C 8024048C 0240202D */ daddu $a0, $s2, $zero +/* EFEF90 80240490 44061000 */ mfc1 $a2, $f2 +/* EFEF94 80240494 0C0B5684 */ jal func_802D5A10 +/* EFEF98 80240498 02A0282D */ daddu $a1, $s5, $zero +/* EFEF9C 8024049C 8FBF0028 */ lw $ra, 0x28($sp) +/* EFEFA0 802404A0 8FB50024 */ lw $s5, 0x24($sp) +/* EFEFA4 802404A4 8FB40020 */ lw $s4, 0x20($sp) +/* EFEFA8 802404A8 8FB3001C */ lw $s3, 0x1c($sp) +/* EFEFAC 802404AC 8FB20018 */ lw $s2, 0x18($sp) +/* EFEFB0 802404B0 8FB10014 */ lw $s1, 0x14($sp) +/* EFEFB4 802404B4 8FB00010 */ lw $s0, 0x10($sp) +/* EFEFB8 802404B8 D7B80040 */ ldc1 $f24, 0x40($sp) +/* EFEFBC 802404BC D7B60038 */ ldc1 $f22, 0x38($sp) +/* EFEFC0 802404C0 D7B40030 */ ldc1 $f20, 0x30($sp) +/* EFEFC4 802404C4 24020002 */ addiu $v0, $zero, 2 +/* EFEFC8 802404C8 03E00008 */ jr $ra +/* EFEFCC 802404CC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_EFEB00/func_802404D0_EFEFD0.s b/asm/nonmatchings/code_EFEB00/func_802404D0_EFEFD0.s new file mode 100644 index 0000000000..57480e2d5b --- /dev/null +++ b/asm/nonmatchings/code_EFEB00/func_802404D0_EFEFD0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404D0_EFEFD0 +/* EFEFD0 802404D0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* EFEFD4 802404D4 AFB00010 */ sw $s0, 0x10($sp) +/* EFEFD8 802404D8 0080802D */ daddu $s0, $a0, $zero +/* EFEFDC 802404DC AFB20018 */ sw $s2, 0x18($sp) +/* EFEFE0 802404E0 3C128011 */ lui $s2, %hi(D_80117578) +/* EFEFE4 802404E4 26527578 */ addiu $s2, $s2, %lo(D_80117578) +/* EFEFE8 802404E8 AFBF001C */ sw $ra, 0x1c($sp) +/* EFEFEC 802404EC AFB10014 */ sw $s1, 0x14($sp) +/* EFEFF0 802404F0 C64000A8 */ lwc1 $f0, 0xa8($s2) +/* EFEFF4 802404F4 8E02000C */ lw $v0, 0xc($s0) +/* EFEFF8 802404F8 4600008D */ trunc.w.s $f2, $f0 +/* EFEFFC 802404FC 44061000 */ mfc1 $a2, $f2 +/* EFF000 80240500 8C450000 */ lw $a1, ($v0) +/* EFF004 80240504 0C0B551A */ jal func_802D5468 +/* EFF008 80240508 8C510004 */ lw $s1, 4($v0) +/* EFF00C 8024050C 0200202D */ daddu $a0, $s0, $zero +/* EFF010 80240510 C6400080 */ lwc1 $f0, 0x80($s2) +/* EFF014 80240514 4600008D */ trunc.w.s $f2, $f0 +/* EFF018 80240518 44061000 */ mfc1 $a2, $f2 +/* EFF01C 8024051C 0C0B551A */ jal func_802D5468 +/* EFF020 80240520 0220282D */ daddu $a1, $s1, $zero +/* EFF024 80240524 8FBF001C */ lw $ra, 0x1c($sp) +/* EFF028 80240528 8FB20018 */ lw $s2, 0x18($sp) +/* EFF02C 8024052C 8FB10014 */ lw $s1, 0x14($sp) +/* EFF030 80240530 8FB00010 */ lw $s0, 0x10($sp) +/* EFF034 80240534 24020002 */ addiu $v0, $zero, 2 +/* EFF038 80240538 03E00008 */ jr $ra +/* EFF03C 8024053C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_EFEB00/func_80240540_EFF040.s b/asm/nonmatchings/code_EFEB00/func_80240540_EFF040.s new file mode 100644 index 0000000000..bab86726c1 --- /dev/null +++ b/asm/nonmatchings/code_EFEB00/func_80240540_EFF040.s @@ -0,0 +1,76 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240540_EFF040 +/* EFF040 80240540 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EFF044 80240544 AFB00010 */ sw $s0, 0x10($sp) +/* EFF048 80240548 0080802D */ daddu $s0, $a0, $zero +/* EFF04C 8024054C AFBF0018 */ sw $ra, 0x18($sp) +/* EFF050 80240550 AFB10014 */ sw $s1, 0x14($sp) +/* EFF054 80240554 F7B80030 */ sdc1 $f24, 0x30($sp) +/* EFF058 80240558 F7B60028 */ sdc1 $f22, 0x28($sp) +/* EFF05C 8024055C F7B40020 */ sdc1 $f20, 0x20($sp) +/* EFF060 80240560 8E05008C */ lw $a1, 0x8c($s0) +/* EFF064 80240564 4480B000 */ mtc1 $zero, $f22 +/* EFF068 80240568 0C0B53A3 */ jal func_802D4E8C +/* EFF06C 8024056C 0000202D */ daddu $a0, $zero, $zero +/* EFF070 80240570 4600B306 */ mov.s $f12, $f22 +/* EFF074 80240574 C60200A8 */ lwc1 $f2, 0xa8($s0) +/* EFF078 80240578 468010A0 */ cvt.s.w $f2, $f2 +/* EFF07C 8024057C 44061000 */ mfc1 $a2, $f2 +/* EFF080 80240580 C60200B0 */ lwc1 $f2, 0xb0($s0) +/* EFF084 80240584 468010A0 */ cvt.s.w $f2, $f2 +/* EFF088 80240588 44071000 */ mfc1 $a3, $f2 +/* EFF08C 8024058C 4482A000 */ mtc1 $v0, $f20 +/* EFF090 80240590 00000000 */ nop +/* EFF094 80240594 4680A520 */ cvt.s.w $f20, $f20 +/* EFF098 80240598 0C00AC71 */ jal func_8002B1C4 +/* EFF09C 8024059C 4600B386 */ mov.s $f14, $f22 +/* EFF0A0 802405A0 4600B306 */ mov.s $f12, $f22 +/* EFF0A4 802405A4 4600B386 */ mov.s $f14, $f22 +/* EFF0A8 802405A8 C60200A8 */ lwc1 $f2, 0xa8($s0) +/* EFF0AC 802405AC 468010A0 */ cvt.s.w $f2, $f2 +/* EFF0B0 802405B0 44061000 */ mfc1 $a2, $f2 +/* EFF0B4 802405B4 C60200B0 */ lwc1 $f2, 0xb0($s0) +/* EFF0B8 802405B8 468010A0 */ cvt.s.w $f2, $f2 +/* EFF0BC 802405BC 44071000 */ mfc1 $a3, $f2 +/* EFF0C0 802405C0 0C00ABDC */ jal fio_validate_header_checksums +/* EFF0C4 802405C4 46000606 */ mov.s $f24, $f0 +/* EFF0C8 802405C8 0C00AB85 */ jal func_8002AE14 +/* EFF0CC 802405CC 46140301 */ sub.s $f12, $f0, $f20 +/* EFF0D0 802405D0 46000506 */ mov.s $f20, $f0 +/* EFF0D4 802405D4 0C00AD77 */ jal func_8002B5DC +/* EFF0D8 802405D8 4600A306 */ mov.s $f12, $f20 +/* EFF0DC 802405DC 4600C002 */ mul.s $f0, $f24, $f0 +/* EFF0E0 802405E0 00000000 */ nop +/* EFF0E4 802405E4 46160000 */ add.s $f0, $f0, $f22 +/* EFF0E8 802405E8 3C118011 */ lui $s1, %hi(D_80117578) +/* EFF0EC 802405EC 26317578 */ addiu $s1, $s1, %lo(D_80117578) +/* EFF0F0 802405F0 E6200028 */ swc1 $f0, 0x28($s1) +/* EFF0F4 802405F4 8E0500AC */ lw $a1, 0xac($s0) +/* EFF0F8 802405F8 0C0B53A3 */ jal func_802D4E8C +/* EFF0FC 802405FC 0000202D */ daddu $a0, $zero, $zero +/* EFF100 80240600 0000202D */ daddu $a0, $zero, $zero +/* EFF104 80240604 8E050090 */ lw $a1, 0x90($s0) +/* EFF108 80240608 0C0B53A3 */ jal func_802D4E8C +/* EFF10C 8024060C 0040802D */ daddu $s0, $v0, $zero +/* EFF110 80240610 4600A306 */ mov.s $f12, $f20 +/* EFF114 80240614 02028021 */ addu $s0, $s0, $v0 +/* EFF118 80240618 44900000 */ mtc1 $s0, $f0 +/* EFF11C 8024061C 00000000 */ nop +/* EFF120 80240620 46800020 */ cvt.s.w $f0, $f0 +/* EFF124 80240624 0C00AD90 */ jal func_8002B640 +/* EFF128 80240628 E620002C */ swc1 $f0, 0x2c($s1) +/* EFF12C 8024062C 4600C602 */ mul.s $f24, $f24, $f0 +/* EFF130 80240630 00000000 */ nop +/* EFF134 80240634 4618B581 */ sub.s $f22, $f22, $f24 +/* EFF138 80240638 E6360030 */ swc1 $f22, 0x30($s1) +/* EFF13C 8024063C 8FBF0018 */ lw $ra, 0x18($sp) +/* EFF140 80240640 8FB10014 */ lw $s1, 0x14($sp) +/* EFF144 80240644 8FB00010 */ lw $s0, 0x10($sp) +/* EFF148 80240648 D7B80030 */ ldc1 $f24, 0x30($sp) +/* EFF14C 8024064C D7B60028 */ ldc1 $f22, 0x28($sp) +/* EFF150 80240650 D7B40020 */ ldc1 $f20, 0x20($sp) +/* EFF154 80240654 24020002 */ addiu $v0, $zero, 2 +/* EFF158 80240658 03E00008 */ jr $ra +/* EFF15C 8024065C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EFEB00/func_80240660_EFF160.s b/asm/nonmatchings/code_EFEB00/func_80240660_EFF160.s new file mode 100644 index 0000000000..c6013d1b8f --- /dev/null +++ b/asm/nonmatchings/code_EFEB00/func_80240660_EFF160.s @@ -0,0 +1,77 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240660_EFF160 +/* EFF160 80240660 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* EFF164 80240664 AFB00010 */ sw $s0, 0x10($sp) +/* EFF168 80240668 0080802D */ daddu $s0, $a0, $zero +/* EFF16C 8024066C AFBF0018 */ sw $ra, 0x18($sp) +/* EFF170 80240670 AFB10014 */ sw $s1, 0x14($sp) +/* EFF174 80240674 F7B80030 */ sdc1 $f24, 0x30($sp) +/* EFF178 80240678 F7B60028 */ sdc1 $f22, 0x28($sp) +/* EFF17C 8024067C F7B40020 */ sdc1 $f20, 0x20($sp) +/* EFF180 80240680 0C00F10F */ jal func_8003C43C +/* EFF184 80240684 0000202D */ daddu $a0, $zero, $zero +/* EFF188 80240688 0000202D */ daddu $a0, $zero, $zero +/* EFF18C 8024068C 8E05008C */ lw $a1, 0x8c($s0) +/* EFF190 80240690 4480B000 */ mtc1 $zero, $f22 +/* EFF194 80240694 0C0B53A3 */ jal func_802D4E8C +/* EFF198 80240698 0040882D */ daddu $s1, $v0, $zero +/* EFF19C 8024069C 4600B306 */ mov.s $f12, $f22 +/* EFF1A0 802406A0 C60200B4 */ lwc1 $f2, 0xb4($s0) +/* EFF1A4 802406A4 468010A0 */ cvt.s.w $f2, $f2 +/* EFF1A8 802406A8 44061000 */ mfc1 $a2, $f2 +/* EFF1AC 802406AC C60200BC */ lwc1 $f2, 0xbc($s0) +/* EFF1B0 802406B0 468010A0 */ cvt.s.w $f2, $f2 +/* EFF1B4 802406B4 44071000 */ mfc1 $a3, $f2 +/* EFF1B8 802406B8 4482A000 */ mtc1 $v0, $f20 +/* EFF1BC 802406BC 00000000 */ nop +/* EFF1C0 802406C0 4680A520 */ cvt.s.w $f20, $f20 +/* EFF1C4 802406C4 0C00AC71 */ jal func_8002B1C4 +/* EFF1C8 802406C8 4600B386 */ mov.s $f14, $f22 +/* EFF1CC 802406CC 4600B306 */ mov.s $f12, $f22 +/* EFF1D0 802406D0 4600B386 */ mov.s $f14, $f22 +/* EFF1D4 802406D4 C60200B4 */ lwc1 $f2, 0xb4($s0) +/* EFF1D8 802406D8 468010A0 */ cvt.s.w $f2, $f2 +/* EFF1DC 802406DC 44061000 */ mfc1 $a2, $f2 +/* EFF1E0 802406E0 C60200BC */ lwc1 $f2, 0xbc($s0) +/* EFF1E4 802406E4 468010A0 */ cvt.s.w $f2, $f2 +/* EFF1E8 802406E8 44071000 */ mfc1 $a3, $f2 +/* EFF1EC 802406EC 0C00ABDC */ jal fio_validate_header_checksums +/* EFF1F0 802406F0 46000606 */ mov.s $f24, $f0 +/* EFF1F4 802406F4 0C00AB85 */ jal func_8002AE14 +/* EFF1F8 802406F8 46140301 */ sub.s $f12, $f0, $f20 +/* EFF1FC 802406FC 46000506 */ mov.s $f20, $f0 +/* EFF200 80240700 0C00AD77 */ jal func_8002B5DC +/* EFF204 80240704 4600A306 */ mov.s $f12, $f20 +/* EFF208 80240708 4600C002 */ mul.s $f0, $f24, $f0 +/* EFF20C 8024070C 00000000 */ nop +/* EFF210 80240710 46160000 */ add.s $f0, $f0, $f22 +/* EFF214 80240714 E6200038 */ swc1 $f0, 0x38($s1) +/* EFF218 80240718 8E0500B8 */ lw $a1, 0xb8($s0) +/* EFF21C 8024071C 0C0B53A3 */ jal func_802D4E8C +/* EFF220 80240720 0000202D */ daddu $a0, $zero, $zero +/* EFF224 80240724 0000202D */ daddu $a0, $zero, $zero +/* EFF228 80240728 8E050090 */ lw $a1, 0x90($s0) +/* EFF22C 8024072C 0C0B53A3 */ jal func_802D4E8C +/* EFF230 80240730 0040802D */ daddu $s0, $v0, $zero +/* EFF234 80240734 4600A306 */ mov.s $f12, $f20 +/* EFF238 80240738 02028021 */ addu $s0, $s0, $v0 +/* EFF23C 8024073C 44900000 */ mtc1 $s0, $f0 +/* EFF240 80240740 00000000 */ nop +/* EFF244 80240744 46800020 */ cvt.s.w $f0, $f0 +/* EFF248 80240748 0C00AD90 */ jal func_8002B640 +/* EFF24C 8024074C E620003C */ swc1 $f0, 0x3c($s1) +/* EFF250 80240750 4600C602 */ mul.s $f24, $f24, $f0 +/* EFF254 80240754 00000000 */ nop +/* EFF258 80240758 4618B581 */ sub.s $f22, $f22, $f24 +/* EFF25C 8024075C E6360040 */ swc1 $f22, 0x40($s1) +/* EFF260 80240760 8FBF0018 */ lw $ra, 0x18($sp) +/* EFF264 80240764 8FB10014 */ lw $s1, 0x14($sp) +/* EFF268 80240768 8FB00010 */ lw $s0, 0x10($sp) +/* EFF26C 8024076C D7B80030 */ ldc1 $f24, 0x30($sp) +/* EFF270 80240770 D7B60028 */ ldc1 $f22, 0x28($sp) +/* EFF274 80240774 D7B40020 */ ldc1 $f20, 0x20($sp) +/* EFF278 80240778 24020002 */ addiu $v0, $zero, 2 +/* EFF27C 8024077C 03E00008 */ jr $ra +/* EFF280 80240780 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_EFEB00/func_80240784_EFF284.s b/asm/nonmatchings/code_EFEB00/func_80240784_EFF284.s new file mode 100644 index 0000000000..11a91c05c9 --- /dev/null +++ b/asm/nonmatchings/code_EFEB00/func_80240784_EFF284.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240784_EFF284 +/* EFF284 80240784 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* EFF288 80240788 AFBF0010 */ sw $ra, 0x10($sp) +/* EFF28C 8024078C C4800084 */ lwc1 $f0, 0x84($a0) +/* EFF290 80240790 46800020 */ cvt.s.w $f0, $f0 +/* EFF294 80240794 44050000 */ mfc1 $a1, $f0 +/* EFF298 80240798 0C051065 */ jal func_80144194 +/* EFF29C 8024079C 24040001 */ addiu $a0, $zero, 1 +/* EFF2A0 802407A0 8FBF0010 */ lw $ra, 0x10($sp) +/* EFF2A4 802407A4 24020002 */ addiu $v0, $zero, 2 +/* EFF2A8 802407A8 03E00008 */ jr $ra +/* EFF2AC 802407AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_EFEB00/func_802407B0_EFF2B0.s b/asm/nonmatchings/code_EFEB00/func_802407B0_EFF2B0.s new file mode 100644 index 0000000000..8dea533338 --- /dev/null +++ b/asm/nonmatchings/code_EFEB00/func_802407B0_EFF2B0.s @@ -0,0 +1,105 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407B0_EFF2B0 +/* EFF2B0 802407B0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* EFF2B4 802407B4 AFB20018 */ sw $s2, 0x18($sp) +/* EFF2B8 802407B8 0080902D */ daddu $s2, $a0, $zero +/* EFF2BC 802407BC AFBF0028 */ sw $ra, 0x28($sp) +/* EFF2C0 802407C0 AFB50024 */ sw $s5, 0x24($sp) +/* EFF2C4 802407C4 AFB40020 */ sw $s4, 0x20($sp) +/* EFF2C8 802407C8 AFB3001C */ sw $s3, 0x1c($sp) +/* EFF2CC 802407CC AFB10014 */ sw $s1, 0x14($sp) +/* EFF2D0 802407D0 AFB00010 */ sw $s0, 0x10($sp) +/* EFF2D4 802407D4 F7B80040 */ sdc1 $f24, 0x40($sp) +/* EFF2D8 802407D8 F7B60038 */ sdc1 $f22, 0x38($sp) +/* EFF2DC 802407DC F7B40030 */ sdc1 $f20, 0x30($sp) +/* EFF2E0 802407E0 8E50000C */ lw $s0, 0xc($s2) +/* EFF2E4 802407E4 8E140000 */ lw $s4, ($s0) +/* EFF2E8 802407E8 26100004 */ addiu $s0, $s0, 4 +/* EFF2EC 802407EC 0C0B53A3 */ jal func_802D4E8C +/* EFF2F0 802407F0 0280282D */ daddu $a1, $s4, $zero +/* EFF2F4 802407F4 0040982D */ daddu $s3, $v0, $zero +/* EFF2F8 802407F8 8E150000 */ lw $s5, ($s0) +/* EFF2FC 802407FC 26100004 */ addiu $s0, $s0, 4 +/* EFF300 80240800 8E050000 */ lw $a1, ($s0) +/* EFF304 80240804 26100004 */ addiu $s0, $s0, 4 +/* EFF308 80240808 0C0B55FF */ jal func_802D57FC +/* EFF30C 8024080C 0240202D */ daddu $a0, $s2, $zero +/* EFF310 80240810 8E050000 */ lw $a1, ($s0) +/* EFF314 80240814 26100004 */ addiu $s0, $s0, 4 +/* EFF318 80240818 0240202D */ daddu $a0, $s2, $zero +/* EFF31C 8024081C 0C0B55FF */ jal func_802D57FC +/* EFF320 80240820 46000606 */ mov.s $f24, $f0 +/* EFF324 80240824 8E050000 */ lw $a1, ($s0) +/* EFF328 80240828 26100004 */ addiu $s0, $s0, 4 +/* EFF32C 8024082C 0240202D */ daddu $a0, $s2, $zero +/* EFF330 80240830 0C0B53A3 */ jal func_802D4E8C +/* EFF334 80240834 46000506 */ mov.s $f20, $f0 +/* EFF338 80240838 8E050000 */ lw $a1, ($s0) +/* EFF33C 8024083C 26100004 */ addiu $s0, $s0, 4 +/* EFF340 80240840 0240202D */ daddu $a0, $s2, $zero +/* EFF344 80240844 0C0B53A3 */ jal func_802D4E8C +/* EFF348 80240848 0040882D */ daddu $s1, $v0, $zero +/* EFF34C 8024084C 0240202D */ daddu $a0, $s2, $zero +/* EFF350 80240850 8E050000 */ lw $a1, ($s0) +/* EFF354 80240854 0C0B55FF */ jal func_802D57FC +/* EFF358 80240858 0040802D */ daddu $s0, $v0, $zero +/* EFF35C 8024085C 3C014334 */ lui $at, 0x4334 +/* EFF360 80240860 44811000 */ mtc1 $at, $f2 +/* EFF364 80240864 3C014049 */ lui $at, 0x4049 +/* EFF368 80240868 34210FD8 */ ori $at, $at, 0xfd8 +/* EFF36C 8024086C 44812000 */ mtc1 $at, $f4 +/* EFF370 80240870 46020003 */ div.s $f0, $f0, $f2 +/* EFF374 80240874 46040582 */ mul.s $f22, $f0, $f4 +/* EFF378 80240878 00000000 */ nop +/* EFF37C 8024087C 4618A501 */ sub.s $f20, $f20, $f24 +/* EFF380 80240880 3C013F00 */ lui $at, 0x3f00 +/* EFF384 80240884 44810000 */ mtc1 $at, $f0 +/* EFF388 80240888 00000000 */ nop +/* EFF38C 8024088C 4600A502 */ mul.s $f20, $f20, $f0 +/* EFF390 80240890 00000000 */ nop +/* EFF394 80240894 12000007 */ beqz $s0, .L802408B4 +/* EFF398 80240898 0233102A */ slt $v0, $s1, $s3 +/* EFF39C 8024089C 10400005 */ beqz $v0, .L802408B4 +/* EFF3A0 802408A0 0240202D */ daddu $a0, $s2, $zero +/* EFF3A4 802408A4 0220982D */ daddu $s3, $s1, $zero +/* EFF3A8 802408A8 0280282D */ daddu $a1, $s4, $zero +/* EFF3AC 802408AC 0C0B551A */ jal func_802D5468 +/* EFF3B0 802408B0 0220302D */ daddu $a2, $s1, $zero +.L802408B4: +/* EFF3B4 802408B4 3C014049 */ lui $at, 0x4049 +/* EFF3B8 802408B8 34210FD8 */ ori $at, $at, 0xfd8 +/* EFF3BC 802408BC 44810000 */ mtc1 $at, $f0 +/* EFF3C0 802408C0 44936000 */ mtc1 $s3, $f12 +/* EFF3C4 802408C4 00000000 */ nop +/* EFF3C8 802408C8 46806320 */ cvt.s.w $f12, $f12 +/* EFF3CC 802408CC 46006302 */ mul.s $f12, $f12, $f0 +/* EFF3D0 802408D0 00000000 */ nop +/* EFF3D4 802408D4 44910000 */ mtc1 $s1, $f0 +/* EFF3D8 802408D8 00000000 */ nop +/* EFF3DC 802408DC 46800020 */ cvt.s.w $f0, $f0 +/* EFF3E0 802408E0 46006303 */ div.s $f12, $f12, $f0 +/* EFF3E4 802408E4 0C00AD30 */ jal func_8002B4C0 +/* EFF3E8 802408E8 46166300 */ add.s $f12, $f12, $f22 +/* EFF3EC 802408EC 4600A002 */ mul.s $f0, $f20, $f0 +/* EFF3F0 802408F0 00000000 */ nop +/* EFF3F4 802408F4 4614C080 */ add.s $f2, $f24, $f20 +/* EFF3F8 802408F8 46001081 */ sub.s $f2, $f2, $f0 +/* EFF3FC 802408FC 0240202D */ daddu $a0, $s2, $zero +/* EFF400 80240900 44061000 */ mfc1 $a2, $f2 +/* EFF404 80240904 0C0B5684 */ jal func_802D5A10 +/* EFF408 80240908 02A0282D */ daddu $a1, $s5, $zero +/* EFF40C 8024090C 8FBF0028 */ lw $ra, 0x28($sp) +/* EFF410 80240910 8FB50024 */ lw $s5, 0x24($sp) +/* EFF414 80240914 8FB40020 */ lw $s4, 0x20($sp) +/* EFF418 80240918 8FB3001C */ lw $s3, 0x1c($sp) +/* EFF41C 8024091C 8FB20018 */ lw $s2, 0x18($sp) +/* EFF420 80240920 8FB10014 */ lw $s1, 0x14($sp) +/* EFF424 80240924 8FB00010 */ lw $s0, 0x10($sp) +/* EFF428 80240928 D7B80040 */ ldc1 $f24, 0x40($sp) +/* EFF42C 8024092C D7B60038 */ ldc1 $f22, 0x38($sp) +/* EFF430 80240930 D7B40030 */ ldc1 $f20, 0x30($sp) +/* EFF434 80240934 24020002 */ addiu $v0, $zero, 2 +/* EFF438 80240938 03E00008 */ jr $ra +/* EFF43C 8024093C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/src/code_EA0900.c b/src/code_EA0900.c new file mode 100644 index 0000000000..8bcedd484d --- /dev/null +++ b/src/code_EA0900.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EA0900", func_80240000_EA0900); + +INCLUDE_ASM(s32, "code_EA0900", func_80240124_EA0A24); diff --git a/src/code_EA0C10.c b/src/code_EA0C10.c new file mode 100644 index 0000000000..05a46d147d --- /dev/null +++ b/src/code_EA0C10.c @@ -0,0 +1,69 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EA0C10", func_80240310_EA0C10); + +INCLUDE_ASM(s32, "code_EA0C10", func_8024037C_EA0C7C); + +INCLUDE_ASM(s32, "code_EA0C10", func_802403EC_EA0CEC); + +INCLUDE_ASM(s32, "code_EA0C10", func_802404C4_EA0DC4); + +INCLUDE_ASM(s32, "code_EA0C10", func_80240518_EA0E18); + +INCLUDE_ASM(s32, "code_EA0C10", func_802406CC_EA0FCC); + +INCLUDE_ASM(s32, "code_EA0C10", func_8024097C_EA127C); + +INCLUDE_ASM(s32, "code_EA0C10", func_80240C5C_EA155C); + +INCLUDE_ASM(s32, "code_EA0C10", func_80240CC8_EA15C8); + +INCLUDE_ASM(s32, "code_EA0C10", func_80240DC4_EA16C4); + +INCLUDE_ASM(s32, "code_EA0C10", func_80241804_EA2104); + +INCLUDE_ASM(s32, "code_EA0C10", func_80241894_EA2194); + +INCLUDE_ASM(s32, "code_EA0C10", func_80241994_EA2294); + +INCLUDE_ASM(s32, "code_EA0C10", func_802419F4_EA22F4); + +INCLUDE_ASM(s32, "code_EA0C10", func_80241AE0_EA23E0); + +INCLUDE_ASM(s32, "code_EA0C10", func_80241D68_EA2668); + +INCLUDE_ASM(s32, "code_EA0C10", func_80241DE4_EA26E4); + +INCLUDE_ASM(s32, "code_EA0C10", func_80241F18_EA2818); + +INCLUDE_ASM(s32, "code_EA0C10", func_8024207C_EA297C); + +INCLUDE_ASM(s32, "code_EA0C10", func_802420FC_EA29FC); + +INCLUDE_ASM(s32, "code_EA0C10", func_80242568_EA2E68); + +INCLUDE_ASM(s32, "code_EA0C10", func_802425B0_EA2EB0); + +INCLUDE_ASM(s32, "code_EA0C10", func_80242608_EA2F08); + +INCLUDE_ASM(s32, "code_EA0C10", func_8024267C_EA2F7C); + +INCLUDE_ASM(s32, "code_EA0C10", func_80242730_EA3030); + +INCLUDE_ASM(s32, "code_EA0C10", func_80242794_EA3094); + +INCLUDE_ASM(s32, "code_EA0C10", func_802427F0_EA30F0); + +INCLUDE_ASM(s32, "code_EA0C10", func_802429C0_EA32C0); + +INCLUDE_ASM(s32, "code_EA0C10", func_80242A14_EA3314); + +INCLUDE_ASM(s32, "code_EA0C10", func_80242A4C_EA334C); + +INCLUDE_ASM(s32, "code_EA0C10", func_80242AE8_EA33E8); + +INCLUDE_ASM(s32, "code_EA0C10", func_80242BD8_EA34D8); + +INCLUDE_ASM(s32, "code_EA0C10", func_80242D64_EA3664); + +INCLUDE_ASM(s32, "code_EA0C10", func_80242DA8_EA36A8); diff --git a/src/code_EA36E0.c b/src/code_EA36E0.c new file mode 100644 index 0000000000..9975ec0db6 --- /dev/null +++ b/src/code_EA36E0.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EA36E0", func_80242DE0_EA36E0); + +INCLUDE_ASM(s32, "code_EA36E0", func_80242E00_EA3700); + +INCLUDE_ASM(s32, "code_EA36E0", func_80242E2C_EA372C); + +INCLUDE_ASM(s32, "code_EA36E0", func_80242EC4_EA37C4); + +INCLUDE_ASM(s32, "code_EA36E0", func_80242F64_EA3864); + +INCLUDE_ASM(s32, "code_EA36E0", func_80242F9C_EA389C); + +INCLUDE_ASM(s32, "code_EA36E0", func_80243054_EA3954); + +INCLUDE_ASM(s32, "code_EA36E0", func_802430E4_EA39E4); diff --git a/src/code_EA6FD0.c b/src/code_EA6FD0.c new file mode 100644 index 0000000000..aae81a4ed5 --- /dev/null +++ b/src/code_EA6FD0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EA6FD0", func_80240000_EA6FD0); diff --git a/src/code_EA7010.c b/src/code_EA7010.c new file mode 100644 index 0000000000..2b30b49b7d --- /dev/null +++ b/src/code_EA7010.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EA7010", func_80240040_EA7010); + +INCLUDE_ASM(s32, "code_EA7010", func_80240164_EA7134); diff --git a/src/code_EA7320.c b/src/code_EA7320.c new file mode 100644 index 0000000000..372ba6e85a --- /dev/null +++ b/src/code_EA7320.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EA7320", func_80240350_EA7320); + +INCLUDE_ASM(s32, "code_EA7320", func_8024036C_EA733C); + +INCLUDE_ASM(s32, "code_EA7320", func_80240388_EA7358); diff --git a/src/code_EA8AE0.c b/src/code_EA8AE0.c new file mode 100644 index 0000000000..53779228a5 --- /dev/null +++ b/src/code_EA8AE0.c @@ -0,0 +1,57 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EA8AE0", func_80240000_EA8AE0); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80240124_EA8C04); + +INCLUDE_ASM(s32, "code_EA8AE0", func_8024030C_EA8DEC); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80240358_EA8E38); + +INCLUDE_ASM(s32, "code_EA8AE0", func_802404B8_EA8F98); + +INCLUDE_ASM(s32, "code_EA8AE0", func_802408C8_EA93A8); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80240908_EA93E8); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80240A14_EA94F4); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80240B00_EA95E0); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80240BD4_EA96B4); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80240CD8_EA97B8); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80240DA4_EA9884); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80240E2C_EA990C); + +INCLUDE_ASM(s32, "code_EA8AE0", func_802413C0_EA9EA0); + +INCLUDE_ASM(s32, "code_EA8AE0", func_802413FC_EA9EDC); + +INCLUDE_ASM(s32, "code_EA8AE0", func_8024140C_EA9EEC); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80241468_EA9F48); + +INCLUDE_ASM(s32, "code_EA8AE0", func_8024151C_EA9FFC); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80241580_EAA060); + +INCLUDE_ASM(s32, "code_EA8AE0", func_802415DC_EAA0BC); + +INCLUDE_ASM(s32, "code_EA8AE0", func_802417AC_EAA28C); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80241800_EAA2E0); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80241838_EAA318); + +INCLUDE_ASM(s32, "code_EA8AE0", func_802418D4_EAA3B4); + +INCLUDE_ASM(s32, "code_EA8AE0", func_802419C4_EAA4A4); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80241B50_EAA630); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80241B94_EAA674); + +INCLUDE_ASM(s32, "code_EA8AE0", func_80241BC0_EAA6A0); diff --git a/src/code_EB0E60.c b/src/code_EB0E60.c new file mode 100644 index 0000000000..35947375b6 --- /dev/null +++ b/src/code_EB0E60.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EB0E60", func_80240000_EB0E60); + +INCLUDE_ASM(s32, "code_EB0E60", func_80240124_EB0F84); diff --git a/src/code_EB1170.c b/src/code_EB1170.c new file mode 100644 index 0000000000..cc0839bf34 --- /dev/null +++ b/src/code_EB1170.c @@ -0,0 +1,27 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EB1170", func_80240310_EB1170); + +INCLUDE_ASM(s32, "code_EB1170", func_802403C4_EB1224); + +INCLUDE_ASM(s32, "code_EB1170", func_80240428_EB1288); + +INCLUDE_ASM(s32, "code_EB1170", func_80240484_EB12E4); + +INCLUDE_ASM(s32, "code_EB1170", func_80240654_EB14B4); + +INCLUDE_ASM(s32, "code_EB1170", func_802406A8_EB1508); + +INCLUDE_ASM(s32, "code_EB1170", func_802406E0_EB1540); + +INCLUDE_ASM(s32, "code_EB1170", func_8024077C_EB15DC); + +INCLUDE_ASM(s32, "code_EB1170", func_8024086C_EB16CC); + +INCLUDE_ASM(s32, "code_EB1170", func_802409F8_EB1858); + +INCLUDE_ASM(s32, "code_EB1170", func_80240A3C_EB189C); + +INCLUDE_ASM(s32, "code_EB1170", func_80240A68_EB18C8); + +INCLUDE_ASM(s32, "code_EB1170", func_80240A8C_EB18EC); diff --git a/src/code_EB5130.c b/src/code_EB5130.c new file mode 100644 index 0000000000..ce7c5cfe87 --- /dev/null +++ b/src/code_EB5130.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EB5130", func_80240000_EB5130); + +INCLUDE_ASM(s32, "code_EB5130", func_80240124_EB5254); + +INCLUDE_ASM(s32, "code_EB5130", func_8024030C_EB543C); diff --git a/src/code_EB5470.c b/src/code_EB5470.c new file mode 100644 index 0000000000..75afab2315 --- /dev/null +++ b/src/code_EB5470.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EB5470", func_80240340_EB5470); + +INCLUDE_ASM(s32, "code_EB5470", func_8024036C_EB549C); diff --git a/src/code_EB7230.c b/src/code_EB7230.c new file mode 100644 index 0000000000..a244f851db --- /dev/null +++ b/src/code_EB7230.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EB7230", func_80240000_EB7230); + +INCLUDE_ASM(s32, "code_EB7230", func_80240124_EB7354); diff --git a/src/code_EB7540.c b/src/code_EB7540.c new file mode 100644 index 0000000000..31ec2a8e6c --- /dev/null +++ b/src/code_EB7540.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EB7540", func_80240310_EB7540); + +INCLUDE_ASM(s32, "code_EB7540", func_802403D8_EB7608); + +INCLUDE_ASM(s32, "code_EB7540", func_80240478_EB76A8); + +INCLUDE_ASM(s32, "code_EB7540", func_80240504_EB7734); + +INCLUDE_ASM(s32, "code_EB7540", func_80240520_EB7750); diff --git a/src/code_EB8E50.c b/src/code_EB8E50.c new file mode 100644 index 0000000000..97ecac8178 --- /dev/null +++ b/src/code_EB8E50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EB8E50", func_80240000_EB8E50); diff --git a/src/code_EB8E90.c b/src/code_EB8E90.c new file mode 100644 index 0000000000..2dffe36b5e --- /dev/null +++ b/src/code_EB8E90.c @@ -0,0 +1,27 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EB8E90", func_80240040_EB8E90); + +INCLUDE_ASM(s32, "code_EB8E90", func_80240198_EB8FE8); + +INCLUDE_ASM(s32, "code_EB8E90", func_80240440_EB9290); + +INCLUDE_ASM(s32, "code_EB8E90", func_80240500_EB9350); + +INCLUDE_ASM(s32, "code_EB8E90", func_802406BC_EB950C); + +INCLUDE_ASM(s32, "code_EB8E90", func_80240770_EB95C0); + +INCLUDE_ASM(s32, "code_EB8E90", func_802407E4_EB9634); + +INCLUDE_ASM(s32, "code_EB8E90", func_8024085C_EB96AC); + +INCLUDE_ASM(s32, "code_EB8E90", func_8024098C_EB97DC); + +INCLUDE_ASM(s32, "code_EB8E90", func_80240AAC_EB98FC); + +INCLUDE_ASM(s32, "code_EB8E90", func_80240B14_EB9964); + +INCLUDE_ASM(s32, "code_EB8E90", func_80240BD4_EB9A24); + +INCLUDE_ASM(s32, "code_EB8E90", func_80240EFC_EB9D4C); diff --git a/src/code_EB9D90.c b/src/code_EB9D90.c new file mode 100644 index 0000000000..4d2b35fa67 --- /dev/null +++ b/src/code_EB9D90.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EB9D90", func_80240F40_EB9D90); + +INCLUDE_ASM(s32, "code_EB9D90", func_80240FB0_EB9E00); + +INCLUDE_ASM(s32, "code_EB9D90", func_802410E4_EB9F34); + +INCLUDE_ASM(s32, "code_EB9D90", func_8024121C_EBA06C); + +INCLUDE_ASM(s32, "code_EB9D90", func_802413AC_EBA1FC); + +INCLUDE_ASM(s32, "code_EB9D90", func_802413CC_EBA21C); + +INCLUDE_ASM(s32, "code_EB9D90", func_802413EC_EBA23C); diff --git a/src/code_EC2200.c b/src/code_EC2200.c new file mode 100644 index 0000000000..635d7b56aa --- /dev/null +++ b/src/code_EC2200.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EC2200", func_80240000_EC2200); diff --git a/src/code_EC2240.c b/src/code_EC2240.c new file mode 100644 index 0000000000..379872b653 --- /dev/null +++ b/src/code_EC2240.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EC2240", func_80240040_EC2240); + +INCLUDE_ASM(s32, "code_EC2240", func_802400F4_EC22F4); + +INCLUDE_ASM(s32, "code_EC2240", func_80240158_EC2358); diff --git a/src/code_EC2610.c b/src/code_EC2610.c new file mode 100644 index 0000000000..8f5385d8e0 --- /dev/null +++ b/src/code_EC2610.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EC2610", func_80240410_EC2610); + +INCLUDE_ASM(s32, "code_EC2610", func_80240480_EC2680); diff --git a/src/code_EC71B0.c b/src/code_EC71B0.c new file mode 100644 index 0000000000..abc5bf3a28 --- /dev/null +++ b/src/code_EC71B0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EC71B0", func_80240000_EC71B0); + +INCLUDE_ASM(s32, "code_EC71B0", func_80240124_EC72D4); + +INCLUDE_ASM(s32, "code_EC71B0", func_8024030C_EC74BC); + +INCLUDE_ASM(s32, "code_EC71B0", func_80240344_EC74F4); diff --git a/src/code_EC7590.c b/src/code_EC7590.c new file mode 100644 index 0000000000..4b094f377f --- /dev/null +++ b/src/code_EC7590.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EC7590", func_802403E0_EC7590); + +INCLUDE_ASM(s32, "code_EC7590", func_80240450_EC7600); + +INCLUDE_ASM(s32, "code_EC7590", func_8024061C_EC77CC); + +INCLUDE_ASM(s32, "code_EC7590", func_802406D0_EC7880); diff --git a/src/code_EC9D00.c b/src/code_EC9D00.c new file mode 100644 index 0000000000..b80727a124 --- /dev/null +++ b/src/code_EC9D00.c @@ -0,0 +1,37 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EC9D00", func_80240000_EC9D00); + +INCLUDE_ASM(s32, "code_EC9D00", func_8024001C_EC9D1C); + +INCLUDE_ASM(s32, "code_EC9D00", func_8024003C_EC9D3C); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240068_EC9D68); + +INCLUDE_ASM(s32, "code_EC9D00", func_802400D4_EC9DD4); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240120_EC9E20); + +INCLUDE_ASM(s32, "code_EC9D00", func_802401CC_EC9ECC); + +INCLUDE_ASM(s32, "code_EC9D00", func_8024041C_ECA11C); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240448_ECA148); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240480_ECA180); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240510_ECA210); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240544_ECA244); + +INCLUDE_ASM(s32, "code_EC9D00", func_802405A8_ECA2A8); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240600_ECA300); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240B38_ECA838); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240C78_ECA978); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240CC0_ECA9C0); + +INCLUDE_ASM(s32, "code_EC9D00", func_80240D08_ECAA08); diff --git a/src/code_ECAA40.c b/src/code_ECAA40.c new file mode 100644 index 0000000000..1b53f01609 --- /dev/null +++ b/src/code_ECAA40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ECAA40", func_80240D40_ECAA40); diff --git a/src/code_ECAA80.c b/src/code_ECAA80.c new file mode 100644 index 0000000000..b62edade57 --- /dev/null +++ b/src/code_ECAA80.c @@ -0,0 +1,25 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ECAA80", func_80240D80_ECAA80); + +INCLUDE_ASM(s32, "code_ECAA80", func_80241364_ECB064); + +INCLUDE_ASM(s32, "code_ECAA80", func_802414C8_ECB1C8); + +INCLUDE_ASM(s32, "code_ECAA80", func_8024150C_ECB20C); + +INCLUDE_ASM(s32, "code_ECAA80", func_80241770_ECB470); + +INCLUDE_ASM(s32, "code_ECAA80", func_802417CC_ECB4CC); + +INCLUDE_ASM(s32, "code_ECAA80", func_8024199C_ECB69C); + +INCLUDE_ASM(s32, "code_ECAA80", func_802419F0_ECB6F0); + +INCLUDE_ASM(s32, "code_ECAA80", func_80241A28_ECB728); + +INCLUDE_ASM(s32, "code_ECAA80", func_80241AC4_ECB7C4); + +INCLUDE_ASM(s32, "code_ECAA80", func_80241B88_ECB888); + +INCLUDE_ASM(s32, "code_ECAA80", func_80241BF8_ECB8F8); diff --git a/src/code_ECB930.c b/src/code_ECB930.c new file mode 100644 index 0000000000..c5d4105ff8 --- /dev/null +++ b/src/code_ECB930.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ECB930", func_80241C30_ECB930); + +INCLUDE_ASM(s32, "code_ECB930", func_80241CA0_ECB9A0); diff --git a/src/code_ECBB70.c b/src/code_ECBB70.c new file mode 100644 index 0000000000..38d162fe67 --- /dev/null +++ b/src/code_ECBB70.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ECBB70", func_80241E70_ECBB70); diff --git a/src/code_ECFFF0.c b/src/code_ECFFF0.c new file mode 100644 index 0000000000..74710aed6e --- /dev/null +++ b/src/code_ECFFF0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ECFFF0", func_80240000_ECFFF0); diff --git a/src/code_ED0030.c b/src/code_ED0030.c new file mode 100644 index 0000000000..dc55d5ffd1 --- /dev/null +++ b/src/code_ED0030.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ED0030", func_80240040_ED0030); diff --git a/src/code_ED00D0.c b/src/code_ED00D0.c new file mode 100644 index 0000000000..248a3df936 --- /dev/null +++ b/src/code_ED00D0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ED00D0", func_802400E0_ED00D0); + +INCLUDE_ASM(s32, "code_ED00D0", func_80240150_ED0140); diff --git a/src/code_ED0310.c b/src/code_ED0310.c new file mode 100644 index 0000000000..0566191e4b --- /dev/null +++ b/src/code_ED0310.c @@ -0,0 +1,23 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ED0310", func_80240320_ED0310); + +INCLUDE_ASM(s32, "code_ED0310", func_802404D0_ED04C0); + +INCLUDE_ASM(s32, "code_ED0310", func_80240AF8_ED0AE8); + +INCLUDE_ASM(s32, "code_ED0310", func_80240BB8_ED0BA8); + +INCLUDE_ASM(s32, "code_ED0310", func_80240EFC_ED0EEC); + +INCLUDE_ASM(s32, "code_ED0310", func_80240F74_ED0F64); + +INCLUDE_ASM(s32, "code_ED0310", func_80240FE0_ED0FD0); + +INCLUDE_ASM(s32, "code_ED0310", func_80241114_ED1104); + +INCLUDE_ASM(s32, "code_ED0310", func_80241178_ED1168); + +INCLUDE_ASM(s32, "code_ED0310", func_80241508_ED14F8); + +INCLUDE_ASM(s32, "code_ED0310", func_8024162C_ED161C); diff --git a/src/code_ED4220.c b/src/code_ED4220.c new file mode 100644 index 0000000000..714bc59dbf --- /dev/null +++ b/src/code_ED4220.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ED4220", func_80240000_ED4220); diff --git a/src/code_ED4260.c b/src/code_ED4260.c new file mode 100644 index 0000000000..eca897e20f --- /dev/null +++ b/src/code_ED4260.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ED4260", func_80240040_ED4260); diff --git a/src/code_ED42A0.c b/src/code_ED42A0.c new file mode 100644 index 0000000000..ca7a7ea2d9 --- /dev/null +++ b/src/code_ED42A0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ED42A0", func_80240080_ED42A0); + +INCLUDE_ASM(s32, "code_ED42A0", func_80240134_ED4354); + +INCLUDE_ASM(s32, "code_ED42A0", func_80240198_ED43B8); + +INCLUDE_ASM(s32, "code_ED42A0", func_802402BC_ED44DC); diff --git a/src/code_ED46D0.c b/src/code_ED46D0.c new file mode 100644 index 0000000000..36173b2a6d --- /dev/null +++ b/src/code_ED46D0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ED46D0", func_802404B0_ED46D0); + +INCLUDE_ASM(s32, "code_ED46D0", func_80240B10_ED4D30); diff --git a/src/code_ED5540.c b/src/code_ED5540.c new file mode 100644 index 0000000000..8a4354c95c --- /dev/null +++ b/src/code_ED5540.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ED5540", func_80241320_ED5540); + +INCLUDE_ASM(s32, "code_ED5540", func_80241390_ED55B0); diff --git a/src/code_ED8E20.c b/src/code_ED8E20.c new file mode 100644 index 0000000000..ecf88c9d16 --- /dev/null +++ b/src/code_ED8E20.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_ED8E20", func_80240000_ED8E20); + +INCLUDE_ASM(s32, "code_ED8E20", func_80240020_ED8E40); + +INCLUDE_ASM(s32, "code_ED8E20", func_80240034_ED8E54); + +INCLUDE_ASM(s32, "code_ED8E20", func_802400F0_ED8F10); + +INCLUDE_ASM(s32, "code_ED8E20", func_80240208_ED9028); + +INCLUDE_ASM(s32, "code_ED8E20", func_80240274_ED9094); + +INCLUDE_ASM(s32, "code_ED8E20", func_80240318_ED9138); diff --git a/src/code_EDBFE0.c b/src/code_EDBFE0.c new file mode 100644 index 0000000000..b11b9228af --- /dev/null +++ b/src/code_EDBFE0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EDBFE0", func_80240000_EDBFE0); diff --git a/src/code_EDC020.c b/src/code_EDC020.c new file mode 100644 index 0000000000..e66c837219 --- /dev/null +++ b/src/code_EDC020.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EDC020", func_80240040_EDC020); + +INCLUDE_ASM(s32, "code_EDC020", func_802400B0_EDC090); + +INCLUDE_ASM(s32, "code_EDC020", func_8024027C_EDC25C); + +INCLUDE_ASM(s32, "code_EDC020", func_80240330_EDC310); + +INCLUDE_ASM(s32, "code_EDC020", func_80240394_EDC374); + +INCLUDE_ASM(s32, "code_EDC020", func_802403F0_EDC3D0); + +INCLUDE_ASM(s32, "code_EDC020", func_802405C0_EDC5A0); + +INCLUDE_ASM(s32, "code_EDC020", func_80240614_EDC5F4); + +INCLUDE_ASM(s32, "code_EDC020", func_8024064C_EDC62C); diff --git a/src/code_EDE9C0.c b/src/code_EDE9C0.c new file mode 100644 index 0000000000..3ac7bdaa70 --- /dev/null +++ b/src/code_EDE9C0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EDE9C0", func_80240000_EDE9C0); diff --git a/src/code_EDEA00.c b/src/code_EDEA00.c new file mode 100644 index 0000000000..9fd6185982 --- /dev/null +++ b/src/code_EDEA00.c @@ -0,0 +1,51 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EDEA00", func_80240040_EDEA00); + +INCLUDE_ASM(s32, "code_EDEA00", func_802401C4_EDEB84); + +INCLUDE_ASM(s32, "code_EDEA00", func_80240374_EDED34); + +INCLUDE_ASM(s32, "code_EDEA00", func_8024099C_EDF35C); + +INCLUDE_ASM(s32, "code_EDEA00", func_80240A5C_EDF41C); + +INCLUDE_ASM(s32, "code_EDEA00", func_80240DA0_EDF760); + +INCLUDE_ASM(s32, "code_EDEA00", func_80240E18_EDF7D8); + +INCLUDE_ASM(s32, "code_EDEA00", func_80240E84_EDF844); + +INCLUDE_ASM(s32, "code_EDEA00", func_80240FB8_EDF978); + +INCLUDE_ASM(s32, "code_EDEA00", func_8024101C_EDF9DC); + +INCLUDE_ASM(s32, "code_EDEA00", func_802413AC_EDFD6C); + +INCLUDE_ASM(s32, "code_EDEA00", func_802414D0_EDFE90); + +INCLUDE_ASM(s32, "code_EDEA00", func_802416E8_EE00A8); + +INCLUDE_ASM(s32, "code_EDEA00", func_80241730_EE00F0); + +INCLUDE_ASM(s32, "code_EDEA00", func_80241B94_EE0554); + +INCLUDE_ASM(s32, "code_EDEA00", func_80241DE4_EE07A4); + +INCLUDE_ASM(s32, "code_EDEA00", func_802422F0_EE0CB0); + +INCLUDE_ASM(s32, "code_EDEA00", func_8024236C_EE0D2C); + +INCLUDE_ASM(s32, "code_EDEA00", func_802424A0_EE0E60); + +INCLUDE_ASM(s32, "code_EDEA00", func_80242604_EE0FC4); + +INCLUDE_ASM(s32, "code_EDEA00", func_80242684_EE1044); + +INCLUDE_ASM(s32, "code_EDEA00", func_80242AF0_EE14B0); + +INCLUDE_ASM(s32, "code_EDEA00", pause_interp_text_scroll_EE1DD8); + +INCLUDE_ASM(s32, "code_EDEA00", func_80243470_EE1E30); + +INCLUDE_ASM(s32, "code_EDEA00", func_80243584_EE1F44); diff --git a/src/code_EE2040.c b/src/code_EE2040.c new file mode 100644 index 0000000000..64fe03621a --- /dev/null +++ b/src/code_EE2040.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EE2040", func_80243680_EE2040); diff --git a/src/code_EE65B0.c b/src/code_EE65B0.c new file mode 100644 index 0000000000..c49788212e --- /dev/null +++ b/src/code_EE65B0.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EE65B0", func_80240000_EE65B0); + +INCLUDE_ASM(s32, "code_EE65B0", func_80240124_EE66D4); + +INCLUDE_ASM(s32, "code_EE65B0", func_8024030C_EE68BC); + +INCLUDE_ASM(s32, "code_EE65B0", func_80240340_EE68F0); + +INCLUDE_ASM(s32, "code_EE65B0", func_802403D4_EE6984); + +INCLUDE_ASM(s32, "code_EE65B0", func_8024042C_EE69DC); + +INCLUDE_ASM(s32, "code_EE65B0", func_8024046C_EE6A1C); + +INCLUDE_ASM(s32, "code_EE65B0", func_80240504_EE6AB4); + +INCLUDE_ASM(s32, "code_EE65B0", func_802407D4_EE6D84); diff --git a/src/code_EE70C0.c b/src/code_EE70C0.c new file mode 100644 index 0000000000..2e0f905b8d --- /dev/null +++ b/src/code_EE70C0.c @@ -0,0 +1,33 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EE70C0", func_80240B10_EE70C0); + +INCLUDE_ASM(s32, "code_EE70C0", func_80240CC0_EE7270); + +INCLUDE_ASM(s32, "code_EE70C0", func_802412E8_EE7898); + +INCLUDE_ASM(s32, "code_EE70C0", func_802413A8_EE7958); + +INCLUDE_ASM(s32, "code_EE70C0", func_802416EC_EE7C9C); + +INCLUDE_ASM(s32, "code_EE70C0", func_80241764_EE7D14); + +INCLUDE_ASM(s32, "code_EE70C0", func_802417D0_EE7D80); + +INCLUDE_ASM(s32, "code_EE70C0", func_80241904_EE7EB4); + +INCLUDE_ASM(s32, "code_EE70C0", func_80241968_EE7F18); + +INCLUDE_ASM(s32, "code_EE70C0", func_80241CF8_EE82A8); + +INCLUDE_ASM(s32, "code_EE70C0", func_80241E1C_EE83CC); + +INCLUDE_ASM(s32, "code_EE70C0", func_80242034_EE85E4); + +INCLUDE_ASM(s32, "code_EE70C0", func_80242090_EE8640); + +INCLUDE_ASM(s32, "code_EE70C0", func_80242260_EE8810); + +INCLUDE_ASM(s32, "code_EE70C0", func_802422B4_EE8864); + +INCLUDE_ASM(s32, "code_EE70C0", func_802422EC_EE889C); diff --git a/src/code_EE8940.c b/src/code_EE8940.c new file mode 100644 index 0000000000..48f0a3a275 --- /dev/null +++ b/src/code_EE8940.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EE8940", func_80242390_EE8940); diff --git a/src/code_EED100.c b/src/code_EED100.c new file mode 100644 index 0000000000..2a123e4d89 --- /dev/null +++ b/src/code_EED100.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EED100", func_80240000_EED100); diff --git a/src/code_EED140.c b/src/code_EED140.c new file mode 100644 index 0000000000..f8605950b2 --- /dev/null +++ b/src/code_EED140.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EED140", func_80240040_EED140); diff --git a/src/code_EED1E0.c b/src/code_EED1E0.c new file mode 100644 index 0000000000..f647c343f2 --- /dev/null +++ b/src/code_EED1E0.c @@ -0,0 +1,39 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EED1E0", func_802400E0_EED1E0); + +INCLUDE_ASM(s32, "code_EED1E0", func_802400FC_EED1FC); + +INCLUDE_ASM(s32, "code_EED1E0", func_8024011C_EED21C); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240148_EED248); + +INCLUDE_ASM(s32, "code_EED1E0", func_802401B4_EED2B4); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240200_EED300); + +INCLUDE_ASM(s32, "code_EED1E0", func_802402AC_EED3AC); + +INCLUDE_ASM(s32, "code_EED1E0", func_802404FC_EED5FC); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240528_EED628); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240560_EED660); + +INCLUDE_ASM(s32, "code_EED1E0", func_802405F0_EED6F0); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240624_EED724); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240688_EED788); + +INCLUDE_ASM(s32, "code_EED1E0", func_802406E0_EED7E0); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240C18_EEDD18); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240D58_EEDE58); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240DA0_EEDEA0); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240DE8_EEDEE8); + +INCLUDE_ASM(s32, "code_EED1E0", func_80240E18_EEDF18); diff --git a/src/code_EEDF50.c b/src/code_EEDF50.c new file mode 100644 index 0000000000..11ee79dbcc --- /dev/null +++ b/src/code_EEDF50.c @@ -0,0 +1,31 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EEDF50", func_80240E50_EEDF50); + +INCLUDE_ASM(s32, "code_EEDF50", func_80241000_EEE100); + +INCLUDE_ASM(s32, "code_EEDF50", func_80241628_EEE728); + +INCLUDE_ASM(s32, "code_EEDF50", func_802416E8_EEE7E8); + +INCLUDE_ASM(s32, "code_EEDF50", func_80241A2C_EEEB2C); + +INCLUDE_ASM(s32, "code_EEDF50", func_80241AA4_EEEBA4); + +INCLUDE_ASM(s32, "code_EEDF50", func_80241B10_EEEC10); + +INCLUDE_ASM(s32, "code_EEDF50", func_80241C44_EEED44); + +INCLUDE_ASM(s32, "code_EEDF50", func_80241CA8_EEEDA8); + +INCLUDE_ASM(s32, "code_EEDF50", func_80242038_EEF138); + +INCLUDE_ASM(s32, "code_EEDF50", func_8024215C_EEF25C); + +INCLUDE_ASM(s32, "code_EEDF50", func_80242374_EEF474); + +INCLUDE_ASM(s32, "code_EEDF50", func_802424A4_EEF5A4); + +INCLUDE_ASM(s32, "code_EEDF50", func_80242724_EEF824); + +INCLUDE_ASM(s32, "code_EEDF50", func_80242780_EEF880); diff --git a/src/code_EEFAA0.c b/src/code_EEFAA0.c new file mode 100644 index 0000000000..539f893270 --- /dev/null +++ b/src/code_EEFAA0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EEFAA0", func_802429A0_EEFAA0); diff --git a/src/code_EF2610.c b/src/code_EF2610.c new file mode 100644 index 0000000000..912396f5f3 --- /dev/null +++ b/src/code_EF2610.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EF2610", func_80240000_EF2610); diff --git a/src/code_EF2650.c b/src/code_EF2650.c new file mode 100644 index 0000000000..9909ad6690 --- /dev/null +++ b/src/code_EF2650.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EF2650", func_80240040_EF2650); diff --git a/src/code_EF2680.c b/src/code_EF2680.c new file mode 100644 index 0000000000..de8da5f105 --- /dev/null +++ b/src/code_EF2680.c @@ -0,0 +1,43 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EF2680", func_80240070_EF2680); + +INCLUDE_ASM(s32, "code_EF2680", func_80240220_EF2830); + +INCLUDE_ASM(s32, "code_EF2680", func_80240848_EF2E58); + +INCLUDE_ASM(s32, "code_EF2680", func_80240908_EF2F18); + +INCLUDE_ASM(s32, "code_EF2680", func_80240C4C_EF325C); + +INCLUDE_ASM(s32, "code_EF2680", func_80240CC4_EF32D4); + +INCLUDE_ASM(s32, "code_EF2680", func_80240D30_EF3340); + +INCLUDE_ASM(s32, "code_EF2680", func_80240E64_EF3474); + +INCLUDE_ASM(s32, "code_EF2680", func_80240EC8_EF34D8); + +INCLUDE_ASM(s32, "code_EF2680", func_80241258_EF3868); + +INCLUDE_ASM(s32, "code_EF2680", func_8024137C_EF398C); + +INCLUDE_ASM(s32, "code_EF2680", func_80241594_EF3BA4); + +INCLUDE_ASM(s32, "code_EF2680", func_802415DC_EF3BEC); + +INCLUDE_ASM(s32, "code_EF2680", func_80241A40_EF4050); + +INCLUDE_ASM(s32, "code_EF2680", func_80241C90_EF42A0); + +INCLUDE_ASM(s32, "code_EF2680", func_8024219C_EF47AC); + +INCLUDE_ASM(s32, "code_EF2680", func_80242218_EF4828); + +INCLUDE_ASM(s32, "code_EF2680", func_8024234C_EF495C); + +INCLUDE_ASM(s32, "code_EF2680", func_802424B0_EF4AC0); + +INCLUDE_ASM(s32, "code_EF2680", func_80242530_EF4B40); + +INCLUDE_ASM(s32, "code_EF2680", func_8024299C_EF4FAC); diff --git a/src/code_EF7A80.c b/src/code_EF7A80.c new file mode 100644 index 0000000000..170b82100c --- /dev/null +++ b/src/code_EF7A80.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EF7A80", func_80240000_EF7A80); + +INCLUDE_ASM(s32, "code_EF7A80", func_80240124_EF7BA4); + +INCLUDE_ASM(s32, "code_EF7A80", func_8024030C_EF7D8C); + +INCLUDE_ASM(s32, "code_EF7A80", func_80240340_EF7DC0); + +INCLUDE_ASM(s32, "code_EF7A80", func_80240394_EF7E14); diff --git a/src/code_EF7FB0.c b/src/code_EF7FB0.c new file mode 100644 index 0000000000..7e65ef8c00 --- /dev/null +++ b/src/code_EF7FB0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EF7FB0", func_80240530_EF7FB0); diff --git a/src/code_EF8010.c b/src/code_EF8010.c new file mode 100644 index 0000000000..ac3e62aef6 --- /dev/null +++ b/src/code_EF8010.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EF8010", func_80240590_EF8010); + +INCLUDE_ASM(s32, "code_EF8010", func_80240600_EF8080); diff --git a/src/code_EFEB00.c b/src/code_EFEB00.c new file mode 100644 index 0000000000..d8ed16444a --- /dev/null +++ b/src/code_EFEB00.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_EFEB00", func_80240000_EFEB00); + +INCLUDE_ASM(s32, "code_EFEB00", func_80240124_EFEC24); + +INCLUDE_ASM(s32, "code_EFEB00", func_8024030C_EFEE0C); + +INCLUDE_ASM(s32, "code_EFEB00", func_80240340_EFEE40); + +INCLUDE_ASM(s32, "code_EFEB00", func_802404D0_EFEFD0); + +INCLUDE_ASM(s32, "code_EFEB00", func_80240540_EFF040); + +INCLUDE_ASM(s32, "code_EFEB00", func_80240660_EFF160); + +INCLUDE_ASM(s32, "code_EFEB00", func_80240784_EFF284); + +INCLUDE_ASM(s32, "code_EFEB00", func_802407B0_EFF2B0); diff --git a/tools/splat.yaml b/tools/splat.yaml index 18fd4f7c88..c8acc9f2a2 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -8446,82 +8446,182 @@ segments: - [0xE2F750, c] - [0xE31380, bin] - [0xE31530, bin] # unk data - - [0xEA0900, bin] # code - - [0xEA0C10, bin] # code - - [0xEA36E0, bin] # code - - [0xEA3A80, bin] # data ___ - - [0xEA6FD0, bin] # code - - [0xEA7010, bin] # code - - [0xEA7320, bin] # code - - [0xEA7390, bin] # data ___ - - [0xEA8AE0, bin] # code - - [0xEAA810, bin] # data ___ - - [0xEB0E60, bin] # code - - [0xEB1170, bin] # code - - [0xEB1920, bin] # data ___ - - [0xEB5130, bin] # code - - [0xEB5470, bin] # code - - [0xEB54C0, bin] # data ___ - - [0xEB7230, bin] # code - - [0xEB7540, bin] # code - - [0xEB7850, bin] # data ___ - - [0xEB8E50, bin] # code - - [0xEB8E90, bin] # code - - [0xEB9D90, bin] # code - - [0xEBA260, bin] # data ___ - - [0xEC2200, bin] # code - - [0xEC2240, bin] # code - - [0xEC2610, bin] # code - - [0xEC2850, bin] # data ___ - - [0xEC71B0, bin] # code - - [0xEC7590, bin] # code - - [0xEC78F0, bin] # data ___ - - [0xEC9D00, bin] # code - - [0xECAA40, bin] # code - - [0xECAA80, bin] # code - - [0xECB930, bin] # code - - [0xECBB70, bin] # code - - [0xECBC10, bin] # data ___ - - [0xECFFF0, bin] # code - - [0xED0030, bin] # code - - [0xED00D0, bin] # code - - [0xED0310, bin] # code - - [0xED1840, bin] # data ___ - - [0xED4220, bin] # code - - [0xED4260, bin] # code - - [0xED42A0, bin] # code - - [0xED46D0, bin] # code - - [0xED5540, bin] # code - - [0xED5780, bin] # data ___ - - [0xED8E20, bin] # code - - [0xED9170, bin] # data ___ - - [0xEDBFE0, bin] # code - - [0xEDC020, bin] # code - - [0xEDC6D0, bin] # data ___ - - [0xEDE9C0, bin] # code - - [0xEDEA00, bin] # code - - [0xEE2040, bin] # code - - [0xEE20E0, bin] # data ___ - - [0xEE65B0, bin] # code - - [0xEE70C0, bin] # code - - [0xEE8940, bin] # code - - [0xEE8970, bin] # data ___ - - [0xEED100, bin] # code - - [0xEED140, bin] # code - - [0xEED1E0, bin] # code - - [0xEEDF50, bin] # code - - [0xEEFAA0, bin] # code - - [0xEEFAD0, bin] # data ___ - - [0xEF2610, bin] # code - - [0xEF2650, bin] # code - - [0xEF2680, bin] # code - - [0xEF58E0, bin] # data ___ - - [0xEF7A80, bin] # code - - [0xEF7FB0, bin] # code - - [0xEF8010, bin] # code - - [0xEF8250, bin] # data ___ - - [0xEFEB00, bin] # code - - [0xEFF440, bin] # data ___ + - type: code + start: 0xEA0900 + vram: 0x80240000 + overlay: True + files: + - [0xEA0900, c] + - [0xEA0C10, c] + - [0xEA36E0, c] + - [0xEA3A80, bin] + - type: code + start: 0xEA6FD0 + vram: 0x80240000 + overlay: True + files: + - [0xEA6FD0, c] + - [0xEA7010, c] + - [0xEA7320, c] + - [0xEA7390, bin] + - type: code + start: 0xEA8AE0 + vram: 0x80240000 + overlay: True + files: + - [0xEA8AE0, c] + - [0xEAA810, bin] + - type: code + start: 0xEB0E60 + vram: 0x80240000 + overlay: True + files: + - [0xEB0E60, c] + - [0xEB1170, c] + - [0xEB1920, bin] + - type: code + start: 0xEB5130 + vram: 0x80240000 + overlay: True + files: + - [0xEB5130, c] + - [0xEB5470, c] + - [0xEB54C0, bin] + - type: code + start: 0xEB7230 + vram: 0x80240000 + overlay: True + files: + - [0xEB7230, c] + - [0xEB7540, c] + - [0xEB7850, bin] + - type: code + start: 0xEB8E50 + vram: 0x80240000 + overlay: True + files: + - [0xEB8E50, c] + - [0xEB8E90, c] + - [0xEB9D90, c] + - [0xEBA260, bin] + - type: code + start: 0xEC2200 + vram: 0x80240000 + overlay: True + files: + - [0xEC2200, c] + - [0xEC2240, c] + - [0xEC2610, c] + - [0xEC2850, bin] + - type: code + start: 0xEC71B0 + vram: 0x80240000 + overlay: True + files: + - [0xEC71B0, c] + - [0xEC7590, c] + - [0xEC78F0, bin] + - type: code + start: 0xEC9D00 + vram: 0x80240000 + overlay: True + files: + - [0xEC9D00, c] + - [0xECAA40, c] + - [0xECAA80, c] + - [0xECB930, c] + - [0xECBB70, c] + - [0xECBC10, bin] + - type: code + start: 0xECFFF0 + vram: 0x80240000 + overlay: True + files: + - [0xECFFF0, c] + - [0xED0030, c] + - [0xED00D0, c] + - [0xED0310, c] + - [0xED1840, bin] + - type: code + start: 0xED4220 + vram: 0x80240000 + overlay: True + files: + - [0xED4220, c] + - [0xED4260, c] + - [0xED42A0, c] + - [0xED46D0, c] + - [0xED5540, c] + - [0xED5780, bin] + - type: code + start: 0xED8E20 + vram: 0x80240000 + overlay: True + files: + - [0xED8E20, c] + - [0xED9170, bin] + - type: code + start: 0xEDBFE0 + vram: 0x80240000 + overlay: True + files: + - [0xEDBFE0, c] + - [0xEDC020, c] + - [0xEDC6D0, bin] + - type: code + start: 0xEDE9C0 + vram: 0x80240000 + overlay: True + files: + - [0xEDE9C0, c] + - [0xEDEA00, c] + - [0xEE2040, c] + - [0xEE20E0, bin] + - type: code + start: 0xEE65B0 + vram: 0x80240000 + overlay: True + files: + - [0xEE65B0, c] + - [0xEE70C0, c] + - [0xEE8940, c] + - [0xEE8970, bin] + - type: code + start: 0xEED100 + vram: 0x80240000 + overlay: True + files: + - [0xEED100, c] + - [0xEED140, c] + - [0xEED1E0, c] + - [0xEEDF50, c] + - [0xEEFAA0, c] + - [0xEEFAD0, bin] + - type: code + start: 0xEF2610 + vram: 0x80240000 + overlay: True + files: + - [0xEF2610, c] + - [0xEF2650, c] + - [0xEF2680, c] + - [0xEF58E0, bin] + - type: code + start: 0xEF7A80 + vram: 0x80240000 + overlay: True + files: + - [0xEF7A80, c] + - [0xEF7FB0, c] + - [0xEF8010, c] + - [0xEF8250, bin] + - type: code + start: 0xEFEB00 + vram: 0x80240000 + overlay: True + files: + - [0xEFEB00, c] + - [0xEFF440, bin] - [0xF007C0, bin, Battle_Fanfare_02] # BGM start - [0xF02160, bin, Hey_You_03] - [0xF03740, bin, The_Goomba_King_s_Decree_07] diff --git a/undefined_funcs_auto.txt b/undefined_funcs_auto.txt index 244f06a5f7..706ea94c9d 100644 --- a/undefined_funcs_auto.txt +++ b/undefined_funcs_auto.txt @@ -1,7 +1,107 @@ +func_8002A910 = 0x8002A910; +func_8002AA2C = 0x8002AA2C; +func_8002ACEC = 0x8002ACEC; +func_8002AE14 = 0x8002AE14; +func_8002AF18 = 0x8002AF18; +func_8002B1C4 = 0x8002B1C4; +func_8002B21C = 0x8002B21C; +func_8002B28C = 0x8002B28C; +func_8002B45C = 0x8002B45C; +func_8002B4C0 = 0x8002B4C0; +func_8002B524 = 0x8002B524; +func_8002B5DC = 0x8002B5DC; +func_8002B640 = 0x8002B640; +func_8002B6A4 = 0x8002B6A4; +func_8002BF18 = 0x8002BF18; +func_8002BF68 = 0x8002BF68; +func_8002BFD4 = 0x8002BFD4; +func_8002C01C = 0x8002C01C; +func_8002FCBC = 0x8002FCBC; +func_8003C43C = 0x8003C43C; +func_8003E424 = 0x8003E424; +func_8003E4BC = 0x8003E4BC; +func_8003E534 = 0x8003E534; +func_8003E5E8 = 0x8003E5E8; +func_8003ED50 = 0x8003ED50; +func_80041080 = 0x80041080; +func_80042AF4 = 0x80042AF4; +func_8004D0C4 = 0x8004D0C4; +func_8004D1A4 = 0x8004D1A4; +func_8004D800 = 0x8004D800; +func_8004D8E0 = 0x8004D8E0; +func_8004D9C0 = 0x8004D9C0; +func_8004DAD8 = 0x8004DAD8; +func_8004DF64 = 0x8004DF64; +func_8004E024 = 0x8004E024; +func_8004E25C = 0x8004E25C; +func_8004E2EC = 0x8004E2EC; +func_8004E39C = 0x8004E39C; +func_8004E544 = 0x8004E544; +func_8004E808 = 0x8004E808; +func_8004EB8C = 0x8004EB8C; +func_80059AC8 = 0x80059AC8; +func_8005F128 = 0x8005F128; +func_8005F238 = 0x8005F238; +func_80066FE0 = 0x80066FE0; +func_80067040 = 0x80067040; +func_8006CAC0 = 0x8006CAC0; +func_80074070 = 0x80074070; +func_80075110 = 0x80075110; +func_80075170 = 0x80075170; +func_80075E30 = 0x80075E30; +func_80076970 = 0x80076970; +func_800769D0 = 0x800769D0; +func_800775D0 = 0x800775D0; +func_80077930 = 0x80077930; +func_80077BD0 = 0x80077BD0; +func_80077C30 = 0x80077C30; +func_800E423C = 0x800E423C; +func_800E5304 = 0x800E5304; +func_800E53AC = 0x800E53AC; +func_800F16F4 = 0x800F16F4; +func_800F1718 = 0x800F1718; +func_800F1730 = 0x800F1730; +func_800F1D9C = 0x800F1D9C; +func_800F1EF8 = 0x800F1EF8; +func_800F2D5C = 0x800F2D5C; +func_800F2E98 = 0x800F2E98; +func_800F7278 = 0x800F7278; +func_800F9260 = 0x800F9260; +func_800F93E8 = 0x800F93E8; +func_800FCD0C = 0x800FCD0C; +func_80118BB0 = 0x80118BB0; +func_8011AAB4 = 0x8011AAB4; +func_80124F44 = 0x80124F44; +func_80125270 = 0x80125270; +func_80126064 = 0x80126064; +func_8012607C = 0x8012607C; +func_80126094 = 0x80126094; +func_801260AC = 0x801260AC; +func_801266F8 = 0x801266F8; +func_80126734 = 0x80126734; +func_80128510 = 0x80128510; +func_8012DFE8 = 0x8012DFE8; +func_80130C64 = 0x80130C64; +func_80130C74 = 0x80130C74; +func_8013CF98 = 0x8013CF98; +func_80144178 = 0x80144178; +func_80144194 = 0x80144194; +func_80144200 = 0x80144200; +func_8015704C = 0x8015704C; +func_80157118 = 0x80157118; +func_801574DC = 0x801574DC; func_802409F4 = 0x802409F4; func_80240AA8 = 0x80240AA8; func_80241190 = 0x80241190; +func_80242E00 = 0x80242E00; func_802AE000 = 0x802AE000; func_802B7000 = 0x802B7000; func_802B71C8 = 0x802B71C8; func_802BD100 = 0x802BD100; +func_802D4E8C = 0x802D4E8C; +func_802D5468 = 0x802D5468; +func_802D57FC = 0x802D57FC; +func_802D5A10 = 0x802D5A10; +func_802E2A80 = 0x802E2A80; +func_802E2B74 = 0x802E2B74; +func_802F3B00 = 0x802F3B00; diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index aa9a47b68e..cbd21b2673 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -16,6 +16,9 @@ D_800779B0 = 0x800779B0; D_800779C4 = 0x800779C4; D_800779CB = 0x800779CB; D_80077A24 = 0x80077A24; +D_80079430 = 0x80079430; +D_80079540 = 0x80079540; +D_8007C760 = 0x8007C760; D_8007FF20 = 0x8007FF20; D_80080208 = 0x80080208; D_800806A0 = 0x800806A0; @@ -35,6 +38,7 @@ D_80082358 = 0x80082358; D_80082388 = 0x80082388; gItemTable = 0x800878E0; D_8008A680 = 0x8008A680; +D_8008D2C0 = 0x8008D2C0; D_8008DDD4 = 0x8008DDD4; D_8008E3D8 = 0x8008E3D8; D_8008E94C = 0x8008E94C; @@ -111,6 +115,7 @@ D_80094694 = 0x80094694; D_80094698 = 0x80094698; D_8009469C = 0x8009469C; osViModeTable = 0x800946A0; +D_80094900 = 0x80094900; D_80095820 = 0x80095820; D_80095870 = 0x80095870; D_800958C0 = 0x800958C0; @@ -411,6 +416,12 @@ D_800A0F40 = 0x800A0F40; D_800A0F44 = 0x800A0F44; D_800A0F50 = 0x800A0F50; D_800A0F58 = 0x800A0F58; +D_800A1530 = 0x800A1530; +D_800A158C = 0x800A158C; +D_800A15A4 = 0x800A15A4; +D_800A15A8 = 0x800A15A8; +D_800A15C4 = 0x800A15C4; +D_800A15CC = 0x800A15CC; D_800A3510 = 0x800A3510; D_800A3520 = 0x800A3520; D_800A3628 = 0x800A3628; @@ -565,7 +576,10 @@ D_800B451E = 0x800B451E; D_800B451F = 0x800B451F; D_800B4520 = 0x800B4520; D_800B6590 = 0x800B6590; +D_800B7EF0 = 0x800B7EF0; D_800B8590 = 0x800B8590; +D_800B8D80 = 0x800B8D80; +D_800B8DEC = 0x800B8DEC; D_800B91A0 = 0x800B91A0; D_800B91D0 = 0x800B91D0; D_800D91D0 = 0x800D91D0; @@ -657,6 +671,9 @@ gPartnerAnimations = 0x800F8348; D_800F84F8 = 0x800F84F8; D_800FBB60 = 0x800FBB60; D_800FBBE0 = 0x800FBBE0; +D_800FFC90 = 0x800FFC90; +D_80100060 = 0x80100060; +D_801000A0 = 0x801000A0; D_80104A00 = 0x80104A00; D_80104A28 = 0x80104A28; D_80104AC0 = 0x80104AC0; @@ -934,10 +951,18 @@ D_8010F250 = 0x8010F250; gPlayerData = 0x8010F290; D_8010F6B8 = 0x8010F6B8; update_entities = 0x8010F6D0; -func_80147474 = 0x80147474; +D_80117160 = 0x80117160; +D_80117163 = 0x80117163; +D_80117578 = 0x80117578; +D_80117604 = 0x80117604; +D_8011762C = 0x8011762C; +D_80117840 = 0x80117840; +D_80117848 = 0x80117848; +D_80117852 = 0x80117852; D_80147474 = 0x80147474; -func_80147574 = 0x80147574; +func_80147474 = 0x80147474; D_80147574 = 0x80147574; +func_80147574 = 0x80147574; func_80147650 = 0x80147650; D_8014B7F0 = 0x8014B7F0; D_8014C248 = 0x8014C248; @@ -1360,6 +1385,8 @@ D_8015C7D2 = 0x8015C7D2; D_8015C7D8 = 0x8015C7D8; D_8015C7E0 = 0x8015C7E0; D_80164000 = 0x80164000; +D_80169B12 = 0x80169B12; +D_80169B16 = 0x80169B16; D_80197000 = 0x80197000; D_801A6000 = 0x801A6000; D_801A7000 = 0x801A7000; @@ -1729,6 +1756,7 @@ func_80240E94_9C6274 = 0x80240E94; D_80240EF0 = 0x80240EF0; D_80240F00 = 0x80240F00; D_80240F08 = 0x80240F08; +D_80240F28 = 0x80240F28; func_80240F2C_95C12C = 0x80240F2C; func_80240FD0_A3A4B0 = 0x80240FD0; D_80240FF8 = 0x80240FF8; @@ -1795,6 +1823,7 @@ func_80241760_C50C70 = 0x80241760; D_80241768 = 0x80241768; func_80241770_832F70 = 0x80241770; D_80241778 = 0x80241778; +func_80241780_E13EE0 = 0x80241780; func_80241780_8ED5A0 = 0x80241780; D_802417C8 = 0x802417C8; D_802417CC = 0x802417CC; @@ -1820,8 +1849,8 @@ D_80241A00 = 0x80241A00; func_80241A78_BA61F8 = 0x80241A78; func_80241AC8_D2D7F8 = 0x80241AC8; func_80241AD4_B4C544 = 0x80241AD4; -func_80241AE0_DCE7B0 = 0x80241AE0; func_80241AE0_9F6520 = 0x80241AE0; +func_80241AE0_DCE7B0 = 0x80241AE0; D_80241AE8 = 0x80241AE8; func_80241AEC_80236C = 0x80241AEC; func_80241AF0_A6FED0 = 0x80241AF0; @@ -1870,6 +1899,7 @@ func_80241D38_991518 = 0x80241D38; D_80241D3B = 0x80241D3B; D_80241D98 = 0x80241D98; D_80241D9C = 0x80241D9C; +func_80241DA0_7ECAB0 = 0x80241DA0; D_80241DA8 = 0x80241DA8; D_80241DD0 = 0x80241DD0; D_80241E20 = 0x80241E20; @@ -1880,8 +1910,8 @@ func_80241E48_C70178 = 0x80241E48; func_80241E50_A4A410 = 0x80241E50; func_80241E58_9C7238 = 0x80241E58; func_80241E90_8B1F00 = 0x80241E90; -D_80241E98 = 0x80241E98; func_80241E98_A1CF98 = 0x80241E98; +D_80241E98 = 0x80241E98; D_80241EA0 = 0x80241EA0; D_80241EA8 = 0x80241EA8; D_80241ECC = 0x80241ECC; @@ -1895,13 +1925,16 @@ D_80241FB8 = 0x80241FB8; D_80241FC0 = 0x80241FC0; func_80241FC8_C87A78 = 0x80241FC8; D_80241FE0 = 0x80241FE0; +func_80241FE8_D3C5B8 = 0x80241FE8; D_80241FF4 = 0x80241FF4; +func_80241FF8_C41DA8 = 0x80241FF8; D_80242000 = 0x80242000; func_80242000_C48BE0 = 0x80242000; D_80242008 = 0x80242008; D_80242010 = 0x80242010; -func_80242030_8EDE50 = 0x80242030; D_80242030 = 0x80242030; +func_80242030_8EDE50 = 0x80242030; +func_80242038_CD3E68 = 0x80242038; D_80242038 = 0x80242038; func_80242040_8B20B0 = 0x80242040; D_80242048 = 0x80242048; @@ -1966,8 +1999,8 @@ D_80242518 = 0x80242518; D_80242520 = 0x80242520; D_80242528 = 0x80242528; D_80242530 = 0x80242530; -func_80242538_D223C8 = 0x80242538; D_80242538 = 0x80242538; +func_80242538_D223C8 = 0x80242538; D_8024253C = 0x8024253C; func_80242540_A09440 = 0x80242540; func_80242558_A1D658 = 0x80242558; @@ -2013,8 +2046,8 @@ D_80242888 = 0x80242888; D_802428E0_DF1780 = 0x802428E0; func_8024291C_C494FC = 0x8024291C; D_8024292C = 0x8024292C; -func_80242930_9C7D10 = 0x80242930; D_80242930 = 0x80242930; +func_80242930_9C7D10 = 0x80242930; D_8024296C_C8841C = 0x8024296C; func_80242970_7ED680 = 0x80242970; D_802429A4 = 0x802429A4; @@ -2035,8 +2068,8 @@ D_80242AC4 = 0x80242AC4; D_80242ACC = 0x80242ACC; D_80242AD0 = 0x80242AD0; D_80242B7E = 0x80242B7E; -func_80242B90_A1DC90 = 0x80242B90; func_80242B90_803410 = 0x80242B90; +func_80242B90_A1DC90 = 0x80242B90; D_80242B98 = 0x80242B98; D_80242B9C = 0x80242B9C; pause_set_cursor_opacity = 0x80242BA0; @@ -2048,8 +2081,8 @@ D_80242BF8 = 0x80242BF8; func_80242C00_BB0540 = 0x80242C00; D_80242C08 = 0x80242C08; D_80242C0E = 0x80242C0E; -D_80242C30 = 0x80242C30; func_80242C30_B37800 = 0x80242C30; +D_80242C30 = 0x80242C30; D_80242C38 = 0x80242C38; D_80242C40 = 0x80242C40; func_80242C48_9122F8 = 0x80242C48; @@ -2112,24 +2145,28 @@ D_80243078 = 0x80243078; D_80243080 = 0x80243080; func_80243088_8551F8 = 0x80243088; D_8024308C = 0x8024308C; -func_80243090_8B3100 = 0x80243090; func_80243090_C395C0 = 0x80243090; +func_80243090_8B3100 = 0x80243090; D_80243098 = 0x80243098; func_8024309C_95E29C = 0x8024309C; D_802430A0 = 0x802430A0; func_802430A8_A967E8 = 0x802430A8; D_802430B0 = 0x802430B0; +func_802430B8_8B3128 = 0x802430B8; +D_802430BC = 0x802430BC; func_802430C0_B37C90 = 0x802430C0; D_802430E8 = 0x802430E8; func_802430F0_C49CD0 = 0x802430F0; D_80243110 = 0x80243110; D_80243168 = 0x80243168; +D_80243170 = 0x80243170; D_80243178 = 0x80243178; D_80243190 = 0x80243190; D_802431CC = 0x802431CC; func_802431E4_8B3254 = 0x802431E4; D_802431F0 = 0x802431F0; D_802431F8 = 0x802431F8; +func_802431FC_95E3FC = 0x802431FC; D_80243200 = 0x80243200; func_80243210_8B3280 = 0x80243210; func_80243220_DC04D0 = 0x80243220; @@ -2193,11 +2230,11 @@ func_802435C8_96C788 = 0x802435C8; func_802435D0_CC6DE0 = 0x802435D0; func_802435D8_C43388 = 0x802435D8; D_802435E0 = 0x802435E0; -D_802435E8 = 0x802435E8; func_802435E8_DD02B8 = 0x802435E8; +D_802435E8 = 0x802435E8; D_802435EC = 0x802435EC; -func_802435F0_C7A2D0 = 0x802435F0; D_802435F0 = 0x802435F0; +func_802435F0_C7A2D0 = 0x802435F0; D_80243600 = 0x80243600; D_80243608 = 0x80243608; D_80243610 = 0x80243610; @@ -2205,6 +2242,7 @@ D_80243614 = 0x80243614; D_8024362C = 0x8024362C; D_80243650 = 0x80243650; D_80243658 = 0x80243658; +D_8024365C = 0x8024365C; D_80243660 = 0x80243660; D_802436D0 = 0x802436D0; D_802436DC = 0x802436DC; @@ -2217,7 +2255,10 @@ D_80243720 = 0x80243720; D_80243730 = 0x80243730; D_8024373C = 0x8024373C; func_80243758_A2D998 = 0x80243758; +func_80243760_8B37D0 = 0x80243760; +D_80243768 = 0x80243768; D_80243770 = 0x80243770; +func_80243778_96C938 = 0x80243778; D_802437A0 = 0x802437A0; D_802437B0 = 0x802437B0; D_802437B4 = 0x802437B4; @@ -2261,6 +2302,8 @@ D_80243A90 = 0x80243A90; D_80243AD8 = 0x80243AD8; D_80243B14 = 0x80243B14; D_80243B18 = 0x80243B18; +func_80243B44_C74FC4 = 0x80243B44; +D_80243B48 = 0x80243B48; D_80243BB8 = 0x80243BB8; D_80243BC0 = 0x80243BC0; D_80243BCC = 0x80243BCC; @@ -2365,6 +2408,7 @@ D_80244138 = 0x80244138; D_80244140 = 0x80244140; D_80244154 = 0x80244154; D_80244158 = 0x80244158; +D_80244160 = 0x80244160; D_80244170 = 0x80244170; D_80244180 = 0x80244180; D_80244188 = 0x80244188; @@ -2372,7 +2416,12 @@ D_802441A0 = 0x802441A0; D_802441A8 = 0x802441A8; D_802441B0 = 0x802441B0; D_802441B8 = 0x802441B8; +D_802441BC = 0x802441BC; +D_802441D0 = 0x802441D0; D_802441D8 = 0x802441D8; +D_802441DC = 0x802441DC; +D_802441E0 = 0x802441E0; +D_802441E8 = 0x802441E8; D_802441F0 = 0x802441F0; D_80244204 = 0x80244204; D_80244208 = 0x80244208; @@ -2410,7 +2459,9 @@ D_802444A0 = 0x802444A0; D_802444A8 = 0x802444A8; D_802444B0 = 0x802444B0; D_802444B8 = 0x802444B8; +D_802444BC = 0x802444BC; D_802444C0 = 0x802444C0; +D_802444F0 = 0x802444F0; D_802445C0 = 0x802445C0; D_802445C8 = 0x802445C8; D_802445D0 = 0x802445D0; @@ -2421,6 +2472,7 @@ D_802445FC = 0x802445FC; D_80244600 = 0x80244600; D_80244620 = 0x80244620; D_80244628 = 0x80244628; +D_8024462C = 0x8024462C; D_80244630 = 0x80244630; D_80244638 = 0x80244638; D_80244678 = 0x80244678; @@ -2484,6 +2536,8 @@ D_80244B8C = 0x80244B8C; pause_tabs_draw_invis = 0x80244B90; pause_tabs_draw_stats_805418 = 0x80244B98; D_80244BB0 = 0x80244BB0; +D_80244BB8 = 0x80244BB8; +D_80244BEC = 0x80244BEC; D_80244C18 = 0x80244C18; D_80244C48 = 0x80244C48; D_80244C4C = 0x80244C4C; @@ -2537,6 +2591,8 @@ D_80244F38 = 0x80244F38; D_80244F40 = 0x80244F40; D_80244F48 = 0x80244F48; D_80244F78 = 0x80244F78; +D_80244F88 = 0x80244F88; +D_80244F90 = 0x80244F90; D_80244FA0 = 0x80244FA0; D_80244FA8 = 0x80244FA8; D_80244FB0 = 0x80244FB0; @@ -2587,16 +2643,24 @@ D_80245350 = 0x80245350; D_80245358 = 0x80245358; D_80245360 = 0x80245360; D_80245368 = 0x80245368; +D_80245370 = 0x80245370; +D_80245378 = 0x80245378; +D_80245380 = 0x80245380; +D_80245388 = 0x80245388; D_80245390 = 0x80245390; D_80245398 = 0x80245398; D_802453B0 = 0x802453B0; D_802453B8 = 0x802453B8; +D_802453C0 = 0x802453C0; +D_802453C8 = 0x802453C8; D_802453D0 = 0x802453D0; D_802453D8 = 0x802453D8; +D_802453E0 = 0x802453E0; D_802453F0 = 0x802453F0; D_802453F8 = 0x802453F8; D_80245400 = 0x80245400; D_80245408 = 0x80245408; +D_80245410 = 0x80245410; D_80245430 = 0x80245430; D_80245434 = 0x80245434; func_80245438 = 0x80245438; @@ -2604,6 +2668,7 @@ D_80245448 = 0x80245448; D_80245450 = 0x80245450; D_80245458 = 0x80245458; D_80245460 = 0x80245460; +D_80245468 = 0x80245468; D_80245490 = 0x80245490; D_80245498 = 0x80245498; D_802454A0 = 0x802454A0; @@ -2752,6 +2817,7 @@ D_80245FE8 = 0x80245FE8; D_802460E0 = 0x802460E0; D_80246130 = 0x80246130; D_80246150 = 0x80246150; +D_80246160 = 0x80246160; D_80246184 = 0x80246184; D_802461B0 = 0x802461B0; D_802461B4 = 0x802461B4; @@ -2767,6 +2833,7 @@ D_80246288 = 0x80246288; D_802462C0 = 0x802462C0; D_802462C8 = 0x802462C8; D_802462E0 = 0x802462E0; +D_802462F0 = 0x802462F0; D_80246300 = 0x80246300; D_8024636C = 0x8024636C; D_80246370 = 0x80246370; @@ -2784,6 +2851,8 @@ D_802463D0 = 0x802463D0; D_802463D8 = 0x802463D8; D_80246424 = 0x80246424; D_80246430 = 0x80246430; +D_80246480 = 0x80246480; +D_80246488 = 0x80246488; D_802464A4 = 0x802464A4; D_802464D0 = 0x802464D0; D_802464D8 = 0x802464D8; @@ -2813,6 +2882,7 @@ D_802465A0 = 0x802465A0; D_802465B8 = 0x802465B8; D_802465C0 = 0x802465C0; D_802465C8 = 0x802465C8; +D_802465CC = 0x802465CC; D_802465D0 = 0x802465D0; D_802465D8 = 0x802465D8; D_802465E0 = 0x802465E0; @@ -2820,12 +2890,26 @@ D_802465E8 = 0x802465E8; D_802465F0 = 0x802465F0; D_80246610 = 0x80246610; D_80246614 = 0x80246614; +D_80246618 = 0x80246618; +D_80246620 = 0x80246620; +D_80246628 = 0x80246628; +D_80246630 = 0x80246630; +D_80246638 = 0x80246638; +D_80246640 = 0x80246640; D_80246644 = 0x80246644; +D_80246648 = 0x80246648; +D_80246650 = 0x80246650; D_802466A8 = 0x802466A8; +D_802466B0 = 0x802466B0; +D_802466B8 = 0x802466B8; +D_802466C0 = 0x802466C0; +D_802466C8 = 0x802466C8; +D_802466D0 = 0x802466D0; D_802466E8 = 0x802466E8; D_80246750 = 0x80246750; D_80246794 = 0x80246794; D_802467B4 = 0x802467B4; +D_80246894 = 0x80246894; D_80246990 = 0x80246990; D_80246A00 = 0x80246A00; D_80246A08 = 0x80246A08; @@ -2961,18 +3045,25 @@ D_80247A98 = 0x80247A98; D_80247AB8 = 0x80247AB8; D_80247AE8 = 0x80247AE8; D_80247AF0 = 0x80247AF0; +D_80247AF8 = 0x80247AF8; D_80247B00 = 0x80247B00; +D_80247B08 = 0x80247B08; +D_80247B50 = 0x80247B50; +D_80247B58 = 0x80247B58; +D_80247BB0 = 0x80247BB0; D_80247BB8 = 0x80247BB8; D_80247BC0 = 0x80247BC0; D_80247BC8 = 0x80247BC8; D_80247BD0 = 0x80247BD0; D_80247BD8 = 0x80247BD8; D_80247BE0 = 0x80247BE0; +D_80247BF0 = 0x80247BF0; D_80247C28 = 0x80247C28; D_80247C90 = 0x80247C90; D_80247CA0 = 0x80247CA0; D_80247CB4 = 0x80247CB4; D_80247D00 = 0x80247D00; +D_80247DF0 = 0x80247DF0; D_80247E30 = 0x80247E30; D_80247E34 = 0x80247E34; D_80247E68 = 0x80247E68; @@ -3046,6 +3137,9 @@ D_80249158 = 0x80249158; D_802491C0 = 0x802491C0; D_802491C8 = 0x802491C8; D_802491D0 = 0x802491D0; +D_802491F0 = 0x802491F0; +D_802491F8 = 0x802491F8; +D_80249200 = 0x80249200; D_802493A0 = 0x802493A0; D_802493E0 = 0x802493E0; D_80249420 = 0x80249420; @@ -3218,6 +3312,7 @@ D_8024B9B8 = 0x8024B9B8; D_8024B9D0 = 0x8024B9D0; D_8024BA90 = 0x8024BA90; D_8024BB40 = 0x8024BB40; +D_8024BB80 = 0x8024BB80; D_8024BD60 = 0x8024BD60; D_8024BD70 = 0x8024BD70; D_8024BD78 = 0x8024BD78; From 5de12f375a5017cffcf4c9ba69fb6a3dbc47efb8 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 21:10:43 +0900 Subject: [PATCH 10/12] sfx name to comment --- tools/splat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/splat.yaml b/tools/splat.yaml index c8acc9f2a2..2fdd225b00 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -8765,7 +8765,7 @@ segments: - [0xFAD210, bin, The_End_Low_Frequency__2E] - [0xFAD8F0, bin, SMW_Remix_2F] - [0xFADE70, bin, New_Partner_82] # BGM end - - [0xFAE860, bin, sfx] + - [0xFAE860, bin] # sfx - [0x19E09A8, Yay0] - [0x19E1390, Yay0] - [0x19E1888, Yay0] From 00959ac19cdad161edb5083e5793c739b34461ff Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 21:23:35 +0900 Subject: [PATCH 11/12] config comments --- tools/splat.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/splat.yaml b/tools/splat.yaml index 2fdd225b00..b4327c63c2 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -8273,7 +8273,7 @@ segments: - type: code overlay: True start: 0xE20110 - vram: 0x802B7000 # this is a guess, may be wrong + vram: 0x802B7000 files: - [0xE20110, c] - [0xE20B30, bin] @@ -8621,7 +8621,7 @@ segments: overlay: True files: - [0xEFEB00, c] - - [0xEFF440, bin] + - [0xEFF440, bin] # some of this is audio-related and not part of this overlay - [0xF007C0, bin, Battle_Fanfare_02] # BGM start - [0xF02160, bin, Hey_You_03] - [0xF03740, bin, The_Goomba_King_s_Decree_07] From b5a8262503201cddef05ced4d9cf0e941e8e3fad Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 11 Jan 2021 21:38:33 +0900 Subject: [PATCH 12/12] splat update with double support --- asm/data/si.rodata.s | 4 ++-- tools/n64splat | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/asm/data/si.rodata.s b/asm/data/si.rodata.s index 4537f5ea9b..b5846dc34e 100644 --- a/asm/data/si.rodata.s +++ b/asm/data/si.rodata.s @@ -84,10 +84,10 @@ glabel D_802DA140 .word 0x802C8AB0, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8A74, 0x802C8AB8, 0x802C8A74, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8AD4, 0x802C8A74, 0x802C8AD4, 0x802C8AD4, 0x802C8A74, 0x802C8AC0, 0x00000000 glabel D_802DA1D0 -.byte 0xBF, 0xE9, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.double -0.8, 0.0 glabel D_802DA1E0 -.byte 0x40, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.double 180.0, 0.0 glabel D_802DA1F0 .word 0x802D0668, 0x802D0674, 0x802D0680, 0x802D068C, 0x802D0698, 0x802D069C diff --git a/tools/n64splat b/tools/n64splat index 2e5c90c8b1..4b8946ceb4 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 2e5c90c8b1db408d7808994976449991fa117c0d +Subproject commit 4b8946ceb4f9e29958e787606d60772ef31dae8b